From 3e518204823165f28f5a5383c98e42d9bd503777 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 15 Oct 2025 12:09:34 +0200
Subject: [PATCH 01/83] chore(linux): Update debian changelog

(cherry picked from commit 392d85a1ad895dbb48e71f4ebf605d1612fa2b21)
---
 linux/debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/linux/debian/changelog b/linux/debian/changelog
index ddb470e780..dd0f96f05a 100644
--- a/linux/debian/changelog
+++ b/linux/debian/changelog
@@ -1,9 +1,10 @@
-keyman (18.0.242-2) UNRELEASED; urgency=medium
+keyman (18.0.243-1) unstable; urgency=medium
 
   * replace dbus-x11 dependency with default-dbus-session-bus | dbus-session-bus
     (closes: 1117068)
+  * New upstream release.
 
- -- Eberhard Beilharz <eb1@sil.org>  Mon, 06 Oct 2025 16:45:18 +0200
+ -- Eberhard Beilharz <eb1@sil.org>  Wed, 15 Oct 2025 12:09:24 +0200
 
 keyman (18.0.242-1) unstable; urgency=medium
 

From d0ea16b975d439a282e1699f475999e21617b186 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 21 Oct 2025 13:49:37 +0700
Subject: [PATCH 02/83] chore(web): Move chirality.js to
 common/test/resources/keyboards/

---
 .../chirality => common/test/resources/keyboards}/chirality.js    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {web/src/test/manual/web/chirality => common/test/resources/keyboards}/chirality.js (100%)

diff --git a/web/src/test/manual/web/chirality/chirality.js b/common/test/resources/keyboards/chirality.js
similarity index 100%
rename from web/src/test/manual/web/chirality/chirality.js
rename to common/test/resources/keyboards/chirality.js

From fb14a67db611c417966bbc134dbda8b2930e97f2 Mon Sep 17 00:00:00 2001
From: Markus Greiner <mrks.grnr@gmail.com>
Date: Tue, 7 Oct 2025 14:40:51 +0200
Subject: [PATCH 03/83] Docker changes permissions to match the file owner uid
 and gid

There is an issue that the Docker containers cannot modify the
files on KEYMAN_ROOT, since the user running build and tests on
Docker does not have the same gid and uid as the host user starting
the container.
The issue is solved by temporarily changing the uid and gid to
match the container user's uid and gid.

Test-bot: skip
Build-bot: skip
---
 resources/docker-images/android/Dockerfile   | 13 +++++++++++++
 resources/docker-images/base/Dockerfile      |  1 +
 resources/docker-images/core/Dockerfile      | 14 ++++++++++++++
 resources/docker-images/developer/Dockerfile | 13 +++++++++++++
 resources/docker-images/linux/Dockerfile     | 13 +++++++++++++
 resources/docker-images/web/Dockerfile       | 13 +++++++++++++
 6 files changed, 67 insertions(+)

diff --git a/resources/docker-images/android/Dockerfile b/resources/docker-images/android/Dockerfile
index be99a2f247..923fb91eb3 100644
--- a/resources/docker-images/android/Dockerfile
+++ b/resources/docker-images/android/Dockerfile
@@ -36,11 +36,24 @@ EOF
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
+uid=\$(stat -c "%u" /home/build/build)
+gid=\$(stat -c "%g" /home/build/build)
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+  sudo chown -R build:build /home/build/build
+fi
+
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
   /usr/bin/run-tests.sh "\${@:-bash}"
 else
   "\${@:-bash}"
 fi
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+  sudo chown -R \${uid}:\${gid} /home/build/build
+fi
 EOF
 
 # now, switch to build user
diff --git a/resources/docker-images/base/Dockerfile b/resources/docker-images/base/Dockerfile
index 835806d63c..0cba2b73dc 100644
--- a/resources/docker-images/base/Dockerfile
+++ b/resources/docker-images/base/Dockerfile
@@ -53,6 +53,7 @@ EOF
 # Install NVM
 RUN NVM_RELEASE=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | grep tag_name | cut -d : -f 2 | cut -d '"' -f 2) && \
   curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_RELEASE}/install.sh | bash
+RUN chmod -R +x,+r $HOME/
 RUN <<EOF cat >> /usr/bin/bashwrapper
 PATH=/home/build/.keyman/node:\$PATH
 export NVM_DIR="$HOME/.nvm"
diff --git a/resources/docker-images/core/Dockerfile b/resources/docker-images/core/Dockerfile
index 0519540865..c6a2454156 100644
--- a/resources/docker-images/core/Dockerfile
+++ b/resources/docker-images/core/Dockerfile
@@ -34,11 +34,25 @@ RUN echo "export EMSCRIPTEN_BASE=/home/build/emsdk/upstream/emscripten" >> /usr/
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
+uid=\$(stat -c "%u" /home/build/build)
+gid=\$(stat -c "%g" /home/build/build)
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+  sudo chown -R build:build /home/build/build
+fi
+
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
   /usr/bin/run-tests.sh "\${@:-bash}"
 else
   "\${@:-bash}"
 fi
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+  sudo chown -R \${uid}:\${gid} /home/build/build
+fi
+
 EOF
 
 # now, switch to build user
diff --git a/resources/docker-images/developer/Dockerfile b/resources/docker-images/developer/Dockerfile
index bfd25428e4..cb49ac04d7 100644
--- a/resources/docker-images/developer/Dockerfile
+++ b/resources/docker-images/developer/Dockerfile
@@ -34,11 +34,24 @@ RUN echo "export EMSCRIPTEN_BASE=/home/build/emsdk/upstream/emscripten" >> /usr/
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
+uid=\$(stat -c "%u" /home/build/build)
+gid=\$(stat -c "%g" /home/build/build)
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+  sudo chown -R build:build /home/build/build
+fi
+
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
   /usr/bin/run-tests.sh "\${@:-bash}"
 else
   "\${@:-bash}"
 fi
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+  sudo chown -R \${uid}:\${gid} /home/build/build
+fi
 EOF
 
 # now, switch to build user
diff --git a/resources/docker-images/linux/Dockerfile b/resources/docker-images/linux/Dockerfile
index 9bf02375d2..269941af70 100644
--- a/resources/docker-images/linux/Dockerfile
+++ b/resources/docker-images/linux/Dockerfile
@@ -42,11 +42,24 @@ COPY run-tests.sh /usr/bin/run-tests.sh
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
+uid=\$(stat -c "%u" /home/build/build)
+gid=\$(stat -c "%g" /home/build/build)
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+  sudo chown -R build:build /home/build/build
+fi
+
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
   /usr/bin/run-tests.sh "\${@:-bash}"
 else
   "\${@:-bash}"
 fi
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+  sudo chown -R \${uid}:\${gid} /home/build/build
+fi
 EOF
 
 # now, switch to build user
diff --git a/resources/docker-images/web/Dockerfile b/resources/docker-images/web/Dockerfile
index a59f9869b1..fddc8a18b4 100644
--- a/resources/docker-images/web/Dockerfile
+++ b/resources/docker-images/web/Dockerfile
@@ -58,11 +58,24 @@ RUN curl https://packages.mozilla.org/apt/repo-signing-key.gpg > /etc/apt/keyrin
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
+uid=\$(stat -c "%u" /home/build/build)
+gid=\$(stat -c "%g" /home/build/build)
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+  sudo chown -R build:build /home/build/build
+fi
+
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
   /usr/bin/run-tests.sh "\${@:-bash}"
 else
   "\${@:-bash}"
 fi
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+  sudo chown -R \${uid}:\${gid} /home/build/build
+fi
 EOF
 
 # now, switch to build user

From 54f5fc1ea3ffb9415c3d952b25197e396f66f504 Mon Sep 17 00:00:00 2001
From: Markus Greiner <mrks.grnr@gmail.com>
Date: Tue, 7 Oct 2025 14:58:47 +0200
Subject: [PATCH 04/83] Privileged mode is not required.

---
 resources/docker-images/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/docker-images/run.sh b/resources/docker-images/run.sh
index 1c51600386..534e84eebf 100755
--- a/resources/docker-images/run.sh
+++ b/resources/docker-images/run.sh
@@ -51,7 +51,7 @@ run_android() {
 }
 
 run_core() {
-  docker_wrapper run "${DOCKER_RUN_ARGS[@]}" --privileged -i --rm -v "${KEYMAN_ROOT}":/home/build/build \
+  docker_wrapper run "${DOCKER_RUN_ARGS[@]}" -i --rm -v "${KEYMAN_ROOT}":/home/build/build \
     -v "${KEYMAN_ROOT}/core/build/docker-core/${build_dir}":/home/build/build/core/build \
     "${registry_slash}keymanapp/keyman-core-ci:${image_version}" \
     "${builder_extra_params[@]}"

From 4bff2c81d5b20f18cddcb415463bbd4bbc0cf0ff Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 22 Oct 2025 06:53:29 +0700
Subject: [PATCH 05/83] chore(web): Update web test page reference to
 chirality.js

---
 web/src/test/manual/web/chirality/utilities.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/test/manual/web/chirality/utilities.js b/web/src/test/manual/web/chirality/utilities.js
index 158a05c08e..d9226497f4 100644
--- a/web/src/test/manual/web/chirality/utilities.js
+++ b/web/src/test/manual/web/chirality/utilities.js
@@ -7,7 +7,7 @@ function loadKeyboards()
     languages:{
       id:'en',name:'English',region:'North America'
     },
-    filename:'chirality.js'
+    filename:'../../../../../../common/test/resources/keyboards/chirality.js'
   });
     
   // A testing keyboard using 10.0 format and the KLS layout specifier

From 5fa0dccbcb1a8f993509425961ea58c0989d752c Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 22 Oct 2025 06:54:01 +0700
Subject: [PATCH 06/83] chore(android): Update keyboard harness reference to
 chirality.js

---
 .../app/src/main/assets/keyboardharness.kmp   | Bin 217993 -> 217932 bytes
 .../app/src/main/assets/keyboardharness.kpj   |  50 ++----------------
 .../app/src/main/assets/keyboardharness.kps   |   2 +-
 3 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp
index f0380aabe531900823d6b362015da82ca8c0978a..9785ed733811c1938d1125c34725a47b5bd2897a 100644
GIT binary patch
delta 3421
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
F{R8I3H2nYo

delta 3467
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
E0B!I}X#fBK

diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj
index c7fa5c530c..80a3e1568a 100644
--- a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj
+++ b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj
@@ -1,56 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <KeymanDeveloperProject>
   <Options>
+    <Version>2.0</Version>
     <BuildPath>$PROJECTPATH</BuildPath>
+    <SourcePath>$PROJECTPATH\</SourcePath>
     <CompilerWarningsAsErrors>True</CompilerWarningsAsErrors>
-    <WarnDeprecatedCode>True</WarnDeprecatedCode>
     <CheckFilenameConventions>True</CheckFilenameConventions>
+    <SkipMetadataFiles>True</SkipMetadataFiles>
     <ProjectType>lexicalmodel</ProjectType>
   </Options>
-  <Files>
-    <File>
-      <ID>id_165fd1598b940efe4a973aeb6eb61aba</ID>
-      <Filename>keyboardharness.kps</Filename>
-      <Filepath>keyboardharness.kps</Filepath>
-      <FileVersion>1.0</FileVersion>
-      <FileType>.kps</FileType>
-      <Details>
-        <Name>keyboardharness</Name>
-        <Copyright>©2020 SIL International</Copyright>
-        <Version>1.0</Version>
-      </Details>
-    </File>
-    <File>
-      <ID>id_f9b1213d4e83cb32ce1ead1ee852d618</ID>
-      <Filename>chirality.js</Filename>
-      <Filepath>..\..\..\..\..\..\..\web\testing\chirality\chirality.js</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.js</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-    <File>
-      <ID>id_e01841691fa129428aea555142873f69</ID>
-      <Filename>platformtest.js</Filename>
-      <Filepath>..\..\..\..\..\..\..\web\testing\platform\platformtest.js</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.js</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-    <File>
-      <ID>id_03df89bb84a1aa6cab40dfebf3a04c5b</ID>
-      <Filename>code2001.ttf</Filename>
-      <Filepath>code2001.ttf</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.ttf</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-    <File>
-      <ID>id_2d07bd2b8c94e9600ac1a920c8cb9e0a</ID>
-      <Filename>longpress.js</Filename>
-      <Filepath>longpress.js</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.js</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-  </Files>
 </KeymanDeveloperProject>
diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
index 157aefd71c..9d03ec759b 100644
--- a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
+++ b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
@@ -20,7 +20,7 @@
   </Info>
   <Files>
     <File>
-      <Name>..\..\..\..\..\..\..\web\src\test\manual\web\chirality\chirality.js</Name>
+      <Name>../../../../../../../common/test/resources/keyboards/chirality.js</Name>
       <Description>File chirality.js</Description>
       <CopyLocation>0</CopyLocation>
       <FileType>.js</FileType>

From c9b44d33c72ced82d53ae3713f34150edfdf9f12 Mon Sep 17 00:00:00 2001
From: Markus Greiner <mrks.grnr@gmail.com>
Date: Wed, 22 Oct 2025 15:39:17 +0200
Subject: [PATCH 07/83] Changing permissions only in the case if building and
 testing  on GitHub

---
 resources/docker-images/android/Dockerfile   | 18 +++++++----
 resources/docker-images/build.sh             |  2 +-
 resources/docker-images/core/Dockerfile      | 32 +++++++++++---------
 resources/docker-images/developer/Dockerfile | 21 +++++++------
 resources/docker-images/docker-build.inc.sh  |  4 ++-
 resources/docker-images/linux/Dockerfile     | 20 +++++++-----
 6 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/resources/docker-images/android/Dockerfile b/resources/docker-images/android/Dockerfile
index 923fb91eb3..8fb47c8a38 100644
--- a/resources/docker-images/android/Dockerfile
+++ b/resources/docker-images/android/Dockerfile
@@ -39,9 +39,13 @@ RUN <<EOF cat >> /usr/bin/bashwrapper
 uid=\$(stat -c "%u" /home/build/build)
 gid=\$(stat -c "%g" /home/build/build)
 
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
-  sudo chown -R build:build /home/build/build
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  uid=\$(stat -c "%u" /home/build/build)
+  gid=\$(stat -c "%g" /home/build/build)
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+    echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+    sudo chown -R build:build /home/build/build
+  fi
 fi
 
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
@@ -50,9 +54,11 @@ else
   "\${@:-bash}"
 fi
 
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
-  sudo chown -R \${uid}:\${gid} /home/build/build
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+    echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+    sudo chown -R \${uid}:\${gid} /home/build/build
+  fi
 fi
 EOF
 
diff --git a/resources/docker-images/build.sh b/resources/docker-images/build.sh
index 33f638ed6a..c07e732efb 100755
--- a/resources/docker-images/build.sh
+++ b/resources/docker-images/build.sh
@@ -105,7 +105,7 @@ if builder_has_action build; then
 fi
 
 builder_run_action test:core        test_action core
-# builder_run_action test:linux       test_action linux
+builder_run_action test:linux       test_action linux
 builder_run_action test:web         test_action web
 # Android uses artifacts from web, so it has to come after web
 builder_run_action test:android     test_action android
diff --git a/resources/docker-images/core/Dockerfile b/resources/docker-images/core/Dockerfile
index c6a2454156..db22a66b4f 100644
--- a/resources/docker-images/core/Dockerfile
+++ b/resources/docker-images/core/Dockerfile
@@ -34,25 +34,27 @@ RUN echo "export EMSCRIPTEN_BASE=/home/build/emsdk/upstream/emscripten" >> /usr/
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
-uid=\$(stat -c "%u" /home/build/build)
-gid=\$(stat -c "%g" /home/build/build)
-
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
-  sudo chown -R build:build /home/build/build
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  uid=\$(stat -c "%u" /home/build/build)
+  gid=\$(stat -c "%g" /home/build/build)
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+    echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+    sudo chown -R build:build /home/build/build
+  fi
 fi
 
-if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
-  /usr/bin/run-tests.sh "\${@:-bash}"
-else
-  "\${@:-bash}"
-fi
+  if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
+    /usr/bin/run-tests.sh "\${@:-bash}"
+  else
+    "\${@:-bash}"
+  fi
 
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
-  sudo chown -R \${uid}:\${gid} /home/build/build
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+      echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+      sudo chown -R \${uid}:\${gid} /home/build/build
+  fi
 fi
-
 EOF
 
 # now, switch to build user
diff --git a/resources/docker-images/developer/Dockerfile b/resources/docker-images/developer/Dockerfile
index cb49ac04d7..b2f57df056 100644
--- a/resources/docker-images/developer/Dockerfile
+++ b/resources/docker-images/developer/Dockerfile
@@ -34,12 +34,13 @@ RUN echo "export EMSCRIPTEN_BASE=/home/build/emsdk/upstream/emscripten" >> /usr/
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
-uid=\$(stat -c "%u" /home/build/build)
-gid=\$(stat -c "%g" /home/build/build)
-
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
-  sudo chown -R build:build /home/build/build
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  uid=\$(stat -c "%u" /home/build/build)
+  gid=\$(stat -c "%g" /home/build/build)
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+    echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+    sudo chown -R build:build /home/build/build
+  fi
 fi
 
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
@@ -48,9 +49,11 @@ else
   "\${@:-bash}"
 fi
 
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
-  sudo chown -R \${uid}:\${gid} /home/build/build
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+    echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+    sudo chown -R \${uid}:\${gid} /home/build/build
+  fi
 fi
 EOF
 
diff --git a/resources/docker-images/docker-build.inc.sh b/resources/docker-images/docker-build.inc.sh
index 109d886c5e..e6427a75cb 100644
--- a/resources/docker-images/docker-build.inc.sh
+++ b/resources/docker-images/docker-build.inc.sh
@@ -87,7 +87,9 @@ setup_docker() {
   if [[ "${MSYSTEM:-}" == "MINGW64" ]]; then
     DOCKER_RUN_ARGS+=(--env DOCKER_RUN_AS_ROOT=1)
   fi
-  if ! builder_is_running_on_gha ; then
+  if builder_is_running_on_gha ; then
+    DOCKER_RUN_ARGS+=(--env CHANGE_PERMISSIONS=1)
+  else
     DOCKER_RUN_ARGS+=(-t)
   fi
 
diff --git a/resources/docker-images/linux/Dockerfile b/resources/docker-images/linux/Dockerfile
index 269941af70..a63aace65d 100644
--- a/resources/docker-images/linux/Dockerfile
+++ b/resources/docker-images/linux/Dockerfile
@@ -42,12 +42,14 @@ COPY run-tests.sh /usr/bin/run-tests.sh
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
-uid=\$(stat -c "%u" /home/build/build)
-gid=\$(stat -c "%g" /home/build/build)
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  uid=\$(stat -c "%u" /home/build/build)
+  gid=\$(stat -c "%g" /home/build/build)
 
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
-  sudo chown -R build:build /home/build/build
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+    echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+    sudo chown -R build:build /home/build/build
+  fi
 fi
 
 if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
@@ -56,9 +58,11 @@ else
   "\${@:-bash}"
 fi
 
-if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
-  echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
-  sudo chown -R \${uid}:\${gid} /home/build/build
+if [[ -v CHANGE_PERMISSIONS ]]; then
+  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+    echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+    sudo chown -R \${uid}:\${gid} /home/build/build
+  fi
 fi
 EOF
 

From d9b4ec9baf448b28cf97f7a9636a3f38d093a1fe Mon Sep 17 00:00:00 2001
From: Markus Greiner <mrks.grnr@gmail.com>
Date: Wed, 22 Oct 2025 18:02:17 +0200
Subject: [PATCH 08/83] Weakening condition for gid and uid (after review

Test-bot: skip
Build-bot: skip
---
 resources/docker-images/android/Dockerfile   | 4 ++--
 resources/docker-images/core/Dockerfile      | 4 ++--
 resources/docker-images/developer/Dockerfile | 4 ++--
 resources/docker-images/linux/Dockerfile     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/docker-images/android/Dockerfile b/resources/docker-images/android/Dockerfile
index 8fb47c8a38..f943f880d3 100644
--- a/resources/docker-images/android/Dockerfile
+++ b/resources/docker-images/android/Dockerfile
@@ -42,7 +42,7 @@ gid=\$(stat -c "%g" /home/build/build)
 if [[ -v CHANGE_PERMISSIONS ]]; then
   uid=\$(stat -c "%u" /home/build/build)
   gid=\$(stat -c "%g" /home/build/build)
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
     sudo chown -R build:build /home/build/build
   fi
@@ -55,7 +55,7 @@ else
 fi
 
 if [[ -v CHANGE_PERMISSIONS ]]; then
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
     sudo chown -R \${uid}:\${gid} /home/build/build
   fi
diff --git a/resources/docker-images/core/Dockerfile b/resources/docker-images/core/Dockerfile
index db22a66b4f..0589b8c2ee 100644
--- a/resources/docker-images/core/Dockerfile
+++ b/resources/docker-images/core/Dockerfile
@@ -37,7 +37,7 @@ RUN <<EOF cat >> /usr/bin/bashwrapper
 if [[ -v CHANGE_PERMISSIONS ]]; then
   uid=\$(stat -c "%u" /home/build/build)
   gid=\$(stat -c "%g" /home/build/build)
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
     sudo chown -R build:build /home/build/build
   fi
@@ -50,7 +50,7 @@ fi
   fi
 
 if [[ -v CHANGE_PERMISSIONS ]]; then
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
       echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
       sudo chown -R \${uid}:\${gid} /home/build/build
   fi
diff --git a/resources/docker-images/developer/Dockerfile b/resources/docker-images/developer/Dockerfile
index b2f57df056..19c69c5e98 100644
--- a/resources/docker-images/developer/Dockerfile
+++ b/resources/docker-images/developer/Dockerfile
@@ -37,7 +37,7 @@ RUN <<EOF cat >> /usr/bin/bashwrapper
 if [[ -v CHANGE_PERMISSIONS ]]; then
   uid=\$(stat -c "%u" /home/build/build)
   gid=\$(stat -c "%g" /home/build/build)
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
     sudo chown -R build:build /home/build/build
   fi
@@ -50,7 +50,7 @@ else
 fi
 
 if [[ -v CHANGE_PERMISSIONS ]]; then
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
     sudo chown -R \${uid}:\${gid} /home/build/build
   fi
diff --git a/resources/docker-images/linux/Dockerfile b/resources/docker-images/linux/Dockerfile
index a63aace65d..084b0f16c7 100644
--- a/resources/docker-images/linux/Dockerfile
+++ b/resources/docker-images/linux/Dockerfile
@@ -46,7 +46,7 @@ if [[ -v CHANGE_PERMISSIONS ]]; then
   uid=\$(stat -c "%u" /home/build/build)
   gid=\$(stat -c "%g" /home/build/build)
 
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
     sudo chown -R build:build /home/build/build
   fi
@@ -59,7 +59,7 @@ else
 fi
 
 if [[ -v CHANGE_PERMISSIONS ]]; then
-  if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+  if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
     sudo chown -R \${uid}:\${gid} /home/build/build
   fi

From 616092e0f7ba2674bebcfdd0dc106ce53febf586 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 24 Oct 2025 09:08:31 +0700
Subject: [PATCH 09/83] fix(web): Copy common keyboards to test-resources

---
 web/build/test-resources/keyboards/.gitkeep    | 0
 web/src/test/manual/build.sh                   | 3 +++
 web/src/test/manual/web/chirality/utilities.js | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 web/build/test-resources/keyboards/.gitkeep

diff --git a/web/build/test-resources/keyboards/.gitkeep b/web/build/test-resources/keyboards/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index b2eed53d0a..be3dcbc869 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -49,6 +49,9 @@ function do_copy() {
 
   mkdir -p "$GESTURE_PROCESSOR_TARGET"
   cp -a "$GESTURE_PROCESSOR_BUILD" "$GESTURE_PROCESSOR_TARGET"
+
+  # copy common test resources (keyboards)
+  cp -f "$KEYMAN_ROOT/common/test/resources/keyboards/"*.js "$KEYMAN_ROOT/$DEST/keyboards/"
 }
 
 builder_run_action clean rm -rf "$KEYMAN_ROOT/$DEST" && rm -rf "$GESTURE_PROCESSOR_TARGET"
diff --git a/web/src/test/manual/web/chirality/utilities.js b/web/src/test/manual/web/chirality/utilities.js
index d9226497f4..16c9caaf02 100644
--- a/web/src/test/manual/web/chirality/utilities.js
+++ b/web/src/test/manual/web/chirality/utilities.js
@@ -7,7 +7,7 @@ function loadKeyboards()
     languages:{
       id:'en',name:'English',region:'North America'
     },
-    filename:'../../../../../../common/test/resources/keyboards/chirality.js'
+    filename:'../../../../../build/test-resources/keyboards/chirality.js'
   });
     
   // A testing keyboard using 10.0 format and the KLS layout specifier

From 00b6c71eb4522f33e6bc3b74d69a5cb1efdb7dc9 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 24 Oct 2025 10:09:46 +0700
Subject: [PATCH 10/83] fix(web): Create test-resources/keyboards dir

---
 web/build/test-resources/keyboards/.gitkeep | 0
 web/src/test/manual/build.sh                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 web/build/test-resources/keyboards/.gitkeep

diff --git a/web/build/test-resources/keyboards/.gitkeep b/web/build/test-resources/keyboards/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index be3dcbc869..53a784bdf8 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -41,7 +41,7 @@ GESTURE_PROCESSOR_BUILD="$KEYMAN_ROOT/web/src/engine/osk/gesture-processor/build
 GESTURE_PROCESSOR_TARGET="$KEYMAN_ROOT/web/build/engine/gesture-processor/lib/"
 
 function do_copy() {
-  mkdir -p "$KEYMAN_ROOT/$DEST"
+  mkdir -p "$KEYMAN_ROOT/$DEST/keyboards"
 
   # The next four lines are needed for the sentry-integration manual test page.
   cp "$SENTRY_MANAGER_SRC"  "$KEYMAN_ROOT/$DEST/sentry-manager.js"

From b1fe097a828b739a7d036a6d166badab375bdb06 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 22 Oct 2025 08:10:24 +0700
Subject: [PATCH 11/83] chore(windows): Update platformtest keyboard

---
 .../platform-rules/platformtest.js            | 381 +-----------------
 .../platform-rules/platformtest.kmn           |   5 +-
 .../platform-rules/platformtest.kmp           | Bin 3699 -> 3701 bytes
 .../platform-rules/platformtest.kmx           | Bin 5184 -> 5260 bytes
 .../platform-rules/platformtest.kpj           |  11 +-
 .../platform-rules/platformtest.kps           |   4 +-
 6 files changed, 11 insertions(+), 390 deletions(-)

diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.js b/windows/src/test/manual-tests/platform-rules/platformtest.js
index 0a1c8bfa78..f7d08ad396 100644
--- a/windows/src/test/manual-tests/platform-rules/platformtest.js
+++ b/windows/src/test/manual-tests/platform-rules/platformtest.js
@@ -1,380 +1 @@
-
-KeymanWeb.KR(new Keyboard_platformtest());
-
-function Keyboard_platformtest()
-{
-
-    this.KI = "Keyboard_platformtest";
-    this.KN = "PlatformTest";
-    this.KMINVER = "9.0";
-    this.KV = null;
-    this.KH = '';
-    this.KM = 0;
-    this.KBVER = "1.0";
-    this.KMBM = 0x0000;
-    this.s17 = "touch";
-    this.s18 = "hardware";
-    this.s21 = "windows";
-    this.s22 = "android";
-    this.s23 = "ios";
-    this.s24 = "macosx";
-    this.s25 = "linux";
-    this.s28 = "desktop";
-    this.s29 = "tablet";
-    this.s30 = "phone";
-    this.s33 = "native";
-    this.s34 = "web";
-    this.s37 = "ie";
-    this.s38 = "chrome";
-    this.s39 = "edge";
-    this.s40 = "firefox";
-    this.s41 = "safari";
-    this.s42 = "opera";
-    this.s45 = "touch";
-    this.s46 = "hardware";
-    this.s49 = "platform-x";
-    this.s52 = "WinDOWS";
-    this.s53 = "ANDroid";
-    this.s54 = "iOS";
-    this.s55 = "macOSX";
-    this.s56 = "LINUX";
-    this.s58 = "touch";
-    this.s59 = "hardware";
-    this.s60 = "windows";
-    this.s61 = "android";
-    this.s62 = "ios";
-    this.s63 = "macosx";
-    this.s64 = "linux";
-    this.s65 = "desktop";
-    this.s66 = "tablet";
-    this.s67 = "phone";
-    this.s68 = "native";
-    this.s69 = "web";
-    this.s70 = "ie";
-    this.s71 = "chrome";
-    this.s72 = "edge";
-    this.s73 = "firefox";
-    this.s74 = "safari";
-    this.s75 = "opera";
-    this.s76 = "touch";
-    this.s77 = "hardware";
-    this.s78 = "platform-x";
-    this.s79 = "WinDOWS";
-    this.s80 = "ANDroid";
-    this.s81 = "iOS";
-    this.s82 = "macOSX";
-    this.s83 = "LINUX";
-    this.KVER = "10.0.1109.0";
-    this.gs = function(t, e) {
-        return this.g0(t, e);
-    };
-    this.g0 = function(t, e) {
-        var k = KeymanWeb,
-            r = 0,
-            m = 0;
-        if (k.KKM(e, 16384, 65)) {
-            r = m = 1;
-            r = this.g1(t, e);
-        }
-        if (!m && k.KIK(e)) {
-            r = 1;
-            r = this.g9(t, e);
-        }
-        return r;
-    };
-    this.g1 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s17, t)) {
-            m = 1;
-            k.KO(0, t, "touch");
-        } else if (k.KIFS(31, this.s18, t)) {
-            m = 1;
-            k.KO(0, t, "hardware");
-        }
-        if (m) {
-            r = this.g2(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, "undefined");
-            r = this.g2(t, e);
-        }
-        return r;
-    };
-    this.g2 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s21, t)) {
-            m = 1;
-            k.KO(0, t, " windows");
-        } else if (k.KIFS(31, this.s22, t)) {
-            m = 1;
-            k.KO(0, t, " android");
-        } else if (k.KIFS(31, this.s23, t)) {
-            m = 1;
-            k.KO(0, t, " ios");
-        } else if (k.KIFS(31, this.s24, t)) {
-            m = 1;
-            k.KO(0, t, " macosx");
-        } else if (k.KIFS(31, this.s25, t)) {
-            m = 1;
-            k.KO(0, t, " linux");
-        }
-        if (m) {
-            r = this.g3(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g3(t, e);
-        }
-        return r;
-    };
-    this.g3 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s28, t)) {
-            m = 1;
-            k.KO(0, t, " desktop");
-        } else if (k.KIFS(31, this.s29, t)) {
-            m = 1;
-            k.KO(0, t, " tablet");
-        } else if (k.KIFS(31, this.s30, t)) {
-            m = 1;
-            k.KO(0, t, " phone");
-        }
-        if (m) {
-            r = this.g4(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g4(t, e);
-        }
-        return r;
-    };
-    this.g4 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s33, t)) {
-            m = 1;
-            k.KO(0, t, " native");
-        } else if (k.KIFS(31, this.s34, t)) {
-            m = 1;
-            k.KO(0, t, " web");
-        }
-        if (m) {
-            r = this.g5(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g5(t, e);
-        }
-        return r;
-    };
-    this.g5 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s37, t)) {
-            m = 1;
-            k.KO(0, t, " ie");
-        } else if (k.KIFS(31, this.s38, t)) {
-            m = 1;
-            k.KO(0, t, " chrome");
-        } else if (k.KIFS(31, this.s39, t)) {
-            m = 1;
-            k.KO(0, t, " edge");
-        } else if (k.KIFS(31, this.s40, t)) {
-            m = 1;
-            k.KO(0, t, " firefox");
-        } else if (k.KIFS(31, this.s41, t)) {
-            m = 1;
-            k.KO(0, t, " safari");
-        } else if (k.KIFS(31, this.s42, t)) {
-            m = 1;
-            k.KO(0, t, " opera");
-        }
-        if (m) {
-            r = this.g6(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g6(t, e);
-        }
-        return r;
-    };
-    this.g6 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (!k.KIFS(31, this.s45, t)) {
-            m = 1;
-            k.KO(0, t, " !touch");
-        } else if (!k.KIFS(31, this.s46, t)) {
-            m = 1;
-            k.KO(0, t, " !hardware");
-        }
-        if (m) {
-            r = this.g7(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g7(t, e);
-        }
-        return r;
-    };
-    this.g7 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s49, t)) {
-            m = 1;
-            k.KO(0, t, " platform-x");
-        }
-        if (m) {
-            r = this.g8(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g8(t, e);
-        }
-        return r;
-    };
-    this.g8 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s52, t)) {
-            m = 1;
-            k.KO(0, t, " windows");
-        } else if (k.KIFS(31, this.s53, t)) {
-            m = 1;
-            k.KO(0, t, " android");
-        } else if (k.KIFS(31, this.s54, t)) {
-            m = 1;
-            k.KO(0, t, " ios");
-        } else if (k.KIFS(31, this.s55, t)) {
-            m = 1;
-            k.KO(0, t, " macosx");
-        } else if (k.KIFS(31, this.s56, t)) {
-            m = 1;
-            k.KO(0, t, " linux");
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-        }
-        return r;
-    };
-    this.g9 = function(t, e) {
-        var k = KeymanWeb,
-            r = 0,
-            m = 0;
-        if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s79, t)) {
-            r = m = 1;
-            k.KO(0, t, " Windows");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s80, t)) {
-            r = m = 1;
-            k.KO(0, t, " Android");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s81, t)) {
-            r = m = 1;
-            k.KO(0, t, " iOS");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s82, t)) {
-            r = m = 1;
-            k.KO(0, t, " macOS");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s83, t)) {
-            r = m = 1;
-            k.KO(0, t, " Linux");
-        } else if (k.KKM(e, 16384, 69)) {
-            r = m = 1;
-            k.KO(0, t, " [OS Undefined (case insensitive test)]");
-        } else if (k.KKM(e, 16384, 73) && k.KIFS(31, this.s65, t)) {
-            r = m = 1;
-            k.KO(0, t, " Desktop");
-        } else if (k.KKM(e, 16384, 73) && k.KIFS(31, this.s66, t)) {
-            r = m = 1;
-            k.KO(0, t, " Tablet");
-        } else if (k.KKM(e, 16384, 73) && k.KIFS(31, this.s67, t)) {
-            r = m = 1;
-            k.KO(0, t, " Phone");
-        } else if (k.KKM(e, 16384, 73)) {
-            r = m = 1;
-            k.KO(0, t, " [FF Undefined]");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s60, t)) {
-            r = m = 1;
-            k.KO(0, t, " Windows");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s61, t)) {
-            r = m = 1;
-            k.KO(0, t, " Android");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s62, t)) {
-            r = m = 1;
-            k.KO(0, t, " iOS");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s63, t)) {
-            r = m = 1;
-            k.KO(0, t, " OSX");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s64, t)) {
-            r = m = 1;
-            k.KO(0, t, " Linux");
-        } else if (k.KKM(e, 16384, 79)) {
-            r = m = 1;
-            k.KO(0, t, " [OS Undefined]");
-        } else if (k.KKM(e, 16384, 80) && k.KIFS(31, this.s58, t)) {
-            r = m = 1;
-            k.KO(0, t, "Touch");
-        } else if (k.KKM(e, 16384, 80) && k.KIFS(31, this.s59, t)) {
-            r = m = 1;
-            k.KO(0, t, "Hardware");
-        } else if (k.KKM(e, 16384, 80)) {
-            r = m = 1;
-            k.KO(0, t, "[UI Undefined]");
-        } else if (k.KKM(e, 16384, 82) && k.KIFS(31, this.s78, t)) {
-            r = m = 1;
-            k.KO(0, t, " Platform-X");
-        } else if (k.KKM(e, 16384, 82)) {
-            r = m = 1;
-            k.KO(0, t, " [Platform-X Undefined]");
-        } else if (k.KKM(e, 16384, 84) && !k.KIFS(31, this.s76, t)) {
-            r = m = 1;
-            k.KO(0, t, " !Touch");
-        } else if (k.KKM(e, 16384, 84) && !k.KIFS(31, this.s77, t)) {
-            r = m = 1;
-            k.KO(0, t, " !Hardware");
-        } else if (k.KKM(e, 16384, 84)) {
-            r = m = 1;
-            k.KO(0, t, " [Inverted OS Undefined]");
-        } else if (k.KKM(e, 16384, 85) && k.KIFS(31, this.s68, t)) {
-            r = m = 1;
-            k.KO(0, t, " Native");
-        } else if (k.KKM(e, 16384, 85) && k.KIFS(31, this.s69, t)) {
-            r = m = 1;
-            k.KO(0, t, " Web");
-        } else if (k.KKM(e, 16384, 85)) {
-            r = m = 1;
-            k.KO(0, t, " [Nativeness Undefined]");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s70, t)) {
-            r = m = 1;
-            k.KO(0, t, " IE");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s71, t)) {
-            r = m = 1;
-            k.KO(0, t, " Chrome");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s72, t)) {
-            r = m = 1;
-            k.KO(0, t, " Edge");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s73, t)) {
-            r = m = 1;
-            k.KO(0, t, " Firefox");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s74, t)) {
-            r = m = 1;
-            k.KO(0, t, " Safari");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s75, t)) {
-            r = m = 1;
-            k.KO(0, t, " Opera");
-        } else if (k.KKM(e, 16384, 89)) {
-            r = m = 1;
-            k.KO(0, t, " [Browser Undefined]");
-        }
-        return r;
-    };
-}
\ No newline at end of file
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_platformtest());}function Keyboard_platformtest(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_platformtest";this.KN="PlatformTest";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0;this.s20="touch";this.s21="hardware";this.s24="windows";this.s25="android";this.s26="ios";this.s27="macosx";this.s28="linux";this.s31="desktop";this.s32="tablet";this.s33="phone";this.s36="native";this.s37="web";this.s40="ie";this.s41="chrome";this.s42="edge";this.s43="firefox";this.s44="safari";this.s45="opera";this.s48="touch";this.s49="hardware";this.s52="platform-x";this.s55="WinDOWS";this.s56="ANDroid";this.s57="iOS";this.s58="macOSX";this.s59="LINUX";this.s61="touch";this.s62="hardware";this.s63="windows";this.s64="android";this.s65="ios";this.s66="macosx";this.s67="linux";this.s68="desktop";this.s69="tablet";this.s70="phone";this.s71="native";this.s72="web";this.s73="ie";this.s74="chrome";this.s75="edge";this.s76="firefox";this.s77="safari";this.s78="opera";this.s79="touch";this.s80="hardware";this.s81="platform-x";this.s82="WinDOWS";this.s83="ANDroid";this.s84="iOS";this.s85="macOSX";this.s86="LINUX";this.KVER="18.0.241.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KDC(0,t);r=this.g1(t,e);m=2;}}if(!m&&k.KIK(e)) {r=1;k.KDC(-1,t);r=this.g9(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s20,t)){m=1;k.KDC(0,t);k.KO(-1,t,"touch");}else if(k.KIFS(31,this.s21,t)){m=1;k.KDC(0,t);k.KO(-1,t,"hardware");}if(m==1) {k.KDC(-1,t);r=this.g2(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t,"undefined");r=this.g2(t,e);m=2;}return r;};this.g2=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s24,t)){m=1;k.KDC(0,t);k.KO(-1,t," windows");}else if(k.KIFS(31,this.s25,t)){m=1;k.KDC(0,t);k.KO(-1,t," android");}else if(k.KIFS(31,this.s26,t)){m=1;k.KDC(0,t);k.KO(-1,t," ios");}else if(k.KIFS(31,this.s27,t)){m=1;k.KDC(0,t);k.KO(-1,t," macosx");}else if(k.KIFS(31,this.s28,t)){m=1;k.KDC(0,t);k.KO(-1,t," linux");}if(m==1) {k.KDC(-1,t);r=this.g3(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g3(t,e);m=2;}return r;};this.g3=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s31,t)){m=1;k.KDC(0,t);k.KO(-1,t," desktop");}else if(k.KIFS(31,this.s32,t)){m=1;k.KDC(0,t);k.KO(-1,t," tablet");}else if(k.KIFS(31,this.s33,t)){m=1;k.KDC(0,t);k.KO(-1,t," phone");}if(m==1) {k.KDC(-1,t);r=this.g4(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g4(t,e);m=2;}return r;};this.g4=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s36,t)){m=1;k.KDC(0,t);k.KO(-1,t," native");}else if(k.KIFS(31,this.s37,t)){m=1;k.KDC(0,t);k.KO(-1,t," web");}if(m==1) {k.KDC(-1,t);r=this.g5(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g5(t,e);m=2;}return r;};this.g5=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s40,t)){m=1;k.KDC(0,t);k.KO(-1,t," ie");}else if(k.KIFS(31,this.s41,t)){m=1;k.KDC(0,t);k.KO(-1,t," chrome");}else if(k.KIFS(31,this.s42,t)){m=1;k.KDC(0,t);k.KO(-1,t," edge");}else if(k.KIFS(31,this.s43,t)){m=1;k.KDC(0,t);k.KO(-1,t," firefox");}else if(k.KIFS(31,this.s44,t)){m=1;k.KDC(0,t);k.KO(-1,t," safari");}else if(k.KIFS(31,this.s45,t)){m=1;k.KDC(0,t);k.KO(-1,t," opera");}if(m==1) {k.KDC(-1,t);r=this.g6(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g6(t,e);m=2;}return r;};this.g6=function(t,e) {var k=KeymanWeb,r=1,m=0;if(!k.KIFS(31,this.s48,t)){m=1;k.KDC(0,t);k.KO(-1,t," !touch");}else if(!k.KIFS(31,this.s49,t)){m=1;k.KDC(0,t);k.KO(-1,t," !hardware");}if(m==1) {k.KDC(-1,t);r=this.g7(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g7(t,e);m=2;}return r;};this.g7=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s52,t)){m=1;k.KDC(0,t);k.KO(-1,t," platform-x");}if(m==1) {k.KDC(-1,t);r=this.g8(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g8(t,e);m=2;}return r;};this.g8=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s55,t)){m=1;k.KDC(0,t);k.KO(-1,t," windows");}else if(k.KIFS(31,this.s56,t)){m=1;k.KDC(0,t);k.KO(-1,t," android");}else if(k.KIFS(31,this.s57,t)){m=1;k.KDC(0,t);k.KO(-1,t," ios");}else if(k.KIFS(31,this.s58,t)){m=1;k.KDC(0,t);k.KO(-1,t," macosx");}else if(k.KIFS(31,this.s59,t)){m=1;k.KDC(0,t);k.KO(-1,t," linux");}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");}return r;};this.g9=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,69)) {if(k.KIFS(31,this.s82,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Windows");}else if(k.KIFS(31,this.s83,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Android");}else if(k.KIFS(31,this.s84,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," iOS");}else if(k.KIFS(31,this.s85,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," macOS");}else if(k.KIFS(31,this.s86,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Linux");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [OS Undefined (case insensitive test)]");}}else if(k.KKM(e,16384,73)) {if(k.KIFS(31,this.s68,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Desktop");}else if(k.KIFS(31,this.s69,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Tablet");}else if(k.KIFS(31,this.s70,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Phone");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [FF Undefined]");}}else if(k.KKM(e,16384,79)) {if(k.KIFS(31,this.s63,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Windows");}else if(k.KIFS(31,this.s64,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Android");}else if(k.KIFS(31,this.s65,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," iOS");}else if(k.KIFS(31,this.s66,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," OSX");}else if(k.KIFS(31,this.s67,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Linux");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [OS Undefined]");}}else if(k.KKM(e,16384,80)) {if(k.KIFS(31,this.s61,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"Touch");}else if(k.KIFS(31,this.s62,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"Hardware");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"[UI Undefined]");}}else if(k.KKM(e,16384,82)) {if(k.KIFS(31,this.s81,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Platform-X");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Platform-X Undefined]");}}else if(k.KKM(e,16384,84)) {if(!k.KIFS(31,this.s79,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," !Touch");}else if(!k.KIFS(31,this.s80,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," !Hardware");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Inverted OS Undefined]");}}else if(k.KKM(e,16384,85)) {if(k.KIFS(31,this.s71,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Native");}else if(k.KIFS(31,this.s72,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Web");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Nativeness Undefined]");}}else if(k.KKM(e,16384,89)) {if(k.KIFS(31,this.s73,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," IE");}else if(k.KIFS(31,this.s74,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Chrome");}else if(k.KIFS(31,this.s75,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Edge");}else if(k.KIFS(31,this.s76,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Firefox");}else if(k.KIFS(31,this.s77,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Safari");}else if(k.KIFS(31,this.s78,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Opera");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Browser Undefined]");}}return r;};}
\ No newline at end of file
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kmn b/windows/src/test/manual-tests/platform-rules/platformtest.kmn
index b33fe0e763..490f569e3e 100644
--- a/windows/src/test/manual-tests/platform-rules/platformtest.kmn
+++ b/windows/src/test/manual-tests/platform-rules/platformtest.kmn
@@ -1,5 +1,8 @@
-store(&TARGETS) 'any'
+store(&VERSION) '10.0'
+store(&TARGETS) 'any'
 store(&NAME) 'PlatformTest'
+store(&KEYBOARDVERSION) '1.0'
+store(&COPYRIGHT) '© SIL Global'
 begin Unicode > use(main)
 
 group(main) using keys
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kmp b/windows/src/test/manual-tests/platform-rules/platformtest.kmp
index c6a939f9aed7ee0a711ff44af2ba9a84bc609a93..d60fe88152402ace7557a0f1513857bb070579c3 100644
GIT binary patch
literal 3701
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
G*Xlp`qo-Q{

literal 3699
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
SQ2s6;zv$mDW`DZhtA7A!4#s={

diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kmx b/windows/src/test/manual-tests/platform-rules/platformtest.kmx
index b9c9de160ea59a315d221139358cbc3ed1d504b1..6d1ff7e97aad5f5abe830504a25757aa4a00a6ec 100644
GIT binary patch
literal 5260
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

literal 5184
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
J-()<K{ssBkm&5=7

diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kpj b/windows/src/test/manual-tests/platform-rules/platformtest.kpj
index e476987511..a21d2e3687 100644
--- a/windows/src/test/manual-tests/platform-rules/platformtest.kpj
+++ b/windows/src/test/manual-tests/platform-rules/platformtest.kpj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <KeymanDeveloperProject>
-  <Options>
-    <BuildPath></BuildPath>
-    <CompilerWarningsAsErrors>False</CompilerWarningsAsErrors>
-    <WarnDeprecatedCode>True</WarnDeprecatedCode>
-  </Options>
+  <Options/>
   <Files>
     <File>
       <ID>id_c1593d698cb624690005787147089dab</ID>
@@ -14,6 +10,7 @@
       <FileType>.kmn</FileType>
       <Details>
         <Name>PlatformTest</Name>
+        <Copyright>© SIL Global</Copyright>
       </Details>
     </File>
     <File>
@@ -28,8 +25,8 @@
     </File>
     <File>
       <ID>id_61f04814d427ce02953436f3ea7d7a65</ID>
-      <Filename>PlatformTest.kmx</Filename>
-      <Filepath>PlatformTest.kmx</Filepath>
+      <Filename>platformtest.kmx</Filename>
+      <Filepath>platformtest.kmx</Filepath>
       <FileVersion></FileVersion>
       <FileType>.kmx</FileType>
       <ParentFileID>id_18e336f9ad890bf821ff56e1a7764478</ParentFileID>
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kps b/windows/src/test/manual-tests/platform-rules/platformtest.kps
index 825b0d5607..2418fadd7c 100644
--- a/windows/src/test/manual-tests/platform-rules/platformtest.kps
+++ b/windows/src/test/manual-tests/platform-rules/platformtest.kps
@@ -20,8 +20,8 @@
   </Info>
   <Files>
     <File>
-      <Name>PlatformTest.kmx</Name>
-      <Description>Keyboard PlatformTest</Description>
+      <Name>platformtest.kmx</Name>
+      <Description>Keyboard Platformtest</Description>
       <CopyLocation>0</CopyLocation>
       <FileType>.kmx</FileType>
     </File>

From 5f021e3884d0a59f29a69bc2bf26c23a5afcd0d5 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 24 Oct 2025 14:10:57 +0700
Subject: [PATCH 12/83] chore(windows): Beautify platformtest.js

---
 .../platform-rules/platformtest.js            | 500 +++++++++++++++++-
 1 file changed, 499 insertions(+), 1 deletion(-)

diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.js b/windows/src/test/manual-tests/platform-rules/platformtest.js
index f7d08ad396..341447c7a8 100644
--- a/windows/src/test/manual-tests/platform-rules/platformtest.js
+++ b/windows/src/test/manual-tests/platform-rules/platformtest.js
@@ -1 +1,499 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_platformtest());}function Keyboard_platformtest(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_platformtest";this.KN="PlatformTest";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0;this.s20="touch";this.s21="hardware";this.s24="windows";this.s25="android";this.s26="ios";this.s27="macosx";this.s28="linux";this.s31="desktop";this.s32="tablet";this.s33="phone";this.s36="native";this.s37="web";this.s40="ie";this.s41="chrome";this.s42="edge";this.s43="firefox";this.s44="safari";this.s45="opera";this.s48="touch";this.s49="hardware";this.s52="platform-x";this.s55="WinDOWS";this.s56="ANDroid";this.s57="iOS";this.s58="macOSX";this.s59="LINUX";this.s61="touch";this.s62="hardware";this.s63="windows";this.s64="android";this.s65="ios";this.s66="macosx";this.s67="linux";this.s68="desktop";this.s69="tablet";this.s70="phone";this.s71="native";this.s72="web";this.s73="ie";this.s74="chrome";this.s75="edge";this.s76="firefox";this.s77="safari";this.s78="opera";this.s79="touch";this.s80="hardware";this.s81="platform-x";this.s82="WinDOWS";this.s83="ANDroid";this.s84="iOS";this.s85="macOSX";this.s86="LINUX";this.KVER="18.0.241.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KDC(0,t);r=this.g1(t,e);m=2;}}if(!m&&k.KIK(e)) {r=1;k.KDC(-1,t);r=this.g9(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s20,t)){m=1;k.KDC(0,t);k.KO(-1,t,"touch");}else if(k.KIFS(31,this.s21,t)){m=1;k.KDC(0,t);k.KO(-1,t,"hardware");}if(m==1) {k.KDC(-1,t);r=this.g2(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t,"undefined");r=this.g2(t,e);m=2;}return r;};this.g2=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s24,t)){m=1;k.KDC(0,t);k.KO(-1,t," windows");}else if(k.KIFS(31,this.s25,t)){m=1;k.KDC(0,t);k.KO(-1,t," android");}else if(k.KIFS(31,this.s26,t)){m=1;k.KDC(0,t);k.KO(-1,t," ios");}else if(k.KIFS(31,this.s27,t)){m=1;k.KDC(0,t);k.KO(-1,t," macosx");}else if(k.KIFS(31,this.s28,t)){m=1;k.KDC(0,t);k.KO(-1,t," linux");}if(m==1) {k.KDC(-1,t);r=this.g3(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g3(t,e);m=2;}return r;};this.g3=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s31,t)){m=1;k.KDC(0,t);k.KO(-1,t," desktop");}else if(k.KIFS(31,this.s32,t)){m=1;k.KDC(0,t);k.KO(-1,t," tablet");}else if(k.KIFS(31,this.s33,t)){m=1;k.KDC(0,t);k.KO(-1,t," phone");}if(m==1) {k.KDC(-1,t);r=this.g4(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g4(t,e);m=2;}return r;};this.g4=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s36,t)){m=1;k.KDC(0,t);k.KO(-1,t," native");}else if(k.KIFS(31,this.s37,t)){m=1;k.KDC(0,t);k.KO(-1,t," web");}if(m==1) {k.KDC(-1,t);r=this.g5(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g5(t,e);m=2;}return r;};this.g5=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s40,t)){m=1;k.KDC(0,t);k.KO(-1,t," ie");}else if(k.KIFS(31,this.s41,t)){m=1;k.KDC(0,t);k.KO(-1,t," chrome");}else if(k.KIFS(31,this.s42,t)){m=1;k.KDC(0,t);k.KO(-1,t," edge");}else if(k.KIFS(31,this.s43,t)){m=1;k.KDC(0,t);k.KO(-1,t," firefox");}else if(k.KIFS(31,this.s44,t)){m=1;k.KDC(0,t);k.KO(-1,t," safari");}else if(k.KIFS(31,this.s45,t)){m=1;k.KDC(0,t);k.KO(-1,t," opera");}if(m==1) {k.KDC(-1,t);r=this.g6(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g6(t,e);m=2;}return r;};this.g6=function(t,e) {var k=KeymanWeb,r=1,m=0;if(!k.KIFS(31,this.s48,t)){m=1;k.KDC(0,t);k.KO(-1,t," !touch");}else if(!k.KIFS(31,this.s49,t)){m=1;k.KDC(0,t);k.KO(-1,t," !hardware");}if(m==1) {k.KDC(-1,t);r=this.g7(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g7(t,e);m=2;}return r;};this.g7=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s52,t)){m=1;k.KDC(0,t);k.KO(-1,t," platform-x");}if(m==1) {k.KDC(-1,t);r=this.g8(t,e);m=2;}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");r=this.g8(t,e);m=2;}return r;};this.g8=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KIFS(31,this.s55,t)){m=1;k.KDC(0,t);k.KO(-1,t," windows");}else if(k.KIFS(31,this.s56,t)){m=1;k.KDC(0,t);k.KO(-1,t," android");}else if(k.KIFS(31,this.s57,t)){m=1;k.KDC(0,t);k.KO(-1,t," ios");}else if(k.KIFS(31,this.s58,t)){m=1;k.KDC(0,t);k.KO(-1,t," macosx");}else if(k.KIFS(31,this.s59,t)){m=1;k.KDC(0,t);k.KO(-1,t," linux");}if(!m) {k.KDC(-1,t);k.KO(-1,t," undefined");}return r;};this.g9=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,69)) {if(k.KIFS(31,this.s82,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Windows");}else if(k.KIFS(31,this.s83,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Android");}else if(k.KIFS(31,this.s84,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," iOS");}else if(k.KIFS(31,this.s85,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," macOS");}else if(k.KIFS(31,this.s86,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Linux");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [OS Undefined (case insensitive test)]");}}else if(k.KKM(e,16384,73)) {if(k.KIFS(31,this.s68,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Desktop");}else if(k.KIFS(31,this.s69,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Tablet");}else if(k.KIFS(31,this.s70,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Phone");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [FF Undefined]");}}else if(k.KKM(e,16384,79)) {if(k.KIFS(31,this.s63,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Windows");}else if(k.KIFS(31,this.s64,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Android");}else if(k.KIFS(31,this.s65,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," iOS");}else if(k.KIFS(31,this.s66,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," OSX");}else if(k.KIFS(31,this.s67,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Linux");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [OS Undefined]");}}else if(k.KKM(e,16384,80)) {if(k.KIFS(31,this.s61,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"Touch");}else if(k.KIFS(31,this.s62,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"Hardware");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"[UI Undefined]");}}else if(k.KKM(e,16384,82)) {if(k.KIFS(31,this.s81,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Platform-X");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Platform-X Undefined]");}}else if(k.KKM(e,16384,84)) {if(!k.KIFS(31,this.s79,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," !Touch");}else if(!k.KIFS(31,this.s80,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," !Hardware");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Inverted OS Undefined]");}}else if(k.KKM(e,16384,85)) {if(k.KIFS(31,this.s71,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Native");}else if(k.KIFS(31,this.s72,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Web");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Nativeness Undefined]");}}else if(k.KKM(e,16384,89)) {if(k.KIFS(31,this.s73,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," IE");}else if(k.KIFS(31,this.s74,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Chrome");}else if(k.KIFS(31,this.s75,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Edge");}else if(k.KIFS(31,this.s76,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Firefox");}else if(k.KIFS(31,this.s77,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Safari");}else if(k.KIFS(31,this.s78,t)){r=m=1;k.KDC(0,t);k.KO(-1,t," Opera");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t," [Browser Undefined]");}}return r;};}
\ No newline at end of file
+if (typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if (typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+  KeymanWeb.KR(new Keyboard_platformtest());
+}
+
+function Keyboard_platformtest() {
+  this._v = (typeof keyman != "undefined" && typeof keyman.version == "string") ? parseInt(keyman.version, 10) : 9;
+  this.KI = "Keyboard_platformtest";
+  this.KN = "PlatformTest";
+  this.KMINVER = "10.0";
+  this.KV = null;
+  this.KDU = 0;
+  this.KH = '';
+  this.KM = 0;
+  this.KBVER = "1.0";
+  this.KMBM = 0x0;
+  this.s20 = "touch";
+  this.s21 = "hardware";
+  this.s24 = "windows";
+  this.s25 = "android";
+  this.s26 = "ios";
+  this.s27 = "macosx";
+  this.s28 = "linux";
+  this.s31 = "desktop";
+  this.s32 = "tablet";
+  this.s33 = "phone";
+  this.s36 = "native";
+  this.s37 = "web";
+  this.s40 = "ie";
+  this.s41 = "chrome";
+  this.s42 = "edge";
+  this.s43 = "firefox";
+  this.s44 = "safari";
+  this.s45 = "opera";
+  this.s48 = "touch";
+  this.s49 = "hardware";
+  this.s52 = "platform-x";
+  this.s55 = "WinDOWS";
+  this.s56 = "ANDroid";
+  this.s57 = "iOS";
+  this.s58 = "macOSX";
+  this.s59 = "LINUX";
+  this.s61 = "touch";
+  this.s62 = "hardware";
+  this.s63 = "windows";
+  this.s64 = "android";
+  this.s65 = "ios";
+  this.s66 = "macosx";
+  this.s67 = "linux";
+  this.s68 = "desktop";
+  this.s69 = "tablet";
+  this.s70 = "phone";
+  this.s71 = "native";
+  this.s72 = "web";
+  this.s73 = "ie";
+  this.s74 = "chrome";
+  this.s75 = "edge";
+  this.s76 = "firefox";
+  this.s77 = "safari";
+  this.s78 = "opera";
+  this.s79 = "touch";
+  this.s80 = "hardware";
+  this.s81 = "platform-x";
+  this.s82 = "WinDOWS";
+  this.s83 = "ANDroid";
+  this.s84 = "iOS";
+  this.s85 = "macOSX";
+  this.s86 = "LINUX";
+  this.KVER = "18.0.241.0";
+  this.KVS = [];
+  this.gs = function(t, e) {
+    return this.g0(t, e);
+  };
+  this.gs = function(t, e) {
+    return this.g0(t, e);
+  };
+  this.g0 = function(t, e) {
+    var k = KeymanWeb,
+      r = 0,
+      m = 0;
+    if (k.KKM(e, 16384, 65)) {
+      if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        r = this.g1(t, e);
+        m = 2;
+      }
+    }
+    if (!m && k.KIK(e)) {
+      r = 1;
+      k.KDC(-1, t);
+      r = this.g9(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g1 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (k.KIFS(31, this.s20, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, "touch");
+    } else if (k.KIFS(31, this.s21, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, "hardware");
+    }
+    if (m == 1) {
+      k.KDC(-1, t);
+      r = this.g2(t, e);
+      m = 2;
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, "undefined");
+      r = this.g2(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g2 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (k.KIFS(31, this.s24, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " windows");
+    } else if (k.KIFS(31, this.s25, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " android");
+    } else if (k.KIFS(31, this.s26, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " ios");
+    } else if (k.KIFS(31, this.s27, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " macosx");
+    } else if (k.KIFS(31, this.s28, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " linux");
+    }
+    if (m == 1) {
+      k.KDC(-1, t);
+      r = this.g3(t, e);
+      m = 2;
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, " undefined");
+      r = this.g3(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g3 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (k.KIFS(31, this.s31, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " desktop");
+    } else if (k.KIFS(31, this.s32, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " tablet");
+    } else if (k.KIFS(31, this.s33, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " phone");
+    }
+    if (m == 1) {
+      k.KDC(-1, t);
+      r = this.g4(t, e);
+      m = 2;
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, " undefined");
+      r = this.g4(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g4 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (k.KIFS(31, this.s36, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " native");
+    } else if (k.KIFS(31, this.s37, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " web");
+    }
+    if (m == 1) {
+      k.KDC(-1, t);
+      r = this.g5(t, e);
+      m = 2;
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, " undefined");
+      r = this.g5(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g5 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (k.KIFS(31, this.s40, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " ie");
+    } else if (k.KIFS(31, this.s41, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " chrome");
+    } else if (k.KIFS(31, this.s42, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " edge");
+    } else if (k.KIFS(31, this.s43, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " firefox");
+    } else if (k.KIFS(31, this.s44, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " safari");
+    } else if (k.KIFS(31, this.s45, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " opera");
+    }
+    if (m == 1) {
+      k.KDC(-1, t);
+      r = this.g6(t, e);
+      m = 2;
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, " undefined");
+      r = this.g6(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g6 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (!k.KIFS(31, this.s48, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " !touch");
+    } else if (!k.KIFS(31, this.s49, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " !hardware");
+    }
+    if (m == 1) {
+      k.KDC(-1, t);
+      r = this.g7(t, e);
+      m = 2;
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, " undefined");
+      r = this.g7(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g7 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (k.KIFS(31, this.s52, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " platform-x");
+    }
+    if (m == 1) {
+      k.KDC(-1, t);
+      r = this.g8(t, e);
+      m = 2;
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, " undefined");
+      r = this.g8(t, e);
+      m = 2;
+    }
+    return r;
+  };
+  this.g8 = function(t, e) {
+    var k = KeymanWeb,
+      r = 1,
+      m = 0;
+    if (k.KIFS(31, this.s55, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " windows");
+    } else if (k.KIFS(31, this.s56, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " android");
+    } else if (k.KIFS(31, this.s57, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " ios");
+    } else if (k.KIFS(31, this.s58, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " macosx");
+    } else if (k.KIFS(31, this.s59, t)) {
+      m = 1;
+      k.KDC(0, t);
+      k.KO(-1, t, " linux");
+    }
+    if (!m) {
+      k.KDC(-1, t);
+      k.KO(-1, t, " undefined");
+    }
+    return r;
+  };
+  this.g9 = function(t, e) {
+    var k = KeymanWeb,
+      r = 0,
+      m = 0;
+    if (k.KKM(e, 16384, 69)) {
+      if (k.KIFS(31, this.s82, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Windows");
+      } else if (k.KIFS(31, this.s83, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Android");
+      } else if (k.KIFS(31, this.s84, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " iOS");
+      } else if (k.KIFS(31, this.s85, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " macOS");
+      } else if (k.KIFS(31, this.s86, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Linux");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " [OS Undefined (case insensitive test)]");
+      }
+    } else if (k.KKM(e, 16384, 73)) {
+      if (k.KIFS(31, this.s68, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Desktop");
+      } else if (k.KIFS(31, this.s69, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Tablet");
+      } else if (k.KIFS(31, this.s70, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Phone");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " [FF Undefined]");
+      }
+    } else if (k.KKM(e, 16384, 79)) {
+      if (k.KIFS(31, this.s63, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Windows");
+      } else if (k.KIFS(31, this.s64, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Android");
+      } else if (k.KIFS(31, this.s65, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " iOS");
+      } else if (k.KIFS(31, this.s66, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " OSX");
+      } else if (k.KIFS(31, this.s67, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Linux");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " [OS Undefined]");
+      }
+    } else if (k.KKM(e, 16384, 80)) {
+      if (k.KIFS(31, this.s61, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, "Touch");
+      } else if (k.KIFS(31, this.s62, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, "Hardware");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, "[UI Undefined]");
+      }
+    } else if (k.KKM(e, 16384, 82)) {
+      if (k.KIFS(31, this.s81, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Platform-X");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " [Platform-X Undefined]");
+      }
+    } else if (k.KKM(e, 16384, 84)) {
+      if (!k.KIFS(31, this.s79, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " !Touch");
+      } else if (!k.KIFS(31, this.s80, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " !Hardware");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " [Inverted OS Undefined]");
+      }
+    } else if (k.KKM(e, 16384, 85)) {
+      if (k.KIFS(31, this.s71, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Native");
+      } else if (k.KIFS(31, this.s72, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Web");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " [Nativeness Undefined]");
+      }
+    } else if (k.KKM(e, 16384, 89)) {
+      if (k.KIFS(31, this.s73, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " IE");
+      } else if (k.KIFS(31, this.s74, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Chrome");
+      } else if (k.KIFS(31, this.s75, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Edge");
+      } else if (k.KIFS(31, this.s76, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Firefox");
+      } else if (k.KIFS(31, this.s77, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Safari");
+      } else if (k.KIFS(31, this.s78, t)) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " Opera");
+      } else if (1) {
+        r = m = 1;
+        k.KDC(0, t);
+        k.KO(-1, t, " [Browser Undefined]");
+      }
+    }
+    return r;
+  };
+}

From a51f4ff9659daf55ed2b0ead34f80668c4f57f5f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 24 Oct 2025 11:00:07 +0200
Subject: [PATCH 13/83] fix(mac): ignore non-Unicode key caps when preparing
 OSK

The typeFlags property is used to differentiate Unicode and non-Unicode
keys in the array of keys in a .kvk file. All non-Unicode keys should
be ignored, as we do not support non-Unicode keyboards on macOS.

The reason this fixes #15007, is that the keyboard in question had both
ANSI and Unicode sections in its .kvk file, and the ANSI section was
stored after the Unicode section, so the font spec for ANSI was
overriding the previously (correctly) set Unicode font spec.

Fixes: #15007
---
 .../KME/OnScreenKeyboard/OSKView.m            | 93 ++++++++++---------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m
index e98fe60663..e576d000b8 100644
--- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m
+++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m
@@ -64,7 +64,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
     // Custom initialization
     [self initOSKKeys];
   }
-  
+
   return self;
 }
 
@@ -76,26 +76,26 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
 
 - (void)drawRect:(NSRect)rect {
   os_log_debug([KMELogs oskLog], "OSKView drawRect: %{public}@", NSStringFromRect(rect));
-  
+
   CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] CGContext];
   CGContextSetLineJoin(context, kCGLineJoinRound);
   CGContextSetLineWidth(context, 1.0);
   CGColorRef cgClearColor = CGColorGetConstantColor(kCGColorClear);
   CGContextSetStrokeColorWithColor(context, cgClearColor);
   CGContextSetFillColorWithColor(context, cgClearColor);
-  
+
   CGContextBeginPath(context);
   CGContextAddRect(context, CGRectMake(1.0, 1.0, rect.size.width-1.0, rect.size.height-1.0));
   CGContextDrawPath(context, kCGPathStroke);
-  
+
   CGContextBeginPath(context);
   CGContextAddRect(context, CGRectMake(1.0, 1.0, rect.size.width-1.0, rect.size.height-1.0));
   CGContextClip(context);
-  
+
   //TODO: gradient from clear to clear -- what does this do?
   NSColor *bgColor = [NSColor clearColor]; //[NSColor colorWithWhite:0.7 alpha:1.0];
   NSColor *bgColor2 = [NSColor clearColor]; //[NSColor colorWithWhite:0.5 alpha:1.0];
-  
+
   CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
   NSArray *gradientColors = [NSArray arrayWithObjects:(id)bgColor.CGColor, bgColor2.CGColor, nil];
   CGFloat gradientLocations[] = {0, 1};
@@ -135,11 +135,11 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
 - (void)setKvk:(KVKFile *)kvk {
   os_log_debug([KMELogs oskLog], "OSKView setKvk, forces keyboard to re-layout");
   _kvk = kvk;
-  
+
   // Force the keyboard to re-layout
   _oskLayout = nil;
   _oskDefaultNKeys = nil;
-  
+
   [self updateKeyLabelsForCurrentLayer];
 }
 
@@ -173,7 +173,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
     }
     py += keyHeight;
   }
-  
+
   [self updateKeyLabelsForCurrentLayer];
 }
 
@@ -195,7 +195,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
                      [[OSKKey alloc] initWithKeyCode:MVK_MINUS caption:@"-" scale:1.0],
                      [[OSKKey alloc] initWithKeyCode:MVK_EQUAL caption:@"=" scale:1.0],
                      [[OSKKey alloc] initWithKeyCode:MVK_BACKSPACE caption:@"⬅︎" scale:1.5], nil];
-    
+
     NSArray *row2 = [NSArray arrayWithObjects:
                      [[OSKKey alloc] initWithKeyCode:MVK_TAB caption:@"↹" scale:1.5],
                      [[OSKKey alloc] initWithKeyCode:MVK_Q caption:@"Q" scale:1.0],
@@ -211,7 +211,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
                      [[OSKKey alloc] initWithKeyCode:MVK_LEFT_BRACKET caption:@"[" scale:1.0],
                      [[OSKKey alloc] initWithKeyCode:MVK_RIGHT_BRACKET caption:@"]" scale:1.0],
                      [[OSKKey alloc] initWithKeyCode:MVK_BACKSLASH caption:@"\\" scale:1.0], nil];
-    
+
     NSArray *row3 = [NSArray arrayWithObjects:
                      [[OSKKey alloc] initWithKeyCode:MVK_CAPS_LOCK caption:@"Caps Lock" scale:1.75],
                      [[OSKKey alloc] initWithKeyCode:MVK_A caption:@"A" scale:1.0],
@@ -226,14 +226,14 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
                      [[OSKKey alloc] initWithKeyCode:MVK_SEMICOLON caption:@";" scale:1.0],
                      [[OSKKey alloc] initWithKeyCode:MVK_QUOTE caption:@"'" scale:1.0],
                      [[OSKKey alloc] initWithKeyCode:MVK_ENTER caption:@"↵" scale:1.75], nil];
-    
+
     NSArray *row4a = [self use102ndKey] ?
     [NSArray arrayWithObjects:
      [[OSKKey alloc] initWithKeyCode:MVK_LEFT_SHIFT caption:@"⇧" scale:1.25],
      [[OSKKey alloc] initWithKeyCode:MVK_OEM102 caption:@"\\" scale:1.0], nil] :
     [NSArray arrayWithObjects:
      [[OSKKey alloc] initWithKeyCode:MVK_LEFT_SHIFT caption:@"⇧" scale:2.25], nil];
-    
+
     NSArray *row4b = [NSArray arrayWithObjects:
                       [[OSKKey alloc] initWithKeyCode:MVK_Z caption:@"Z" scale:1.0],
                       [[OSKKey alloc] initWithKeyCode:MVK_X caption:@"X" scale:1.0],
@@ -246,19 +246,19 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
                       [[OSKKey alloc] initWithKeyCode:MVK_PERIOD caption:@"." scale:1.0],
                       [[OSKKey alloc] initWithKeyCode:MVK_SLASH caption:@"/" scale:1.0],
                       [[OSKKey alloc] initWithKeyCode:MVK_RIGHT_SHIFT caption:@"⇧" scale:2.25], nil];
-    
+
     NSArray *row4 = [row4a arrayByAddingObjectsFromArray:row4b];
-    
+
     NSArray *row5 = [NSArray arrayWithObjects:
                      [[OSKKey alloc] initWithKeyCode:MVK_LEFT_CTRL caption:@"Ctrl" scale:1.75],
                      [[OSKKey alloc] initWithKeyCode:MVK_LEFT_ALT caption:@"Alt" scale:1.5],
                      [[OSKKey alloc] initWithKeyCode:MVK_SPACE caption:@"" scale:8.0],
                      [[OSKKey alloc] initWithKeyCode:MVK_RIGHT_ALT caption:@"Alt" scale:1.5],
                      [[OSKKey alloc] initWithKeyCode:MVK_RIGHT_CTRL caption:@"Ctrl" scale:1.75], nil];
-    
+
     _oskLayout = [NSArray arrayWithObjects:row1, row2, row3, row4, row5, nil];
   }
-  
+
   return _oskLayout;
 }
 
@@ -266,7 +266,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   if (_oskDefaultNKeys == nil) {
     os_log_debug([KMELogs oskLog], "oskDefaultNKeys -> creating new arrays of default number OSKKey objects");
     NSMutableArray *defNKeys = [[NSMutableArray alloc] initWithCapacity:0];
-    
+
     // row 1
     NKey *nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_GRAVE; nkey1.text = @"`"; nkey1.bitmap = nil;
     NKey *nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_GRAVE; nkey2.text = @"~"; nkey2.bitmap = nil;
@@ -307,7 +307,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
     nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_EQUAL; nkey1.text = @"="; nkey1.bitmap = nil;
     nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_EQUAL; nkey2.text = @"+"; nkey2.bitmap = nil;
     [defNKeys addObjectsFromArray:@[nkey1, nkey2]];
-    
+
     // row 2
     nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_KEY_Q; nkey1.text = @"q"; nkey1.bitmap = nil;
     nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_KEY_Q; nkey2.text = @"Q"; nkey2.bitmap = nil;
@@ -348,7 +348,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
     nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_BACKSLASH; nkey1.text = @"\\"; nkey1.bitmap = nil;
     nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_BACKSLASH; nkey2.text = @"|"; nkey2.bitmap = nil;
     [defNKeys addObjectsFromArray:@[nkey1, nkey2]];
-    
+
     // row 3
     nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_KEY_A; nkey1.text = @"a"; nkey1.bitmap = nil;
     nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_KEY_A; nkey2.text = @"A"; nkey2.bitmap = nil;
@@ -383,7 +383,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
     nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_QUOTE; nkey1.text = @"'"; nkey1.bitmap = nil;
     nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_QUOTE; nkey2.text = @"\""; nkey2.bitmap = nil;
     [defNKeys addObjectsFromArray:@[nkey1, nkey2]];
-    
+
     if([self use102ndKey]) {
       nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_OEM_102; nkey1.text = @"\\"; nkey1.bitmap = nil;
       nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_OEM_102; nkey2.text = @"|"; nkey2.bitmap = nil;
@@ -420,10 +420,10 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
     nkey1 = [[NKey alloc] init]; nkey1.typeFlags = 2; nkey1.modifierFlags = 0; nkey1.keyCode = VK_SLASH; nkey1.text = @"/"; nkey1.bitmap = nil;
     nkey2 = [[NKey alloc] init]; nkey2.typeFlags = 2; nkey2.modifierFlags = 1; nkey2.keyCode = VK_SLASH; nkey2.text = @"?"; nkey2.bitmap = nil;
     [defNKeys addObjectsFromArray:@[nkey1, nkey2]];
-    
+
     _oskDefaultNKeys = [[NSArray alloc] initWithArray:defNKeys];
   }
-  
+
   return _oskDefaultNKeys;
 }
 
@@ -471,7 +471,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
     CGEventPostToPid(processId, keyUpEvent);
     CFRelease(keyDownEvent);
     CFRelease(keyUpEvent);
-    
+
     CFRelease(source);
   }
   else {
@@ -501,7 +501,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   BOOL shift = self.physicalShiftState | self.oskShiftState;
   BOOL option = self.physicalOptionState | self.oskOptionState;
   BOOL control = self.physicalControlState | self.oskControlState;
-  
+
   return [self getEventModifierFlags:shift optionFlag:option controlFlag:control];
 }
 
@@ -510,7 +510,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
  */
 - (NSEventModifierFlags)getEventModifierFlags:(BOOL)shift optionFlag:(BOOL)option controlFlag:(BOOL)control {
   NSEventModifierFlags modifierFlags = 0;
-  
+
   if (shift) {
     modifierFlags = modifierFlags | NSEventModifierFlagShift;
   }
@@ -524,7 +524,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   if (control) {
     modifierFlags = modifierFlags | NSEventModifierFlagControl;
   }
-  
+
   return modifierFlags;
 }
 
@@ -551,7 +551,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   NSView *view = [self viewWithTag:event.keyCode|0x1000];
   if (view == nil || ![view isKindOfClass:[KeyView class]])
     return;
-  
+
   KeyView *keyView = (KeyView *)view;
   if (event.type == NSEventTypeKeyDown)
     [keyView setKeyPressed:YES];
@@ -570,7 +570,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   BOOL shift = self.physicalShiftState | self.oskShiftState;
   BOOL option = self.physicalOptionState | self.oskOptionState;
   BOOL control = self.physicalControlState | self.oskControlState;
-  
+
   return [self getKeymanModifierFlags:shift optionFlag:option controlFlag:control];
 }
 
@@ -592,7 +592,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   if (control) {
     flags |= KVKS_RCTRL;
   }
-  
+
   return flags;
 }
 
@@ -602,15 +602,15 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
  */
 - (void)updateKeyLabelsForCurrentLayer {
   os_log_debug([KMELogs oskLog], "OSKView updateKeyLabelsForState, phsyical modifiers [shift: %d, option: %d, control: %d]\nosk modifiers [shift: %d, option: %d, control: %d]", self.physicalShiftState, self.physicalOptionState, self.physicalControlState, self.oskShiftState, self.oskOptionState, self.oskControlState);
-  
+
   [self resetKeyLabels];
   NSMutableArray *mKeys = [[self keyTags] mutableCopy];
   NSArray *nkeys = [self.kvk keys];
   if (nkeys == nil)
     nkeys = self.oskDefaultNKeys;
-  
+
   WORD keymanFlagsForCurrentLayer = [self getKeymanModifierFlagsForCurrentLayer];
-  
+
   NSString *ansiFont = [self ansiFont];
   NSString *unicodeFont = [self unicodeFont];
   unsigned short keyCode;
@@ -622,9 +622,8 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
         NSView *view = [self viewWithTag:keyCode|0x1000];
         if (view == nil || ![view isKindOfClass:[KeyView class]])
           continue;
-        
+
         KeyView *keyView = (KeyView *)view;
-        [keyView setLabelFont:ansiFont];
         if (nkey.typeFlags & KVKK_UNICODE) {
           [keyView setLabelText:nkey.text];
           NSString* label = nkey.text;
@@ -632,12 +631,16 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
           os_log_debug([KMELogs keyLog], "setLabelText to %{public}@, utf8data %{public}@", label, data);
           [keyView setLabelFont:unicodeFont];
           [mKeys removeObject:[NSNumber numberWithInteger:(keyCode|0x1000)]];
+        } else {
+          // This means it is a key definition for a non-Unicode layout.
+          // We do not support non-Unicode keyboards in Keyman for macOS.
+          continue;
         }
-        
+
         if (nkey.typeFlags & KVKK_BITMAP) {
           [keyView setBitmap:nkey.bitmap];
         }
-        
+
         [keyView setNeedsDisplay:YES];
       }
     }
@@ -647,7 +650,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
    NSView *view = [self viewWithTag:[t integerValue]|0x1000];
    if (view == nil || ![view isKindOfClass:[KeyView class]])
    continue;
-   
+
    KeyView *keyView = (KeyView *)view;
    [keyView setLabelText:@""];
    }*/
@@ -659,10 +662,10 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   for (NSView *view in views) {
     if (![view isKindOfClass:[KeyView class]])
       continue;
-    
+
     [keyTags addObject:[NSNumber numberWithInteger:[view tag]]];
   }
-  
+
   return keyTags;
 }
 
@@ -671,7 +674,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
   for (NSView *view in views) {
     if (![view isKindOfClass:[KeyView class]])
       continue;
-    
+
     [(KeyView *)view setKey:[(KeyView *)view key]];
     [(KeyView *)view setBitmap:nil];
     [(KeyView *)view setNeedsDisplay:YES];
@@ -687,7 +690,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
      * The state of the physical key overrides the modifier key clicked in the OSK.
      */
     _oskShiftState = NO;
-    
+
     os_log_debug([KMELogs oskLog], "hardware shift key released");
     [self updateKeyLabelsForCurrentLayer];
     [self updateShiftKeysForState];
@@ -705,7 +708,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
 - (void)setPhysicalOptionState:(BOOL)state {
   if (_physicalOptionState != state) {
     _physicalOptionState = state;
-    
+
     /**
      * When setting the physical option state, clear the OSK option state
      * The state of the physical key overrides the modifier key clicked in the OSK.
@@ -727,7 +730,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
 - (void)setPhysicalControlState:(BOOL)state {
   if (_physicalControlState != state) {
     _physicalControlState = state;
-    
+
     /**
      * When setting the physical control state, clear the OSK control state
      * The state of the physical key overrides the modifier key clicked in the OSK.
@@ -793,7 +796,7 @@ const int64_t OSK_EVENT_MODIFIER_MASK = 0x00000000FFFFFFFF;
       break;
     }
   }
-  
+
   return keyCode;
 }
 

From cbaae084f7ae7cbee9d9dc69b1c44d497ae41dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Fri, 24 Oct 2025 13:31:15 +0200
Subject: [PATCH 14/83] test(kmc-analyze): add warnings coverage tests for
 AnalyzeOskCharacterUse

---
 .../test/osk-character-use-warnings.tests.ts  | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts

diff --git a/developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts
new file mode 100644
index 0000000000..e1cfdf35f0
--- /dev/null
+++ b/developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts
@@ -0,0 +1,52 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import * as fs from 'fs';
+import { assert } from 'chai';
+import 'mocha';
+import { AnalyzeOskCharacterUse } from '../src/osk-character-use/index.js';
+import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
+import { AnalyzerMessages } from '../src/analyzer-messages.js';
+
+describe('AnalyzeOskCharacterUse warnings', function() {
+    const callbacks = new TestCompilerCallbacks();
+    const TMP_NO_COUNTS = '/tmp/mock-map-no-counts.json';
+    const TMP_WITH_COUNTS = '/tmp/mock-map-with-counts.json';
+
+    before(() => {
+        fs.writeFileSync(TMP_NO_COUNTS, JSON.stringify({
+            map: [{ usages: ['U+1780', 'U+1781'] }]
+        }));
+        fs.writeFileSync(TMP_WITH_COUNTS, JSON.stringify({
+            map: [{ usages: [{ char: 'U+1780', count: 2 }] }]
+        }));
+    });
+
+    beforeEach(() => callbacks.clear());
+
+    it('warns if previous map did not include counts but includeCounts=true', function() {
+        const a = new AnalyzeOskCharacterUse(callbacks, {
+            includeCounts: true
+        });
+
+        a.unitTestEndPoints.loadPreviousMap(TMP_NO_COUNTS);
+
+        assert.isTrue(
+            callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidNotIncludeCounts),
+            'Expected Warn_PreviousMapDidNotIncludeCounts warning'
+        );
+    });
+
+    it('warns if previous map did include counts but includeCounts=false', function() {
+        const a = new AnalyzeOskCharacterUse(callbacks, {
+            includeCounts: false
+        });
+
+        a.unitTestEndPoints.loadPreviousMap(TMP_WITH_COUNTS);
+
+        assert.isTrue(
+            callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidIncludeCounts),
+            'Expected Warn_PreviousMapDidIncludeCounts warning'
+        );
+    });
+});

From 55d6efe4822e0ee1e2eff42d37ee2c1fdea590b2 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 24 Oct 2025 14:45:17 +0200
Subject: [PATCH 15/83] fix(developer): prevent ANSI keyboards crashing
 debugger

Note: #11909 has some additional future cleanup we could do, but these
code paths are not currently accessible, so in the interest of moving
forward, am leaving them for now.

Fixes: #11909
Test-bot: skip
---
 core/src/kmx/kmx_processevent.cpp                      |  4 ++++
 .../src/tike/debug/Keyman.System.Debug.DebugEvent.pas  | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp
index 921e8d9212..09ebcdd4cd 100644
--- a/core/src/kmx/kmx_processevent.cpp
+++ b/core/src/kmx/kmx_processevent.cpp
@@ -107,10 +107,14 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
 
   if (kbd->StartGroup[BEGIN_UNICODE] == (KMX_DWORD) -1) {
     DebugLog("Non-Unicode keyboards are not supported.");
+    DeleteInternalDebugItems();
+    state->debug_items().push_end(m_actions.Length(), 0);
     m_core_state = nullptr;
     return FALSE;
   }
 
+  // TODO: what about debug_item state for all shortcut return paths below?
+  // TODO: this needs to be cleaned up; see #11909
   switch (vkey) {
   case KM_CORE_VKEY_CAPS:
     if (KeyCapsLockPress(modifiers, isKeyDown))
diff --git a/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas b/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas
index a5853faba0..426a556b56 100644
--- a/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas
+++ b/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas
@@ -342,8 +342,18 @@ var
   action_index: Integer;
 begin
   Result := True;
+
+  if not Assigned(state) then
+    raise Exception.Create('TDebugEventList.AddStateItems: expected state not to be nil');
+
   debug := km_core_state_debug_items(state, nil);
+  if not Assigned(debug) then
+    raise Exception.Create('TDebugEventList.AddStateItems: expected debug not to be nil');
+
   action := km_core_state_action_items(state, nil);
+  if not Assigned(action) then
+    raise Exception.Create('TDebugEventList.AddStateItems: expected action not to be nil');
+
   action_index := 0;
   while debug._type <> KM_CORE_DEBUG_END do
   begin

From fc87ef38aa8a9f1e383ba73bd769b30601d30639 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Fri, 24 Oct 2025 13:01:38 -0500
Subject: [PATCH 16/83] auto: increment master version to 19.0.146

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 6 ++++++
 VERSION.md | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index cc860acc0b..73ccc5f7d5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,11 @@
 # Keyman Version History
 
+## 19.0.145 alpha 2025-10-24
+
+* fix(developer): do not treat backslash as a string escape in syntax highlighting (#15001)
+* fix(developer): handle missing `begin Unicode` in KMW compiler (#15002)
+* test(developer): add test to kmc-analyze for Warn_PreviousMapFileCouldNotBeLoaded (#14038)
+
 ## 19.0.144 alpha 2025-10-23
 
 * chore(deps-dev): bump playwright from 1.46.1 to 1.56.1 (#14984)
diff --git a/VERSION.md b/VERSION.md
index d4ef205909..f0ebf516cf 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.145
\ No newline at end of file
+19.0.146
\ No newline at end of file

From 07c13e81ac032b9d1257aad3f0d485747c1da691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Sat, 25 Oct 2025 07:34:31 +0200
Subject: [PATCH 17/83] test(kmc-analyze): add message coverage tests for
 AnalyzeOskCharacterUse

---
 .../osk-character-use/mock-map-no-counts.json | 10 ++++
 .../mock-map-with-counts.json                 | 12 ++++
 .../test/osk-character-use-messages.tests.ts  | 58 +++++++++++++++++++
 .../test/osk-character-use-warnings.tests.ts  | 52 -----------------
 4 files changed, 80 insertions(+), 52 deletions(-)
 create mode 100644 developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-no-counts.json
 create mode 100644 developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-with-counts.json
 create mode 100644 developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
 delete mode 100644 developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts

diff --git a/developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-no-counts.json b/developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-no-counts.json
new file mode 100644
index 0000000000..713091194b
--- /dev/null
+++ b/developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-no-counts.json
@@ -0,0 +1,10 @@
+{
+    "map": [
+        {
+            "usages": [
+                "U+1780",
+                "U+1781"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-with-counts.json b/developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-with-counts.json
new file mode 100644
index 0000000000..bec0e8727b
--- /dev/null
+++ b/developer/src/kmc-analyze/test/fixtures/osk-character-use/mock-map-with-counts.json
@@ -0,0 +1,12 @@
+{
+    "map": [
+        {
+            "usages": [
+                {
+                    "char": "U+1780",
+                    "count": 2
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
new file mode 100644
index 0000000000..c3c59a8260
--- /dev/null
+++ b/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
@@ -0,0 +1,58 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { assert } from 'chai';
+import 'mocha';
+import { AnalyzeOskCharacterUse } from './osk-character-use/index.js';
+import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
+import { AnalyzerMessages } from './analyzer-messages.js';
+import { makePathToFixture } from './helpers/index.js';
+
+describe('AnalyzeOskCharacterUse warnings', function() {
+  const callbacks = new TestCompilerCallbacks();
+
+  const MOCK_MAP_NO_COUNTS = makePathToFixture(
+    'osk-character-use',
+    'mock-map-no-counts.json'
+  );
+  const MOCK_MAP_WITH_COUNTS = makePathToFixture(
+    'osk-character-use',
+    'mock-map-with-counts.json'
+  );
+
+  this.beforeEach(function() {
+    callbacks.clear();
+  });
+
+  this.afterEach(function() {
+    if (this.currentTest?.isFailed()) {
+      callbacks.printMessages();
+    }
+  });
+
+  it('warns if previous map did not include counts but includeCounts=true', function() {
+    const a = new AnalyzeOskCharacterUse(callbacks, {
+      includeCounts: true
+    });
+
+    a.unitTestEndPoints.loadPreviousMap(MOCK_MAP_NO_COUNTS);
+
+    assert.isTrue(
+      callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidNotIncludeCounts),
+      'Expected Warn_PreviousMapDidNotIncludeCounts warning'
+    );
+  });
+
+  it('warns if previous map did include counts but includeCounts=false', function() {
+    const a = new AnalyzeOskCharacterUse(callbacks, {
+      includeCounts: false
+    });
+
+    a.unitTestEndPoints.loadPreviousMap(MOCK_MAP_WITH_COUNTS);
+
+    assert.isTrue(
+      callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidIncludeCounts),
+      'Expected Warn_PreviousMapDidIncludeCounts warning'
+    );
+  });
+});
diff --git a/developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts
deleted file mode 100644
index e1cfdf35f0..0000000000
--- a/developer/src/kmc-analyze/test/osk-character-use-warnings.tests.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Keyman is copyright (C) SIL Global. MIT License.
- */
-import * as fs from 'fs';
-import { assert } from 'chai';
-import 'mocha';
-import { AnalyzeOskCharacterUse } from '../src/osk-character-use/index.js';
-import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
-import { AnalyzerMessages } from '../src/analyzer-messages.js';
-
-describe('AnalyzeOskCharacterUse warnings', function() {
-    const callbacks = new TestCompilerCallbacks();
-    const TMP_NO_COUNTS = '/tmp/mock-map-no-counts.json';
-    const TMP_WITH_COUNTS = '/tmp/mock-map-with-counts.json';
-
-    before(() => {
-        fs.writeFileSync(TMP_NO_COUNTS, JSON.stringify({
-            map: [{ usages: ['U+1780', 'U+1781'] }]
-        }));
-        fs.writeFileSync(TMP_WITH_COUNTS, JSON.stringify({
-            map: [{ usages: [{ char: 'U+1780', count: 2 }] }]
-        }));
-    });
-
-    beforeEach(() => callbacks.clear());
-
-    it('warns if previous map did not include counts but includeCounts=true', function() {
-        const a = new AnalyzeOskCharacterUse(callbacks, {
-            includeCounts: true
-        });
-
-        a.unitTestEndPoints.loadPreviousMap(TMP_NO_COUNTS);
-
-        assert.isTrue(
-            callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidNotIncludeCounts),
-            'Expected Warn_PreviousMapDidNotIncludeCounts warning'
-        );
-    });
-
-    it('warns if previous map did include counts but includeCounts=false', function() {
-        const a = new AnalyzeOskCharacterUse(callbacks, {
-            includeCounts: false
-        });
-
-        a.unitTestEndPoints.loadPreviousMap(TMP_WITH_COUNTS);
-
-        assert.isTrue(
-            callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidIncludeCounts),
-            'Expected Warn_PreviousMapDidIncludeCounts warning'
-        );
-    });
-});

From 469149e72d606f4632b5cb15b19e0dc7528a0d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Mon, 27 Oct 2025 08:36:56 +0100
Subject: [PATCH 18/83] test(kmc-analyze): add message coverage tests for
 AnalyzeOskCharacterUse

---
 .../kmc-analyze/test/osk-character-use-messages.tests.ts  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
index c3c59a8260..1e4cc66a40 100644
--- a/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
+++ b/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
@@ -35,8 +35,9 @@ describe('AnalyzeOskCharacterUse warnings', function() {
       includeCounts: true
     });
 
-    a.unitTestEndPoints.loadPreviousMap(MOCK_MAP_NO_COUNTS);
-
+    const result = a.unitTestEndPoints.loadPreviousMap(MOCK_MAP_NO_COUNTS);
+    assert.isNotNull(result, 'Expected map to be loaded successfully');
+    
     assert.isTrue(
       callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidNotIncludeCounts),
       'Expected Warn_PreviousMapDidNotIncludeCounts warning'
@@ -48,7 +49,8 @@ describe('AnalyzeOskCharacterUse warnings', function() {
       includeCounts: false
     });
 
-    a.unitTestEndPoints.loadPreviousMap(MOCK_MAP_WITH_COUNTS);
+    const result = a.unitTestEndPoints.loadPreviousMap(MOCK_MAP_WITH_COUNTS);
+    assert.isNotNull(result, 'Expected map to be loaded successfully');
 
     assert.isTrue(
       callbacks.hasMessage(AnalyzerMessages.WARN_PreviousMapDidIncludeCounts),

From 1d223908ffe101f4c4589033a1131946e1b998c5 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 27 Oct 2025 09:10:33 +0100
Subject: [PATCH 19/83] maint(mac): minor tweaks to mac setup, using build.sh

Build-bot: skip
Test-bot: skip
---
 mac/README.md                              | 16 +++++-----------
 resources/devbox/macos/keyman.macos.env.sh |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mac/README.md b/mac/README.md
index ef4c0d4b41..f15997e827 100644
--- a/mac/README.md
+++ b/mac/README.md
@@ -27,8 +27,8 @@ keyboard input. You have two options for local builds:
 Keyman must be signed then notarized by Apple, even for local test builds. This requires additional
 configuration for your build environment.
 
-1. First, open XCode, Preferences, Accounts, and select Manage Certificates for the identity
-   you wish to use for signing. Click **+** and select **Developer ID Application**. A
+1. First, open XCode, Settings, Accounts, and select Manage Certificates for the identity
+   you wish to use for signing. Click **+** and select **Apple Development**. A
    certificate will then be generated and listed in your Keychain.
 
 2. Find the SHA-1 hash. To find the certificate in terminal:
@@ -64,23 +64,17 @@ configuration for your build environment.
 
 To build Keyman for macOS, do the following:
 1. Open a Terminal window.
-2. cd to **keyman/mac**. **build.sh** must be run in the directory containing the script.
-3. Build using `./build.sh -no-codesign`. Run `./build.sh -help` to see all options.
-    * If you have signing credentials from the core development team, you can build a signed
-      version by omitting `-no-codesign`. Somewhat misleadingly, `-no-codesign` only stops
-      automatic signing using the certificate maintained by the core development team!
-    * If you want to deploy, you will need to also add `-config Release`, as a Debug build cannot be notarized.
+2. Build using `mac/build.sh clean configure build`
 
 Note: If Carthage prompts you to allow it access to your github credentials, it's fine to click Deny.
 
 ### Running Keyman
 
-1. Deploy Keyman locally using `./build.sh -deploy local -deploy-only`.
+1. Deploy Keyman locally using `mac/build.sh install`.
     * This will notarize the app, signing with your local credentials if not already signed, and copy **keyman/mac/Keyman4MacIM/build/Debug/Keyman.app** to **~/Library/Input Methods**
 2. If running for the first time, follow the installation instructions at [Install Keyman for macOS].
 
-You can also use `./build.sh -no-codesign -deploy local` to do a single-step build, notarize,
-and deploy (see above for faster options).
+You can also use `mac/build.sh build install` to do a single-step build, notarize, and deploy (see above for faster options).
 
 ### Compiling from Xcode
 
diff --git a/resources/devbox/macos/keyman.macos.env.sh b/resources/devbox/macos/keyman.macos.env.sh
index 5ffb36eaaf..3c6a93634c 100755
--- a/resources/devbox/macos/keyman.macos.env.sh
+++ b/resources/devbox/macos/keyman.macos.env.sh
@@ -15,7 +15,7 @@ export PATH=$ANDROID_HOME/platform-tools:$PATH
 export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$PATH
 export PATH=$ANDROID_HOME/build-tools/30.0.3:$PATH
 
-if [ -z "$HOMEBREW_PREFIX" ]; then
+if [ -z "${HOMEBREW_PREFIX+x}" ]; then
   HOMEBREW_PREFIX=`brew --prefix`
 fi
 

From 368766acdc990b891f3a4ced1f1f86b21bc3f9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Mon, 27 Oct 2025 14:05:13 +0100
Subject: [PATCH 20/83] test(kmc-analyze): fix import paths and order

---
 .../src/kmc-analyze/test/osk-character-use-messages.tests.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
index 1e4cc66a40..540ef3cb41 100644
--- a/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
+++ b/developer/src/kmc-analyze/test/osk-character-use-messages.tests.ts
@@ -3,9 +3,9 @@
  */
 import { assert } from 'chai';
 import 'mocha';
-import { AnalyzeOskCharacterUse } from './osk-character-use/index.js';
 import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
-import { AnalyzerMessages } from './analyzer-messages.js';
+import { AnalyzeOskCharacterUse } from '../src/osk-character-use/index.js';
+import { AnalyzerMessages } from '../src/analyzer-messages.js';
 import { makePathToFixture } from './helpers/index.js';
 
 describe('AnalyzeOskCharacterUse warnings', function() {

From ba411774f60923b34afec5d43fe9b85de4272383 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 27 Oct 2025 10:50:32 +0100
Subject: [PATCH 21/83] maint(resources): move NPM package publishing to GitHub
 Actions

Due to recent changes in NPM package publishing security requirements,
we have to move from TeamCity build to a GitHub Action to publish our
NPM packages, so we can take advantage of trusted publishing. This
change also consolidates and centralizes the npm publishing into
resources/build/ci/npm-publish.sh, which removes a lot of boilerplate
from each of the build.sh scripts, and ensures consistency.

Packages will be `npm pack`ed on PR and test builds, and published in
release builds.

Ref: https://docs.npmjs.com/trusted-publishers
Ref: https://github.blog/changelog/2025-09-29-strengthening-npm-security-important-changes-to-authentication-and-token-management/
Fixes: #14963
Test-bot: skip
Build-bot: release:developer
---
 .github/workflows/npm-publish.yml             | 81 +++++++++++++++++++
 common/web/keyman-version/build.sh            |  7 +-
 common/web/langtags/build.sh                  |  7 +-
 common/web/types/build.sh                     |  7 +-
 core/include/ldml/build.sh                    |  7 +-
 developer/src/build.sh                        | 64 +--------------
 developer/src/common/web/utils/build.sh       |  7 +-
 developer/src/kmc-analyze/build.sh            |  6 +-
 developer/src/kmc-copy/build.sh               |  7 +-
 developer/src/kmc-generate/build.sh           |  6 +-
 developer/src/kmc-keyboard-info/build.sh      |  9 +--
 developer/src/kmc-kmn/build.sh                | 10 +--
 developer/src/kmc-ldml/build.sh               | 11 +--
 developer/src/kmc-model-info/build.sh         | 11 +--
 developer/src/kmc-model/build.sh              |  8 +-
 developer/src/kmc-package/build.sh            |  8 +-
 developer/src/kmc/README.md                   |  8 --
 developer/src/kmc/build.sh                    |  9 +--
 docs/npm-packages.md                          | 49 ++++-------
 .../ci/cancel-builds/trigger_definitions.mjs  |  2 +-
 resources/build/ci/ci-publish.inc.sh          | 45 +++--------
 .../build/ci/npm-packages.inc.sh              |  5 +-
 resources/build/ci/npm-publish.sh             | 59 ++++++++++++++
 resources/build/ci/trigger-definitions.inc.sh | 10 +--
 .../developer/keyman-developer-release.sh     |  2 +-
 .../keyman-developer-test-windows.sh          |  8 +-
 windows/src/desktop/build.sh                  |  1 -
 27 files changed, 197 insertions(+), 257 deletions(-)
 create mode 100644 .github/workflows/npm-publish.yml
 rename developer/src/packages.inc.sh => resources/build/ci/npm-packages.inc.sh (78%)
 create mode 100755 resources/build/ci/npm-publish.sh

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
new file mode 100644
index 0000000000..11425148f9
--- /dev/null
+++ b/.github/workflows/npm-publish.yml
@@ -0,0 +1,81 @@
+#
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Created by mcdurdin on 2025-10-27
+#
+# This workflow publishes all our NPM packages using Trusted Publishers OIDC
+# permissions. It is triggered by a repository_dispatch event with the types
+# `npm-publish:*`, from the trigger-builds infrastructure. For test builds, this
+# does a `npm pack` only.
+#
+# Inputs:
+#   buildSha:    The SHA of the commit to build, e.g. of the branch or
+#                refs/pull/1234/head for PR
+#   user:        The user that triggered the build or created the PR
+#   isTestBuild: false for Releases, otherwise true
+
+name: "NPM publish"
+run-name: "NPM publish - sha: ${{ github.event.client_payload.buildSha }}, user: @${{ github.event.client_payload.user }}, isTestBuild: ${{ github.event.client_payload.isTestBuild }}"
+on:
+  repository_dispatch:
+    types: ['npm-publish:*']
+
+permissions:
+  id-token: write  # Required for OIDC
+  contents: read
+
+env:
+  GH_TOKEN: ${{ github.token }}
+  STATUS_CONTEXT: 'NPM Pack'
+
+jobs:
+  npm-publish:
+    name: Publish or pack @keymanapp packages
+    if: github.repository == 'keymanapp/keyman' || github.event.client_payload.force
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      with:
+        ref: '${{ github.event.client_payload.buildSha }}'
+
+    - name: Upgrade npm to 11.6.2
+      run: |
+        echo "Initial npm version"
+        npm -v
+        echo "Upgrading npm to 11.6.2"
+        npm install --global npm@11.6.2
+        echo "Current npm version"
+        npm -v
+
+    - name: Set pending status on PR builds
+      id: set_status
+      if: github.event.client_payload.isTestBuild == 'true'
+      shell: bash
+      run: |
+        gh api \
+          --method POST \
+          -H "Accept: application/vnd.github+json" \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
+          -f state='pending' \
+          -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
+          -f description='NPM pack started' \
+          -f context="$STATUS_CONTEXT"
+
+    - name: NPM pack
+      if: github.event.client_payload.isTestBuild == 'true'
+      run: |
+        if [[ -f ./resources/build/ci/npm-publish.sh ]]; then
+          ./resources/build/ci/npm-publish.sh pack
+        else
+          echo WARNING: npm-publish.sh is not yet available on this branch
+        fi
+
+    - name: NPM publish
+      if: github.event.client_payload.isTestBuild == 'false'
+      run: |
+        if [[ -f ./resources/build/ci/npm-publish.sh ]]; then
+          ./resources/build/ci/npm-publish.sh publish
+        else
+          echo WARNING: npm-publish.sh is not yet available on this branch
+        fi
diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh
index 781c63bbec..9e165e8662 100755
--- a/common/web/keyman-version/build.sh
+++ b/common/web/keyman-version/build.sh
@@ -7,7 +7,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 ################################ Main script ################################
 
@@ -15,10 +14,7 @@ builder_describe "Build the include script for current Keyman version" \
   configure \
   clean \
   build \
-  test \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  test
 
 builder_describe_outputs \
   configure "/node_modules" \
@@ -56,4 +52,3 @@ export default KEYMAN_VERSION;
 builder_run_action clean        rm -rf version.inc.ts keyman-version.mts build/
 builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
-builder_run_action publish      ci_publish_npm
diff --git a/common/web/langtags/build.sh b/common/web/langtags/build.sh
index 4eec3d2c6a..c4db9e1061 100755
--- a/common/web/langtags/build.sh
+++ b/common/web/langtags/build.sh
@@ -7,16 +7,12 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman langtags.js common module" \
   "clean" \
   "configure" \
   "build" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure   /common/web/langtags/src/imports/langtags.js \
@@ -43,4 +39,3 @@ builder_run_action clean      rm -rf ./build ./src/imports ./node_modules
 builder_run_action configure  do_configure
 builder_run_action build      tsc --build
 builder_run_action test       echo 'no tests for langtags'
-builder_run_action publish    ci_publish_npm
diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index 518f531dd4..08419fa35d 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman common file types module" \
   "@/core/include/ldml" \
@@ -16,10 +15,7 @@ builder_describe "Build Keyman common file types module" \
   "configure" \
   "build" \
   "clean" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure   /common/web/types/src/schemas/kpj.schema.ts \
@@ -87,4 +83,3 @@ builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo ./src/schem
 builder_run_action configure  do_configure
 builder_run_action build      tsc --build
 builder_run_action test       typescript_run_eslint_mocha_tests 60
-builder_run_action publish    ci_publish_npm
diff --git a/core/include/ldml/build.sh b/core/include/ldml/build.sh
index 4029d732ce..8adf30773e 100755
--- a/core/include/ldml/build.sh
+++ b/core/include/ldml/build.sh
@@ -10,17 +10,13 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman ldml-keyboard-constants package" \
   "@/common/web/keyman-version" \
   "clean" \
   "configure" \
   "build" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -34,4 +30,3 @@ builder_run_action clean      rm -rf ./build/
 builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 # builder_run_action test       # no tests at this time
-builder_run_action publish    ci_publish_npm
diff --git a/developer/src/build.sh b/developer/src/build.sh
index fae0699748..8b57719d87 100755
--- a/developer/src/build.sh
+++ b/developer/src/build.sh
@@ -6,8 +6,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
-. "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe \
   "Keyman Developer" \
@@ -17,7 +15,7 @@ builder_describe \
   build \
   test \
   "api                          Analyze API and prepare API documentation" \
-  "publish                      Prepare files for distribution, publish symbols, publish or pack npm packages, and build installer" \
+  "publish                      Prepare files for distribution, publish symbols, and build installer" \
   "install                      Install built programs locally" \
   ":common                      Developer common files" \
   ":ext                         Third party components" \
@@ -42,9 +40,7 @@ builder_describe \
   ":setup                       Keyman Developer setup bootstrap" \
   ":test=test/auto              Various older tests (others in each module)" \
   ":tike                        Keyman Developer IDE" \
-  ":inst                        Bundled installers" \
-  "--npm-publish+               For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n+                Don't actually publish anything to external endpoints, just dry run"
+  ":inst                        Bundled installers"
 
 builder_describe_platform \
   :ext       win,delphi \
@@ -76,25 +72,6 @@ fi
 function do_prepublish() {
   builder_heading "prepublish - verify environment before build"
 
-  #
-  # Make sure that package*.json have not been modified before
-  #
-
-  pushd "$KEYMAN_ROOT" >/dev/null
-  if git status --porcelain | grep -qP 'package(-lock)?\.json'; then
-    builder_echo "The following package.json files have been modified:"
-    git status --porcelain | grep -P 'package(-lock)?\.json'
-    builder_die "The publish action will not run until these files are checked in or reverted."
-  fi
-  popd
-
-  #
-  # To ensure that we cache the top-level package.json, we must call this before
-  # the global publish
-  #
-
-  ci_publish_cleanup
-
   #
   # Verify that the Delphi environment is correct for a release build
   #
@@ -138,44 +115,7 @@ builder_run_action         api     api-documenter markdown -i ../build/api -o ..
 
 #-------------------------------------------------------------------------------------------------------------------
 
-function do_publish() {
-  #--------------------------------------------------------
-  # TODO: Hard-coded calls to /common packages which need
-  # publishing; this should be able to be removed once we
-  # move the publish call to the top-level
-
-  local DRY_RUN= NPM_PUBLISH=
-
-  if builder_has_option --npm-publish; then
-    NPM_PUBLISH=--npm-publish
-  fi
-
-  if builder_has_option --dry-run; then
-    DRY_RUN=--dry-run
-  fi
-
-  ./common/web/utils/build.sh publish $DRY_RUN $NPM_PUBLISH
-  ../../common/web/keyman-version/build.sh publish $DRY_RUN $NPM_PUBLISH
-  ../../common/web/langtags/build.sh publish $DRY_RUN $NPM_PUBLISH
-  ../../common/web/types/build.sh publish $DRY_RUN $NPM_PUBLISH
-  ../../core/include/ldml/build.sh publish $DRY_RUN $NPM_PUBLISH
-  # end TODO
-  #--------------------------------------------------------
-
-  builder_echo info "Cleaning up package.json after 'npm version'"
-  # And then cleanup the mess
-  ci_publish_cleanup
-  # Restore all the package.json files and package-lock.json files that
-  # were clobbered by 'npm version'
-  pushd "$KEYMAN_ROOT" >/dev/null
-  git checkout package.json package-lock.json '**/package.json'
-  popd
-
-  # TODO: Copy ../build/docs {from api action} to help.keyman.com and open PR
-}
-
 builder_run_child_actions  publish
-builder_run_action         publish do_publish
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh
index 0f5aacbac5..293b772af8 100755
--- a/developer/src/common/web/utils/build.sh
+++ b/developer/src/common/web/utils/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman Developer web utility module" \
   "@/common/web/types" \
@@ -16,10 +15,7 @@ builder_describe "Build Keyman Developer web utility module" \
   "configure" \
   "build" \
   "api                       analyze API and prepare API documentation (no-op for now)" \
-  "test" \
-  publish \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -52,4 +48,3 @@ builder_run_action clean       rm -rf ./build/
 builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       do_build
 builder_run_action test        typescript_run_eslint_mocha_tests 45
-builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc-analyze/build.sh b/developer/src/kmc-analyze/build.sh
index 152756df27..f28c822b5a 100755
--- a/developer/src/kmc-analyze/build.sh
+++ b/developer/src/kmc-analyze/build.sh
@@ -8,15 +8,12 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman Developer Compiler Analysis Tools" \
   "@/common/web/types" \
   "@/developer/src/kmc-kmn" \
   "@/developer/src/common/web/utils" \
-  clean configure build api test publish \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  clean configure build api test
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -32,4 +29,3 @@ builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
 builder_run_action test       typescript_run_eslint_mocha_tests 75
-builder_run_action publish    ci_publish_npm
diff --git a/developer/src/kmc-copy/build.sh b/developer/src/kmc-copy/build.sh
index 45e9029f09..fe9ffc1086 100755
--- a/developer/src/kmc-copy/build.sh
+++ b/developer/src/kmc-copy/build.sh
@@ -11,16 +11,13 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman kmc-copy module" \
   "@/common/web/keyman-version" \
   "@/common/web/types" \
   "@/developer/src/common/web/test-helpers" \
   "@/developer/src/common/web/utils" \
-  clean configure build api test publish \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  clean configure build api test
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -42,5 +39,3 @@ builder_run_action api        api-extractor run --local --verbose
 # note: `export TEST_SAVE_FIXTURES=1` to get a copy of cloud-based fixtures saved to online/
 # TODO: -skip-full
 builder_run_action test       typescript_run_eslint_mocha_tests 75
-
-builder_run_action publish    ci_publish_npm
diff --git a/developer/src/kmc-generate/build.sh b/developer/src/kmc-generate/build.sh
index c02a7ed26a..d67cbaf21a 100755
--- a/developer/src/kmc-generate/build.sh
+++ b/developer/src/kmc-generate/build.sh
@@ -11,7 +11,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman kmc-generate module" \
   "@/common/web/keyman-version" \
@@ -19,9 +18,7 @@ builder_describe "Build Keyman kmc-generate module" \
   "@/common/web/types" \
   "@/developer/src/common/web/test-helpers" \
   "@/developer/src/common/web/utils" \
-  clean configure build api test publish \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  clean configure build api test
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -44,4 +41,3 @@ builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      do_build
 builder_run_action api        api-extractor run --local --verbose
 builder_run_action test       typescript_run_eslint_mocha_tests
-builder_run_action publish    ci_publish_npm
diff --git a/developer/src/kmc-keyboard-info/build.sh b/developer/src/kmc-keyboard-info/build.sh
index 36a840212f..fe8ecfac58 100755
--- a/developer/src/kmc-keyboard-info/build.sh
+++ b/developer/src/kmc-keyboard-info/build.sh
@@ -18,10 +18,7 @@ builder_describe "Build Keyman kmc keyboard-info Compiler module" \
   "configure" \
   "build" \
   "api                       analyze API and prepare API documentation" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -39,7 +36,3 @@ builder_run_action api         api-extractor run --local --verbose
 builder_run_action test        typescript_run_eslint_mocha_tests
 
 #-------------------------------------------------------------------------------------------------------------------
-
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
-
-builder_run_action publish      ci_publish_npm
diff --git a/developer/src/kmc-kmn/build.sh b/developer/src/kmc-kmn/build.sh
index 7d94f880df..27fb958486 100755
--- a/developer/src/kmc-kmn/build.sh
+++ b/developer/src/kmc-kmn/build.sh
@@ -11,7 +11,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman Developer Compiler Module for .kmn to .kmx" \
   "@/common/web/keyman-version" \
@@ -23,10 +22,7 @@ builder_describe "Keyman Developer Compiler Module for .kmn to .kmx" \
   "build" \
   "clean" \
   "api                       analyze API and prepare API documentation" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -71,7 +67,3 @@ function do_test() {
 builder_run_action build      do_build
 builder_run_action api        api-extractor run --local --verbose
 builder_run_action test       do_test
-
-#-------------------------------------------------------------------------------------------------------------------
-
-builder_run_action publish  ci_publish_npm
diff --git a/developer/src/kmc-ldml/build.sh b/developer/src/kmc-ldml/build.sh
index 2f3eb01bc2..708a4c9b3d 100755
--- a/developer/src/kmc-ldml/build.sh
+++ b/developer/src/kmc-ldml/build.sh
@@ -23,10 +23,7 @@ builder_describe "Keyman kmc Keyboard Compiler module" \
   "api                       analyze API and prepare API documentation" \
   "clean" \
   "test" \
-  "build-fixtures            builds test fixtures for manual examination" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "build-fixtures            builds test fixtures for manual examination"
 
 builder_describe_outputs \
   configure     /developer/src/kmc-ldml/src/util/abnf/46/transform-from-required.js \
@@ -90,9 +87,3 @@ builder_run_action build           do_build
 builder_run_action build-fixtures  do_build_fixtures
 builder_run_action api             api-extractor run --local --verbose
 builder_run_action test            typescript_run_eslint_mocha_tests  90
-
-#-------------------------------------------------------------------------------------------------------------------
-
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
-
-builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc-model-info/build.sh b/developer/src/kmc-model-info/build.sh
index 00983ae6ea..fb4743700f 100755
--- a/developer/src/kmc-model-info/build.sh
+++ b/developer/src/kmc-model-info/build.sh
@@ -15,10 +15,7 @@ builder_describe "Build Keyman kmc Lexical Model model-info Compiler module" \
   "configure" \
   "build" \
   "api                       analyze API and prepare API documentation" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -34,9 +31,3 @@ builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        tsc --build
 builder_run_action api          api-extractor run --local --verbose
 builder_run_action test         typescript_run_eslint_mocha_tests 55
-
-#-------------------------------------------------------------------------------------------------------------------
-
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
-
-builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc-model/build.sh b/developer/src/kmc-model/build.sh
index bd758b18f9..4b5f15cc30 100755
--- a/developer/src/kmc-model/build.sh
+++ b/developer/src/kmc-model/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman kmc Lexical Model Compiler module" \
   "@/common/web/keyman-version" \
@@ -18,10 +17,7 @@ builder_describe "Keyman kmc Lexical Model Compiler module" \
   "configure" \
   "build" \
   "api                       analyze API and prepare API documentation" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -42,5 +38,3 @@ builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
 builder_run_action api          api-extractor run --local --verbose
 builder_run_action test         typescript_run_eslint_mocha_tests
-builder_run_action publish      ci_publish_npm
-
diff --git a/developer/src/kmc-package/build.sh b/developer/src/kmc-package/build.sh
index 66f430ceb4..f1d6ba8dcc 100755
--- a/developer/src/kmc-package/build.sh
+++ b/developer/src/kmc-package/build.sh
@@ -11,7 +11,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman kmc Package Compiler module" \
   "@/common/web/keyman-version" \
@@ -21,10 +20,8 @@ builder_describe "Build Keyman kmc Package Compiler module" \
   "build" \
   "api                       analyze API and prepare API documentation" \
   "clean" \
-  "test" \
-  "publish                   publish to npm" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "test"
+
 builder_describe_outputs \
   configure     /node_modules \
   build         /developer/src/kmc-package/build/src/main.js \
@@ -39,4 +36,3 @@ builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
 builder_run_action test       typescript_run_eslint_mocha_tests
-builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc/README.md b/developer/src/kmc/README.md
index 2ab17f67e7..0490998e4d 100644
--- a/developer/src/kmc/README.md
+++ b/developer/src/kmc/README.md
@@ -175,14 +175,6 @@ The temp_path must be a path outside the repository to avoid npm getting
 confused by the root package.json. This is called by inst/download.in.mak
 normally when building the Keyman Developer installer.
 
-## Publishing to NPM
-
-```shell
-./build.sh publish [--dry-run]
-```
-
-Publishes the current release to NPM. This should only be run from CI.
-
 
 [kmc]: https://help.keyman.com/developer/current-version/reference/kmc/cli
 [file-layout]: https://help.keyman.com/developer/current-version/reference/file-layout
diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh
index e784a441cc..81cc94dcca 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -8,11 +8,10 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/developer/src/packages.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/npm-packages.inc.sh"
 
 builder_describe "Build Keyman Keyboard Compiler kmc" \
   "@/common/include" \
@@ -35,10 +34,7 @@ builder_describe "Build Keyman Keyboard Compiler kmc" \
   "bundle                    creates a bundled version of kmc" \
   "api                       prepare compiler error documentation" \
   "test                      run automated tests for kmc" \
-  publish \
-  "--build-path=BUILD_PATH   build directory for bundle" \
-  "--npm-publish+            For publish, do a npm publish, not npm pack (only for CI)" \
-  "--dry-run,-n              don't actually publish, just dry run"
+  "--build-path=BUILD_PATH   build directory for bundle"
 
 builder_describe_outputs \
   configure     /node_modules \
@@ -114,4 +110,3 @@ builder_run_action build      do_build
 builder_run_action test       do_test
 builder_run_action api        do_api
 builder_run_action bundle     do_bundle
-builder_run_action publish    ci_publish_npm
diff --git a/docs/npm-packages.md b/docs/npm-packages.md
index 8306130d36..9cee3696f6 100644
--- a/docs/npm-packages.md
+++ b/docs/npm-packages.md
@@ -3,16 +3,21 @@
 This is a guide for how the various Keyman `npm` packages are developed
 and published.
 
-`npm` packages are published on the CI (continuous integration) server.
-Currently, we're using TeamCity for this.
+`npm` packages are published through CI (continuous integration). This is done
+through the `.github/workflows/npm-publish.yml` GitHub Action.
 
 Packages are **never** published from a developer's machine.
 
 ## List of current published npm packages
 
+* See `resources/build/ci/npm-packages.inc.sh` for an authoritative list.
+
 * `@keymanapp/common-types` -- located at `common/web/types`
 * `@keymanapp/keyman-version` -- located at `common/web/keyman-version`
 * `@keymanapp/kmc` -- located at `developer/src/kmc`
+* `@keymanapp/kmc-analyze` -- located at `developer/src/kmc-analyze`
+* `@keymanapp/kmc-copy` -- located at `developer/src/kmc-copy`
+* `@keymanapp/kmc-generate` -- located at `developer/src/kmc-generate`
 * `@keymanapp/kmc-keyboard-info` -- located at `developer/src/kmc-keyboard-unfo`
 * `@keymanapp/kmc-kmn` -- located at `developer/src/kmc-kmn`
 * `@keymanapp/kmc-ldml` -- located at `developer/src/kmc-ldml`
@@ -20,6 +25,7 @@ Packages are **never** published from a developer's machine.
 * `@keymanapp/kmc-model-info` -- located at `developer/src/kmc-model-info`
 * `@keymanapp/kmc-package` -- located at `developer/src/kmc-package`
 * `@keymanapp/langtags` -- located at `common/web/langtags`
+* `@keymanapp/ldml-keyboard-constants` -- located at `core/include/dml`
 
 ### Deprecated npm packages
 
@@ -34,22 +40,16 @@ Packages are **never** published from a developer's machine.
 
 ### In general
 
-Before publishing, a package must be **built** and **tested** on the CI
-server.
-
-This is typically done with:
+Before publishing, a package must be **built** and **tested**. This is typically
+done with:
 
 ```bash
 ./build.sh configure build test
 ```
 
-Once the build succeeds and the tests pass, you can publish! Use the following
-script for this (**only on the CI server**!); during this, the version is set in
-`package.json`:
-
-```bash
-./build.sh publish
-```
+Once the build succeeds and the tests pass, you can publish! Add the package to
+`resources/build/ci/npm-packages.inc.sh` and it will be published in the next
+alpha release build.
 
 It is then uploaded to the npm package directory. **Ensure that the compiled
 sources are included in the tarball**. For example:
@@ -94,26 +94,5 @@ npm notice 740B   tsconfig.json
 npm notice 449B   tsconfig.kmc-base.json
 ```
 
-For every release of **Keyman Developer**, the CI publishes a release of
-`@keymanapp/kmc`. The version number is locked with the particular version of
-Keyman Developer.
+For every release build, CI publishes a release of all packages.
 
-### `builder_publish_npm`
-
-Publishes the package in `cwd` to npm
-
-If the `--dry-run` option is available and specified as a command-line
-parameter, will do a dry run
-
-Note that `package.json` will be dirty after this command, as the `version`
-field will be added to it, and @keymanapp dependency versions will also be
-modified. This change should not be committed to the repository.
-
-If --npm-publish is set:
-* then builder_publish_npm publishes to the public registry
-* else builder_publish_npm creates a local tarball which can be used to test
-
-```bash
-  . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-  builder_publish_npm
-```
diff --git a/resources/build/ci/cancel-builds/trigger_definitions.mjs b/resources/build/ci/cancel-builds/trigger_definitions.mjs
index f6acdf91bb..aef0526688 100644
--- a/resources/build/ci/cancel-builds/trigger_definitions.mjs
+++ b/resources/build/ci/cancel-builds/trigger_definitions.mjs
@@ -6,7 +6,7 @@ export const testBuildConfigurations = {
   'mac': ['Keyman_KeymanMac_PullRequests', 'Keyman_Common_KPAPI_TestPullRequests_macOS'],
   'windows': ['KeymanDesktop_TestPullRequests', 'KeymanDesktop_TestPrRenderOnScreenKeyboards', 'Keyman_Common_KPAPI_TestPullRequests_Windows'],
   'web': ['Keymanweb_TestPullRequests', 'Keyman_Common_KPAPI_TestPullRequests_WASM'],
-  'developer': ['Keyman_Developer_Test'],
+  'developer': ['Keyman_Developer_Test', 'npm-publish_GitHub'],
 
   'common_web': ['Keyman_Test_Common_Web'],
   'common_windows': ['Keyman_Test_Common_Windows'],
diff --git a/resources/build/ci/ci-publish.inc.sh b/resources/build/ci/ci-publish.inc.sh
index d8fc1e77a2..2785fead35 100644
--- a/resources/build/ci/ci-publish.inc.sh
+++ b/resources/build/ci/ci-publish.inc.sh
@@ -8,39 +8,10 @@
 
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 
-#
-# Publishes the package in `cwd` to npm
-#
-# If the `--dry-run` option is available and specified as a command-line
-# parameter, will do a dry run
-#
-# Note that `package.json` will be dirty after this command, as the `version`
-# field will be added to it, and @keymanapp dependency versions will also be
-# modified. This change should not be committed to the repository.
-#
-# If --npm-publish is set:
-#  * then ci_publish_npm publishes to the public registry
-#  * else ci_publish_npm creates a local tarball which can be used to test
-#
-# Usage:
-# ```bash
-#   ci_publish_npm
-# ```
-#
-function ci_publish_npm() {
-  if builder_has_option --npm-publish; then
-    # Require --dry-run if local or test to avoid accidentally clobbering npm packages
-    if [[ $KEYMAN_VERSION_ENVIRONMENT =~ local|test ]] && ! builder_has_option --dry-run; then
-      builder_die "publish --npm-publish must use --dry-run flag for local or test builds"
-    fi
-    _ci_publish_npm_package publish
-  else
-    _ci_publish_npm_package pack
-  fi
-}
-
-function _ci_publish_npm_package() {
-  local action=$1
+# Used only by npm-publish.sh
+function ci_publish_npm_package() {
+  local action="$1"
+  local package="$2"
   local dist_tag=$KEYMAN_TIER dry_run=
 
   if [[ $KEYMAN_TIER == stable ]]; then
@@ -51,6 +22,8 @@ function _ci_publish_npm_package() {
     dry_run=--dry-run
   fi
 
+  pushd "${KEYMAN_ROOT}/${package}" >/dev/null
+
   _ci_publish_cache_package_json
   _ci_write_npm_version
   _ci_prepublish
@@ -62,12 +35,14 @@ function _ci_publish_npm_package() {
   if [[ $action == pack ]]; then
     # We can use --publish-to-pack to locally test a package
     # before publishing to the package registry
-    echo "Packing $dry_run npm package $THIS_SCRIPT_IDENTIFIER with tag $dist_tag"
+    echo "Packing $dry_run npm package ${package} with tag $dist_tag"
     npm pack $dry_run --access public --tag $dist_tag
   else # $action == publish
-    echo "Publishing $dry_run npm package $THIS_SCRIPT_IDENTIFIER with tag $dist_tag"
+    echo "Publishing $dry_run npm package ${package} with tag $dist_tag"
     npm publish $dry_run --access public --tag $dist_tag
   fi
+
+  popd >/dev/null
 }
 
 function _ci_write_npm_version() {
diff --git a/developer/src/packages.inc.sh b/resources/build/ci/npm-packages.inc.sh
similarity index 78%
rename from developer/src/packages.inc.sh
rename to resources/build/ci/npm-packages.inc.sh
index 62993c5ab9..a1c4eecd8b 100644
--- a/developer/src/packages.inc.sh
+++ b/resources/build/ci/npm-packages.inc.sh
@@ -1,7 +1,8 @@
+#
+# Keyman is copyright (C) SIL Global. MIT License.
+#
 # List of all NPM packages that need to be published
 #
-# TODO: this should really be somewhere else, but right now Developer CI is
-#       responsible for pulling the publish lever
 
 readonly PACKAGES=(
   common/web/keyman-version
diff --git a/resources/build/ci/npm-publish.sh b/resources/build/ci/npm-publish.sh
new file mode 100755
index 0000000000..6e39838fbd
--- /dev/null
+++ b/resources/build/ci/npm-publish.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Publish all the @keymanapp packages listed in npm-packages.inc.sh
+#
+# If the `--dry-run` option is available and specified as a command-line
+# parameter, will do a dry run
+#
+# Note that `package.json` will be dirty after this command, as the `version`
+# field will be added to it, and @keymanapp dependency versions will also be
+# modified. This change should not be committed to the repository.
+#
+# If `publish` is called:
+#  * then ci_publish_npm publishes to the public registry
+#  * else ci_publish_npm creates a local tarball which can be used to test
+#
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/npm-packages.inc.sh"
+
+builder_describe \
+  "Publish @keymanapp packages to NPM" \
+  "pack              Pack NPM packages to a .tgz for verification" \
+  "publish           Publish NPM packages to the NPM Registry" \
+  "--dry-run         Don't publish/pack anything, just dry run"
+
+builder_parse "$@"
+
+#-------------------------------------------------------------------------------------------------------------------
+
+function do_pack() {
+  local npm_package_path
+  for npm_package_path in "${PACKAGES[@]}"; do
+    builder_heading "Packing $npm_package_path"
+    ci_publish_npm_package pack "$npm_package_path"
+  done
+}
+
+function do_publish() {
+  local npm_package_path
+
+  if [[ $KEYMAN_VERSION_ENVIRONMENT =~ local|test ]] && ! builder_has_option --dry-run; then
+    builder_die "publish must use --dry-run flag for local or test builds"
+  fi
+
+  for npm_package_path in "${PACKAGES[@]}"; do
+    builder_heading "Publishing $npm_package_path"
+    ci_publish_npm_package publish "$npm_package_path"
+  done
+}
+
+builder_run_action pack    do_pack
+builder_run_action publish do_publish
diff --git a/resources/build/ci/trigger-definitions.inc.sh b/resources/build/ci/trigger-definitions.inc.sh
index 7492138434..ab08734804 100644
--- a/resources/build/ci/trigger-definitions.inc.sh
+++ b/resources/build/ci/trigger-definitions.inc.sh
@@ -89,7 +89,7 @@ bc_test_linux=(KeymanLinux_TestPullRequests Keyman_Linux_Test_Integration Keyman
 bc_test_mac=(Keyman_KeymanMac_PullRequests Keyman_Common_KPAPI_TestPullRequests_macOS)
 bc_test_windows=(KeymanDesktop_TestPullRequests KeymanDesktop_TestPrRenderOnScreenKeyboards Keyman_Common_KPAPI_TestPullRequests_Windows)
 bc_test_web=(Keymanweb_TestPullRequests Keyman_Common_KPAPI_TestPullRequests_WASM)
-bc_test_developer=(Keyman_Developer_Test Keyman_Test_Developer_Mac Keyman_Test_Developer_Linux)
+bc_test_developer=(Keyman_Developer_Test Keyman_Test_Developer_Mac Keyman_Test_Developer_Linux npm-publish_GitHub)
 
 bc_test_common_web=(Keyman_Test_Common_Web)
 bc_test_common_windows=(Keyman_Test_Common_Windows)
@@ -116,7 +116,7 @@ bc_master_linux=(KeymanLinux_Master deb-release-packaging_GitHub build-test-publ
 bc_master_mac=(KeymanMac_Master)
 bc_master_windows=(Keyman_Build)
 bc_master_web=(Keymanweb_Build)
-bc_master_developer=(Keyman_Developer_Release)
+bc_master_developer=(Keyman_Developer_Release npm-publish_GitHub)
 
 vcs_master=HttpsGithubComKeymanappKeyman
 
@@ -128,7 +128,7 @@ bc_beta_linux=(KeymanLinux_Master deb-release-packaging_GitHub)
 bc_beta_mac=(KeymanMac_Master)
 bc_beta_windows=(Keyman_Build)
 bc_beta_web=(Keymanweb_Build)
-bc_beta_developer=(Keyman_Developer_Release)
+bc_beta_developer=(Keyman_Developer_Release npm-publish_GitHub)
 
 vcs_beta=HttpsGithubComKeymanappKeyman
 
@@ -140,7 +140,7 @@ bc_stable_18_0_linux=(KeymanLinux_Master deb-release-packaging_GitHub)
 bc_stable_18_0_mac=(KeymanMac_Master)
 bc_stable_18_0_windows=(Keyman_Build)
 bc_stable_18_0_web=(Keymanweb_Build)
-bc_stable_18_0_developer=(Keyman_Developer_Release)
+bc_stable_18_0_developer=(Keyman_Developer_Release npm-publish_GitHub)
 
 vcs_stable_18_0=HttpsGithubComKeymanappKeyman
 
@@ -152,6 +152,6 @@ bc_stable_19_0_linux=(KeymanLinux_Master deb-release-packaging_GitHub)
 bc_stable_19_0_mac=(KeymanMac_Master)
 bc_stable_19_0_windows=(Keyman_Build)
 bc_stable_19_0_web=(Keymanweb_Build)
-bc_stable_19_0_developer=(Keyman_Developer_Release)
+bc_stable_19_0_developer=(Keyman_Developer_Release npm-publish_GitHub)
 
 vcs_stable_19_0=HttpsGithubComKeymanappKeyman
diff --git a/resources/teamcity/developer/keyman-developer-release.sh b/resources/teamcity/developer/keyman-developer-release.sh
index b24978de0d..7bf2e02553 100755
--- a/resources/teamcity/developer/keyman-developer-release.sh
+++ b/resources/teamcity/developer/keyman-developer-release.sh
@@ -41,7 +41,7 @@ cd "${KEYMAN_ROOT}/developer/src"
 function _build_developer() {
   builder_echo start "build developer" "Building Keyman Developer"
 
-  ./build.sh configure build test api publish --npm-publish
+  ./build.sh configure build test api publish
 
   builder_echo end "build developer" success "Finished building Keyman Developer"
 }
diff --git a/resources/teamcity/developer/keyman-developer-test-windows.sh b/resources/teamcity/developer/keyman-developer-test-windows.sh
index 668e7a9c04..5bd7961c46 100755
--- a/resources/teamcity/developer/keyman-developer-test-windows.sh
+++ b/resources/teamcity/developer/keyman-developer-test-windows.sh
@@ -55,12 +55,12 @@ function _build_testkeyboards() {
 }
 
 function publish_sentry_action() {
-  builder_echo start "publish" "Dry-run publish and api"
-  ./build.sh api publish --dry-run
-  builder_echo end "publish" "Dry-run publish and api"
+  builder_echo start "publish" "publish modules locally and prep api"
+  ./build.sh api publish
+  builder_echo end "publish" "publish modules locally and prep api"
 
   builder_echo start "publish sentry" "Publishing debug information files to Sentry"
-  # TODO: move this into build.sh publish? re-scope --dry-run into build.sh?
+  # TODO: move this into build.sh publish?
   "${KEYMAN_ROOT}/developer/src/tools/sentry-upload-difs.sh"
   builder_echo end "publish sentry" success "Finished publishing debug information files to Sentry"
 }
diff --git a/windows/src/desktop/build.sh b/windows/src/desktop/build.sh
index f5401e22b5..aea7a2d8f9 100755
--- a/windows/src/desktop/build.sh
+++ b/windows/src/desktop/build.sh
@@ -6,7 +6,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe \
   "Keyman for Windows (app)" \

From e06ac524fb6500b8a0b5df59e46576d9d2014098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Mon, 27 Oct 2025 17:45:44 +0100
Subject: [PATCH 22/83] test(kmc-analyze): add tests for AnalyzeOskCharacterUse
 output formats

---
 .../test/osk-character-use-format.tests.ts    | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 developer/src/kmc-analyze/test/osk-character-use-format.tests.ts

diff --git a/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
new file mode 100644
index 0000000000..6d1f1a85d6
--- /dev/null
+++ b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
@@ -0,0 +1,53 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { assert } from 'chai';
+import 'mocha';
+import { AnalyzeOskCharacterUse } from '../src/osk-character-use/index.js';
+import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
+
+describe('AnalyzeOskCharacterUse output formats', function () {
+  const callbacks = new TestCompilerCallbacks();
+
+  const dummyStrings = {
+    'a': [{ filename: 'file1.kvks', count: 1 }],
+    'b': [{ filename: 'file2.kvks', count: 2 }]
+  };
+
+  this.beforeEach(function() {
+    callbacks.clear();
+  });
+
+  this.afterEach(function() {
+    if(this.currentTest?.isFailed()) {
+      callbacks.printMessages();
+    }
+  });
+
+  it('generates .txt format correctly', function() {
+    const a = new AnalyzeOskCharacterUse(callbacks, { includeCounts: true });
+    (a as any)._strings = dummyStrings;
+    const txt = a.getStrings('.txt');
+    assert.isTrue(txt.some(line => line.includes('U+')));
+  });
+
+  it('generates .md format correctly', function() {
+    const a = new AnalyzeOskCharacterUse(callbacks, { includeCounts: true });
+    (a as any)._strings = dummyStrings;
+    const md = a.getStrings('.md');
+    assert.isTrue(md[0].includes('PUA') && md[2].includes('|'));
+  });
+
+  it('generates .json format correctly', function() {
+    const a = new AnalyzeOskCharacterUse(callbacks, { includeCounts: true });
+    (a as any)._strings = dummyStrings;
+    const json = a.getStrings('.json').join('\n');
+    const parsed = JSON.parse(json);
+    assert.isArray(parsed.map);
+  });
+
+  it('converts strings to Unicode sequences correctly', function() {
+    const seq = (AnalyzeOskCharacterUse as any).stringToUnicodeSequence('ab');
+    assert.equal(seq, 'U+0061 U+0062');
+  });
+});
\ No newline at end of file

From d7d2a2810c2b01d82e3cf2929ae3ed913d848eb3 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Mon, 27 Oct 2025 13:01:50 -0500
Subject: [PATCH 23/83] auto: increment master version to 19.0.147

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 6 ++++++
 VERSION.md | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 73ccc5f7d5..984700a2b4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,11 @@
 # Keyman Version History
 
+## 19.0.146 alpha 2025-10-27
+
+* fix(mac): ignore non-Unicode key caps when preparing OSK (#15008)
+* fix(developer): prevent ANSI keyboards crashing debugger (#15022)
+* test(developer): add coverage tests for warning messages in kmc-analyze/AnalyzeOskCharacterUse (#15021)
+
 ## 19.0.145 alpha 2025-10-24
 
 * fix(developer): do not treat backslash as a string escape in syntax highlighting (#15001)
diff --git a/VERSION.md b/VERSION.md
index f0ebf516cf..a82718a352 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.146
\ No newline at end of file
+19.0.147
\ No newline at end of file

From ac6d305b79c538523862b2d61edd8b2516a0e237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Mon, 27 Oct 2025 19:10:40 +0100
Subject: [PATCH 24/83] format update

---
 .../src/kmc-analyze/test/osk-character-use-format.tests.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
index 6d1f1a85d6..f4a8d6b7a1 100644
--- a/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
+++ b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
@@ -6,7 +6,7 @@ import 'mocha';
 import { AnalyzeOskCharacterUse } from '../src/osk-character-use/index.js';
 import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
 
-describe('AnalyzeOskCharacterUse output formats', function () {
+describe('AnalyzeOskCharacterUse output formats', function() {
   const callbacks = new TestCompilerCallbacks();
 
   const dummyStrings = {

From 5bf5a5941f800f70e286e3d3adc474267187de84 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 24 Oct 2025 14:12:56 +0700
Subject: [PATCH 25/83] chore(common): Move platformtest to
 common/test/keyboards

---
 .../app/src/main/assets/keyboardharness.kmp   | Bin 217932 -> 218131 bytes
 .../app/src/main/assets/keyboardharness.kps   |   2 +-
 .../platform-rules/platform-results.xlsx      | Bin
 .../keyboards}/platform-rules/platformtest.js |   0
 .../platform-rules/platformtest.kmn           |   0
 .../platform-rules/platformtest.kmp           | Bin 3701 -> 3701 bytes
 .../platform-rules/platformtest.kmx           | Bin
 .../platform-rules/platformtest.kpj           |   0
 .../platform-rules/platformtest.kps           |   0
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename {windows/src/test/manual-tests => common/test/keyboards}/platform-rules/platform-results.xlsx (100%)
 rename {windows/src/test/manual-tests => common/test/keyboards}/platform-rules/platformtest.js (100%)
 rename {windows/src/test/manual-tests => common/test/keyboards}/platform-rules/platformtest.kmn (100%)
 rename {windows/src/test/manual-tests => common/test/keyboards}/platform-rules/platformtest.kmp (86%)
 rename {windows/src/test/manual-tests => common/test/keyboards}/platform-rules/platformtest.kmx (100%)
 rename {windows/src/test/manual-tests => common/test/keyboards}/platform-rules/platformtest.kpj (100%)
 rename {windows/src/test/manual-tests => common/test/keyboards}/platform-rules/platformtest.kps (100%)

diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp
index 9785ed733811c1938d1125c34725a47b5bd2897a..a9bda34bba11fd3a7b5f576a0d294b9a4d06f7c9 100644
GIT binary patch
delta 1812
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

delta 1635
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
Q=0;t0j;YLJ-k@sw8?RdGYXATM

diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
index 9d03ec759b..73a8e740ac 100644
--- a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
+++ b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
@@ -26,7 +26,7 @@
       <FileType>.js</FileType>
     </File>
     <File>
-      <Name>..\..\..\..\..\..\..\web\src\test\manual\web\platform\platformtest.js</Name>
+      <Name>../../../../../../../common/test/keyboards/platform-rules/platformtest.js</Name>
       <Description>File platformtest.js</Description>
       <CopyLocation>0</CopyLocation>
       <FileType>.js</FileType>
diff --git a/windows/src/test/manual-tests/platform-rules/platform-results.xlsx b/common/test/keyboards/platform-rules/platform-results.xlsx
similarity index 100%
rename from windows/src/test/manual-tests/platform-rules/platform-results.xlsx
rename to common/test/keyboards/platform-rules/platform-results.xlsx
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.js b/common/test/keyboards/platform-rules/platformtest.js
similarity index 100%
rename from windows/src/test/manual-tests/platform-rules/platformtest.js
rename to common/test/keyboards/platform-rules/platformtest.js
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kmn b/common/test/keyboards/platform-rules/platformtest.kmn
similarity index 100%
rename from windows/src/test/manual-tests/platform-rules/platformtest.kmn
rename to common/test/keyboards/platform-rules/platformtest.kmn
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kmp b/common/test/keyboards/platform-rules/platformtest.kmp
similarity index 86%
rename from windows/src/test/manual-tests/platform-rules/platformtest.kmp
rename to common/test/keyboards/platform-rules/platformtest.kmp
index d60fe88152402ace7557a0f1513857bb070579c3..ecef09c75cd43faa05f21e49145c5f6ca96eb436 100644
GIT binary patch
delta 80
zcmew=^Hqj7z?+$ci-CcGgJH_P=#9KzSeb$JW)`+g2%~^onh_*2xsT^NnC{@U2GhrQ
Pt-v%hpD~!W<g)<)FA^J}

delta 80
zcmew=^Hqj7z?+$ci-CcGgF%=xY$NX%R%Rf*nT0JA!YJUDW(0{$?&J9mraO48!Spd+
OD=^K>XAGt-`D_5zJrT(O

diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kmx b/common/test/keyboards/platform-rules/platformtest.kmx
similarity index 100%
rename from windows/src/test/manual-tests/platform-rules/platformtest.kmx
rename to common/test/keyboards/platform-rules/platformtest.kmx
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kpj b/common/test/keyboards/platform-rules/platformtest.kpj
similarity index 100%
rename from windows/src/test/manual-tests/platform-rules/platformtest.kpj
rename to common/test/keyboards/platform-rules/platformtest.kpj
diff --git a/windows/src/test/manual-tests/platform-rules/platformtest.kps b/common/test/keyboards/platform-rules/platformtest.kps
similarity index 100%
rename from windows/src/test/manual-tests/platform-rules/platformtest.kps
rename to common/test/keyboards/platform-rules/platformtest.kps

From 02619c2ef5ae62a3343bf43ba1c3be92b23c2852 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 28 Oct 2025 11:31:13 +0700
Subject: [PATCH 26/83] fix(web): Update manual test page to use common
 platformtest.js

---
 web/src/test/manual/build.sh                  |   3 +-
 web/src/test/manual/web/platform/index.html   |  10 +-
 .../test/manual/web/platform/platformtest.js  | 380 ------------------
 web/src/test/manual/web/platform/utilities.js |   2 +-
 4 files changed, 8 insertions(+), 387 deletions(-)
 delete mode 100644 web/src/test/manual/web/platform/platformtest.js

diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 53a784bdf8..85cb2c4c7d 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -50,7 +50,8 @@ function do_copy() {
   mkdir -p "$GESTURE_PROCESSOR_TARGET"
   cp -a "$GESTURE_PROCESSOR_BUILD" "$GESTURE_PROCESSOR_TARGET"
 
-  # copy common test resources (keyboards)
+  # copy common test (resources) keyboards
+  cp -f "$KEYMAN_ROOT/common/test/keyboards/platform-rules/platformtest.js" "$KEYMAN_ROOT/$DEST/keyboards/"
   cp -f "$KEYMAN_ROOT/common/test/resources/keyboards/"*.js "$KEYMAN_ROOT/$DEST/keyboards/"
 }
 
diff --git a/web/src/test/manual/web/platform/index.html b/web/src/test/manual/web/platform/index.html
index c528862ead..7f007561fd 100644
--- a/web/src/test/manual/web/platform/index.html
+++ b/web/src/test/manual/web/platform/index.html
@@ -53,12 +53,12 @@
 <!-- Sample page HTML -->
   <body onload='loadKeyboards();'>
     <h2>KeymanWeb Sample Page - Platform Testing</h2>
-  <p>This page is designed to test the Platform statement for consistency.
-      Refer to PR <a href="https://github.com/keymanapp/keyman/pull/969">#969</a>.
-      See also /windows/src/test/manual-tests/platform-rules/platform-results.xlsx.
+    <p>This page is designed to test the Platform statement for consistency.
+      Refer to PR <a href="https://github.com/keymanapp/keyman/pull/969">#969</a>.<br/>
+      See also /common/test/keyboards/platform-rules/platform-results.xlsx.<br/>
       To run the test, just press [a]. This can be pasted into the above spreadsheet.</p>
-  <p>Be sure to reference the developer console for additional feedback.  </p>
-  <hr/>
+    <p>Be sure to reference the developer console for additional feedback.  </p>
+    <hr/>
     <div>
     <!--
       The following DIV is used to position the Button or Toolbar User Interfaces on the page.
diff --git a/web/src/test/manual/web/platform/platformtest.js b/web/src/test/manual/web/platform/platformtest.js
deleted file mode 100644
index e62165ce22..0000000000
--- a/web/src/test/manual/web/platform/platformtest.js
+++ /dev/null
@@ -1,380 +0,0 @@
-
-KeymanWeb.KR(new Keyboard_platformtest());
-
-function Keyboard_platformtest() 
-{
-
-    this.KI = "Keyboard_platformtest";
-    this.KN = "PlatformTest";
-    this.KMINVER = "9.0";
-    this.KV = null;
-    this.KH = '';
-    this.KM = 0;
-    this.KBVER = "1.0";
-    this.KMBM = 0x0000;
-    this.s17 = "touch";
-    this.s18 = "hardware";
-    this.s21 = "windows";
-    this.s22 = "android";
-    this.s23 = "ios";
-    this.s24 = "macosx";
-    this.s25 = "linux";
-    this.s28 = "desktop";
-    this.s29 = "tablet";
-    this.s30 = "phone";
-    this.s33 = "native";
-    this.s34 = "web";
-    this.s37 = "ie";
-    this.s38 = "chrome";
-    this.s39 = "edge";
-    this.s40 = "firefox";
-    this.s41 = "safari";
-    this.s42 = "opera";
-    this.s45 = "touch";
-    this.s46 = "hardware";
-    this.s49 = "platform-x";
-    this.s52 = "WinDOWS";
-    this.s53 = "ANDroid";
-    this.s54 = "iOS";
-    this.s55 = "macOSX";
-    this.s56 = "LINUX";
-    this.s58 = "touch";
-    this.s59 = "hardware";
-    this.s60 = "windows";
-    this.s61 = "android";
-    this.s62 = "ios";
-    this.s63 = "macosx";
-    this.s64 = "linux";
-    this.s65 = "desktop";
-    this.s66 = "tablet";
-    this.s67 = "phone";
-    this.s68 = "native";
-    this.s69 = "web";
-    this.s70 = "ie";
-    this.s71 = "chrome";
-    this.s72 = "edge";
-    this.s73 = "firefox";
-    this.s74 = "safari";
-    this.s75 = "opera";
-    this.s76 = "touch";
-    this.s77 = "hardware";
-    this.s78 = "platform-x";
-    this.s79 = "WinDOWS";
-    this.s80 = "ANDroid";
-    this.s81 = "iOS";
-    this.s82 = "macOSX";
-    this.s83 = "LINUX";
-    this.KVER = "10.0.1109.0";
-    this.gs = function(t, e) {
-        return this.g0(t, e);
-    };
-    this.g0 = function(t, e) {
-        var k = KeymanWeb,
-            r = 0,
-            m = 0;
-        if (k.KKM(e, 16384, 65)) {
-            r = m = 1;
-            r = this.g1(t, e);
-        }
-        if (!m && k.KIK(e)) {
-            r = 1;
-            r = this.g9(t, e);
-        }
-        return r;
-    };
-    this.g1 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s17, t)) {
-            m = 1;
-            k.KO(0, t, "touch");
-        } else if (k.KIFS(31, this.s18, t)) {
-            m = 1;
-            k.KO(0, t, "hardware");
-        }
-        if (m) {
-            r = this.g2(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, "undefined");
-            r = this.g2(t, e);
-        }
-        return r;
-    };
-    this.g2 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s21, t)) {
-            m = 1;
-            k.KO(0, t, " windows");
-        } else if (k.KIFS(31, this.s22, t)) {
-            m = 1;
-            k.KO(0, t, " android");
-        } else if (k.KIFS(31, this.s23, t)) {
-            m = 1;
-            k.KO(0, t, " ios");
-        } else if (k.KIFS(31, this.s24, t)) {
-            m = 1;
-            k.KO(0, t, " macosx");
-        } else if (k.KIFS(31, this.s25, t)) {
-            m = 1;
-            k.KO(0, t, " linux");
-        }
-        if (m) {
-            r = this.g3(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g3(t, e);
-        }
-        return r;
-    };
-    this.g3 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s28, t)) {
-            m = 1;
-            k.KO(0, t, " desktop");
-        } else if (k.KIFS(31, this.s29, t)) {
-            m = 1;
-            k.KO(0, t, " tablet");
-        } else if (k.KIFS(31, this.s30, t)) {
-            m = 1;
-            k.KO(0, t, " phone");
-        }
-        if (m) {
-            r = this.g4(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g4(t, e);
-        }
-        return r;
-    };
-    this.g4 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s33, t)) {
-            m = 1;
-            k.KO(0, t, " native");
-        } else if (k.KIFS(31, this.s34, t)) {
-            m = 1;
-            k.KO(0, t, " web");
-        }
-        if (m) {
-            r = this.g5(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g5(t, e);
-        }
-        return r;
-    };
-    this.g5 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s37, t)) {
-            m = 1;
-            k.KO(0, t, " ie");
-        } else if (k.KIFS(31, this.s38, t)) {
-            m = 1;
-            k.KO(0, t, " chrome");
-        } else if (k.KIFS(31, this.s39, t)) {
-            m = 1;
-            k.KO(0, t, " edge");
-        } else if (k.KIFS(31, this.s40, t)) {
-            m = 1;
-            k.KO(0, t, " firefox");
-        } else if (k.KIFS(31, this.s41, t)) {
-            m = 1;
-            k.KO(0, t, " safari");
-        } else if (k.KIFS(31, this.s42, t)) {
-            m = 1;
-            k.KO(0, t, " opera");
-        }
-        if (m) {
-            r = this.g6(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g6(t, e);
-        }
-        return r;
-    };
-    this.g6 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (!k.KIFS(31, this.s45, t)) {
-            m = 1;
-            k.KO(0, t, " !touch");
-        } else if (!k.KIFS(31, this.s46, t)) {
-            m = 1;
-            k.KO(0, t, " !hardware");
-        }
-        if (m) {
-            r = this.g7(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g7(t, e);
-        }
-        return r;
-    };
-    this.g7 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s49, t)) {
-            m = 1;
-            k.KO(0, t, " platform-x");
-        }
-        if (m) {
-            r = this.g8(t, e);
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-            r = this.g8(t, e);
-        }
-        return r;
-    };
-    this.g8 = function(t, e) {
-        var k = KeymanWeb,
-            r = 1,
-            m = 0;
-        if (k.KIFS(31, this.s52, t)) {
-            m = 1;
-            k.KO(0, t, " windows");
-        } else if (k.KIFS(31, this.s53, t)) {
-            m = 1;
-            k.KO(0, t, " android");
-        } else if (k.KIFS(31, this.s54, t)) {
-            m = 1;
-            k.KO(0, t, " ios");
-        } else if (k.KIFS(31, this.s55, t)) {
-            m = 1;
-            k.KO(0, t, " macosx");
-        } else if (k.KIFS(31, this.s56, t)) {
-            m = 1;
-            k.KO(0, t, " linux");
-        }
-        if (!m) {
-            k.KO(-1, t, " undefined");
-        }
-        return r;
-    };
-    this.g9 = function(t, e) {
-        var k = KeymanWeb,
-            r = 0,
-            m = 0;
-        if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s79, t)) {
-            r = m = 1;
-            k.KO(0, t, " Windows");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s80, t)) {
-            r = m = 1;
-            k.KO(0, t, " Android");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s81, t)) {
-            r = m = 1;
-            k.KO(0, t, " iOS");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s82, t)) {
-            r = m = 1;
-            k.KO(0, t, " macOS");
-        } else if (k.KKM(e, 16384, 69) && k.KIFS(31, this.s83, t)) {
-            r = m = 1;
-            k.KO(0, t, " Linux");
-        } else if (k.KKM(e, 16384, 69)) {
-            r = m = 1;
-            k.KO(0, t, " [OS Undefined (case insensitive test)]");
-        } else if (k.KKM(e, 16384, 73) && k.KIFS(31, this.s65, t)) {
-            r = m = 1;
-            k.KO(0, t, " Desktop");
-        } else if (k.KKM(e, 16384, 73) && k.KIFS(31, this.s66, t)) {
-            r = m = 1;
-            k.KO(0, t, " Tablet");
-        } else if (k.KKM(e, 16384, 73) && k.KIFS(31, this.s67, t)) {
-            r = m = 1;
-            k.KO(0, t, " Phone");
-        } else if (k.KKM(e, 16384, 73)) {
-            r = m = 1;
-            k.KO(0, t, " [FF Undefined]");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s60, t)) {
-            r = m = 1;
-            k.KO(0, t, " Windows");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s61, t)) {
-            r = m = 1;
-            k.KO(0, t, " Android");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s62, t)) {
-            r = m = 1;
-            k.KO(0, t, " iOS");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s63, t)) {
-            r = m = 1;
-            k.KO(0, t, " OSX");
-        } else if (k.KKM(e, 16384, 79) && k.KIFS(31, this.s64, t)) {
-            r = m = 1;
-            k.KO(0, t, " Linux");
-        } else if (k.KKM(e, 16384, 79)) {
-            r = m = 1;
-            k.KO(0, t, " [OS Undefined]");
-        } else if (k.KKM(e, 16384, 80) && k.KIFS(31, this.s58, t)) {
-            r = m = 1;
-            k.KO(0, t, "Touch");
-        } else if (k.KKM(e, 16384, 80) && k.KIFS(31, this.s59, t)) {
-            r = m = 1;
-            k.KO(0, t, "Hardware");
-        } else if (k.KKM(e, 16384, 80)) {
-            r = m = 1;
-            k.KO(0, t, "[UI Undefined]");
-        } else if (k.KKM(e, 16384, 82) && k.KIFS(31, this.s78, t)) {
-            r = m = 1;
-            k.KO(0, t, " Platform-X");
-        } else if (k.KKM(e, 16384, 82)) {
-            r = m = 1;
-            k.KO(0, t, " [Platform-X Undefined]");
-        } else if (k.KKM(e, 16384, 84) && !k.KIFS(31, this.s76, t)) {
-            r = m = 1;
-            k.KO(0, t, " !Touch");
-        } else if (k.KKM(e, 16384, 84) && !k.KIFS(31, this.s77, t)) {
-            r = m = 1;
-            k.KO(0, t, " !Hardware");
-        } else if (k.KKM(e, 16384, 84)) {
-            r = m = 1;
-            k.KO(0, t, " [Inverted OS Undefined]");
-        } else if (k.KKM(e, 16384, 85) && k.KIFS(31, this.s68, t)) {
-            r = m = 1;
-            k.KO(0, t, " Native");
-        } else if (k.KKM(e, 16384, 85) && k.KIFS(31, this.s69, t)) {
-            r = m = 1;
-            k.KO(0, t, " Web");
-        } else if (k.KKM(e, 16384, 85)) {
-            r = m = 1;
-            k.KO(0, t, " [Nativeness Undefined]");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s70, t)) {
-            r = m = 1;
-            k.KO(0, t, " IE");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s71, t)) {
-            r = m = 1;
-            k.KO(0, t, " Chrome");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s72, t)) {
-            r = m = 1;
-            k.KO(0, t, " Edge");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s73, t)) {
-            r = m = 1;
-            k.KO(0, t, " Firefox");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s74, t)) {
-            r = m = 1;
-            k.KO(0, t, " Safari");
-        } else if (k.KKM(e, 16384, 89) && k.KIFS(31, this.s75, t)) {
-            r = m = 1;
-            k.KO(0, t, " Opera");
-        } else if (k.KKM(e, 16384, 89)) {
-            r = m = 1;
-            k.KO(0, t, " [Browser Undefined]");
-        }
-        return r;
-    };
-}
diff --git a/web/src/test/manual/web/platform/utilities.js b/web/src/test/manual/web/platform/utilities.js
index d9f925ba9f..5c351e0317 100644
--- a/web/src/test/manual/web/platform/utilities.js
+++ b/web/src/test/manual/web/platform/utilities.js
@@ -6,6 +6,6 @@ function loadKeyboards()
     languages:{
       id:'en',name:'English',region:'North America'
     },
-    filename:'platformtest.js'
+    filename: '../../../../../build/test-resources/keyboards/platformtest.js'
   });
 }
\ No newline at end of file

From 2e9dfec30cc3a1cba278449a38da7dd8e4dc7e50 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 28 Oct 2025 13:33:22 +0700
Subject: [PATCH 27/83] fix(common): Revert kpj changes

---
 common/test/keyboards/platform-rules/platformtest.kpj | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/test/keyboards/platform-rules/platformtest.kpj b/common/test/keyboards/platform-rules/platformtest.kpj
index a21d2e3687..033c8188a9 100644
--- a/common/test/keyboards/platform-rules/platformtest.kpj
+++ b/common/test/keyboards/platform-rules/platformtest.kpj
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <KeymanDeveloperProject>
-  <Options/>
+  <Options>
+    <BuildPath></BuildPath>
+    <CompilerWarningsAsErrors>False</CompilerWarningsAsErrors>
+    <WarnDeprecatedCode>True</WarnDeprecatedCode>
+    <CheckFilenameConventions>True</CheckFilenameConventions>
+    <ProjectType>keyboard</ProjectType>
+  </Options>
   <Files>
     <File>
       <ID>id_c1593d698cb624690005787147089dab</ID>

From 66bf1c5f73a57b08e5441151606b9c6c98b2b17c Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 28 Oct 2025 14:11:17 +0700
Subject: [PATCH 28/83] fix(common): Move source files to source/

---
 common/test/keyboards/platform-rules/platformtest.kpj         | 4 ++--
 .../keyboards/platform-rules/{ => source}/platformtest.kmn    | 0
 .../keyboards/platform-rules/{ => source}/platformtest.kps    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename common/test/keyboards/platform-rules/{ => source}/platformtest.kmn (100%)
 rename common/test/keyboards/platform-rules/{ => source}/platformtest.kps (93%)

diff --git a/common/test/keyboards/platform-rules/platformtest.kpj b/common/test/keyboards/platform-rules/platformtest.kpj
index 033c8188a9..447f7d86d7 100644
--- a/common/test/keyboards/platform-rules/platformtest.kpj
+++ b/common/test/keyboards/platform-rules/platformtest.kpj
@@ -11,7 +11,7 @@
     <File>
       <ID>id_c1593d698cb624690005787147089dab</ID>
       <Filename>platformtest.kmn</Filename>
-      <Filepath>platformtest.kmn</Filepath>
+      <Filepath>source/platformtest.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
       <Details>
@@ -22,7 +22,7 @@
     <File>
       <ID>id_18e336f9ad890bf821ff56e1a7764478</ID>
       <Filename>platformtest.kps</Filename>
-      <Filepath>platformtest.kps</Filepath>
+      <Filepath>source/platformtest.kps</Filepath>
       <FileVersion></FileVersion>
       <FileType>.kps</FileType>
       <Details>
diff --git a/common/test/keyboards/platform-rules/platformtest.kmn b/common/test/keyboards/platform-rules/source/platformtest.kmn
similarity index 100%
rename from common/test/keyboards/platform-rules/platformtest.kmn
rename to common/test/keyboards/platform-rules/source/platformtest.kmn
diff --git a/common/test/keyboards/platform-rules/platformtest.kps b/common/test/keyboards/platform-rules/source/platformtest.kps
similarity index 93%
rename from common/test/keyboards/platform-rules/platformtest.kps
rename to common/test/keyboards/platform-rules/source/platformtest.kps
index 2418fadd7c..2cda2953df 100644
--- a/common/test/keyboards/platform-rules/platformtest.kps
+++ b/common/test/keyboards/platform-rules/source/platformtest.kps
@@ -20,13 +20,13 @@
   </Info>
   <Files>
     <File>
-      <Name>platformtest.kmx</Name>
+      <Name>../platformtest.kmx</Name>
       <Description>Keyboard Platformtest</Description>
       <CopyLocation>0</CopyLocation>
       <FileType>.kmx</FileType>
     </File>
     <File>
-      <Name>platformtest.js</Name>
+      <Name>../platformtest.js</Name>
       <Description>File platformtest.js</Description>
       <CopyLocation>0</CopyLocation>
       <FileType>.js</FileType>

From 971d67e266bb017fd3163f345f748fa99ced4bcc Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 08:12:15 +0100
Subject: [PATCH 29/83] maint(resources): use actions/setup-node to upgrade npm

We don't have permissions to use `npm install --global npm` to get a
specific version, but this action is supported by GH so should be fine.

It remains to be seen if there will be other compatibility issues due to
being a later version of Node than what we are using in v19.

Build-bot: skip
Test-bot: skip
---
 .github/workflows/npm-publish.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 11425148f9..f76dc6f94f 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -39,14 +39,22 @@ jobs:
       with:
         ref: '${{ github.event.client_payload.buildSha }}'
 
-    - name: Upgrade npm to 11.6.2
+
+    - name: Report initial npm/node versions
       run: |
-        echo "Initial npm version"
+        echo "Initial npm/node versions"
         npm -v
-        echo "Upgrading npm to 11.6.2"
-        npm install --global npm@11.6.2
-        echo "Current npm version"
+        node -v
+
+    - uses: actions/setup-node@v6
+      with:
+        node-version: 24.10
+
+    - name: Report current npm/node versions
+      run: |
+        echo "Current npm/node versions"
         npm -v
+        node -v
 
     - name: Set pending status on PR builds
       id: set_status

From fe484826acb13f9d4ff045675eb18bd011f54306 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 08:59:27 +0100
Subject: [PATCH 30/83] maint(resources): use a string for version, rather than
 number

Test-bot: skip
Build-bot: skip
---
 .github/workflows/npm-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index f76dc6f94f..c5f89d6b81 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -48,7 +48,7 @@ jobs:
 
     - uses: actions/setup-node@v6
       with:
-        node-version: 24.10
+        node-version: '24.10'
 
     - name: Report current npm/node versions
       run: |

From 794faedbde552511a097b08ad22b7ae88675e295 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 09:00:40 +0100
Subject: [PATCH 31/83] maint(resources): remove gh status check for
 npm-publish

Build-bot: skip
---
 .github/workflows/npm-publish.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index c5f89d6b81..5c0d443117 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -56,20 +56,6 @@ jobs:
         npm -v
         node -v
 
-    - name: Set pending status on PR builds
-      id: set_status
-      if: github.event.client_payload.isTestBuild == 'true'
-      shell: bash
-      run: |
-        gh api \
-          --method POST \
-          -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
-          -f state='pending' \
-          -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
-          -f description='NPM pack started' \
-          -f context="$STATUS_CONTEXT"
-
     - name: NPM pack
       if: github.event.client_payload.isTestBuild == 'true'
       run: |

From 9b426a432a65823e4334093ca1b6caa84308264e Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 28 Oct 2025 15:58:59 +0700
Subject: [PATCH 32/83] fix(common): Add keyboard description

---
 .../platform-rules/source/platformtest.kmp       | Bin 0 -> 3915 bytes
 .../platform-rules/source/platformtest.kmx       | Bin 0 -> 5260 bytes
 .../platform-rules/source/platformtest.kps       |   1 +
 3 files changed, 1 insertion(+)
 create mode 100644 common/test/keyboards/platform-rules/source/platformtest.kmp
 create mode 100644 common/test/keyboards/platform-rules/source/platformtest.kmx

diff --git a/common/test/keyboards/platform-rules/source/platformtest.kmp b/common/test/keyboards/platform-rules/source/platformtest.kmp
new file mode 100644
index 0000000000000000000000000000000000000000..636859726f3f5f9c651dcb1e68ce4bf2b7607961
GIT binary patch
literal 3915
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
LdOVw*`g`?%Sl%B0

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/platform-rules/source/platformtest.kmx b/common/test/keyboards/platform-rules/source/platformtest.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..52d72993d0b595506e8f0a78c607d55284a41855
GIT binary patch
literal 5260
zcmeI0Uuc(A7{{MgTCG)PmS(Ho*|KSB)2wvaGR@^wHgWS$&cw}asm*O{(^N!cM1+Wm
z7ZPJccp(N}>>|35T||gTgcl(Z5fQNq2?;N{l5l;V=Y7w9&+qvA?WWt#cz*Bq`+d$i
z&-wSB^Pa8W*4!keB5!?Gdq_wn`a^mXLzb1;$W)PW5^y4&oRPvOGNt@pktZ{J3_LT#
zgWv};d>TAA!$aWvGkgwQnc-3JJsG|Xem29uIsB)?|2SNBUoL;S!<7y%ak$pu28VYz
zyvN~#4j*&)V~5W;JnZmAhc7vN#o-?v9&`A%!=+PleVpy^9EYnNUg7XshqpVt&*38u
z4?29>;bDg_I(*6DD-K_G_*aMjaQK$Pw;e8J?S(Zk%i&6gs~ukD@HU6{IDE+A;|`w!
zXUkfKz^kQCI;2$w_-&U&K9arQJ)rd{hh;y$ZrD4pgIJgJNH5PmH06ELPl+DOvsjkP
zBB{m}%TjsGu)rm+F2SpLRM)x>^V~?i+J;VQ>LX?|HTT0cZ<_Nf;x$RVY~cB>wW5s@
zUE~;`%mLX=n+0p7d^^3+X9tS*ryHdQ)DPE)?f81o+u_=F)wQ3y4eJ)sWu*>?;&yAx
zhZd(7K0wYka&%bxdWosM*I3<n1}LfHqLDkurxBEC`!wo)V>;F!80y5YE!CcDw0`R7
z#QM+$EgkDt@Z|mMrA2-O7g}vwsim8_Ym}{wp2*wM0Q0?XG(GLT;%(&Gz&JO^X2X+5
z{eN`-+vpa4W0(TDkR2Rf@+^U?X}STwf?dPH8KU|=4xl=$0h^*imX16qvIX0Tag0o)
zMI3yk*mTU-a}oY2b{b=Qm`Gy}iF}J)#eDwmGLd!ICM>j33ys1xo#*M>bK&7s*WWpq
zmKh(PV&`zHidh<^f0r@!rSTML4-VKHtZ$62ZGDr1CzRFaG{&JE^Qj76gZVW*K0Z?t
zA}~A!c8}m?Ff0m(6uAqxKz%-4Bhv3t3vR;iL|Q4KXJ~kr5_ol_t$?q?(mmSmX`z)&
z4c>T%3tpX&gfUC^yP)cHB+>2{e2<vV?}fqhC>|Yko!MgJ;b)y}@(pdj8ujTqd@Ry#
z!S7(nT{~}xKFy-$@590OnECv!96ZzUXq$Ca7i+U$@nn-NOnj$KzDs@ZqgWE{_aV;X
z<kdM!cmJU3nXA!R(nX`I&!<Wzbb(H)OUvMEBdr;}E7H2)$0F?nd??b+!@tIKWpofH
zv{%1*ljzh6KK%wx?9EHhu%PSraANPJKhc7BmU;8fx8QrqeEzfxp4oVG-1Ma>Hfzxf
zC1ou2@@)U1n58OsEtW_{f%m^eo+g+2?*4*ETT&wB<j|JraxK=9XerAe5r-^l;qy84
z@|hxaBD<9EvMzD^r@Ct48zXH8yff1J;DeEN3O<Y#-%<3dwD^wloO$CNB{4Psdn)v^
z!hD5x6g>;pV3t<WCtmV4%xm57<B@g}em2t1!ABx(6#jjr{RE%OhEbn|72;OGYa*=<
zz9rJy;JuM{6h4eKy86C=k3`xi{92^_0w0UCTkzYFHkEB`2IgZV@Ris`7k3rBA=0+P
zyCUrn{4BP~mHiw(5^1CGn^?2U_ZR$5q?NM$C792*0KOC3?8@$f_eR=L_$QHe2L2uP
zo-2D9{zIhw48IX+f5Y{%<I9%8pN+Kn@R~@ggEvRoF8B#7;cGhoRuR_sG6E)iW#`{9
zf_J%j_cC`)prF>6n)?FJdEPM328)&6MM9Ys=4r8-62?{I`7feGs@S_*xlMG?9&M{4
z{nguDdP7M-=`CxXyia}Fa=qpCOYW`{;>|a2Gd1RJKEd~r`8K+HQ1C1;Pm9#?SE!XC
zYO&FL!O9mK&AH}{NApEf!%Zf%q{`GnBRS7J#YZx2V>4e(;f@*Ve4dhP8Ik<^X7E<x
zZDD5WC+&HB?_Fqju29G8S=$Qbnru8Pc>Ch^mdLACTSd_}mvCd(HPAwvyR*A}_^*JD
z=VTEZ7>BT~a_e`Y)wh*3)dmW^T9ifcW%N6~pTEgs)Z1AQYI)geS)F&Q4!&yht(mxE
z2Ys>Wb*%qF-zQ7V+eA-t_wP{h74tQ^+j#ISHBXDIvRk$Ok0Jfv$ldQ`x|03{%&DLH

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/platform-rules/source/platformtest.kps b/common/test/keyboards/platform-rules/source/platformtest.kps
index 2cda2953df..9a9186d5bb 100644
--- a/common/test/keyboards/platform-rules/source/platformtest.kps
+++ b/common/test/keyboards/platform-rules/source/platformtest.kps
@@ -17,6 +17,7 @@
   <Info>
     <Version URL=""></Version>
     <Name URL="">PlatformTest</Name>
+    <Description URL="">Test keyboard for displaying platform information.</Description>
   </Info>
   <Files>
     <File>

From 844219f2cb450dde2f5380b56d02d3faeda11c5d Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 11:14:22 +0100
Subject: [PATCH 33/83] maint(resources): set env variables in npm publish GHA

Test-bot: skip
Build-bot: skip
---
 .github/workflows/npm-publish.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 5c0d443117..c3c3707d1c 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -59,6 +59,9 @@ jobs:
     - name: NPM pack
       if: github.event.client_payload.isTestBuild == 'true'
       run: |
+        export KEYMAN_TIER=$(cat TIER.md)
+        export GHA_TEST_BUILD="${{ github.event.client_payload.isTestBuild }}"
+        export GHA_BRANCH="${{ github.event.client_payload.branch }}"
         if [[ -f ./resources/build/ci/npm-publish.sh ]]; then
           ./resources/build/ci/npm-publish.sh pack
         else
@@ -68,6 +71,9 @@ jobs:
     - name: NPM publish
       if: github.event.client_payload.isTestBuild == 'false'
       run: |
+        export KEYMAN_TIER=$(cat TIER.md)
+        export GHA_TEST_BUILD="${{ github.event.client_payload.isTestBuild }}"
+        export GHA_BRANCH="${{ github.event.client_payload.branch }}"
         if [[ -f ./resources/build/ci/npm-publish.sh ]]; then
           ./resources/build/ci/npm-publish.sh publish
         else

From c282e557c4ffe87076812800030b391aeb9ae7e9 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 13:10:04 +0100
Subject: [PATCH 34/83] maint(resources): add build and test for npm packaging

Test-bot: skip
Build-bot: skip release:developer
---
 resources/build/ci/npm-publish.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/build/ci/npm-publish.sh b/resources/build/ci/npm-publish.sh
index 6e39838fbd..83994355e4 100755
--- a/resources/build/ci/npm-publish.sh
+++ b/resources/build/ci/npm-publish.sh
@@ -37,8 +37,9 @@ builder_parse "$@"
 function do_pack() {
   local npm_package_path
   for npm_package_path in "${PACKAGES[@]}"; do
-    builder_heading "Packing $npm_package_path"
-    ci_publish_npm_package pack "$npm_package_path"
+    builder_heading "Building and packing ${npm_package_path}"
+    "${KEYMAN_ROOT}/${npm_package_path}/build.sh build test"
+    ci_publish_npm_package pack "${npm_package_path}"
   done
 }
 
@@ -50,8 +51,9 @@ function do_publish() {
   fi
 
   for npm_package_path in "${PACKAGES[@]}"; do
-    builder_heading "Publishing $npm_package_path"
-    ci_publish_npm_package publish "$npm_package_path"
+    builder_heading "Building and publishing ${npm_package_path}"
+    "${KEYMAN_ROOT}/${npm_package_path}/build.sh build test"
+    ci_publish_npm_package publish "${npm_package_path}"
   done
 }
 

From 0f6b4d52e0ee43e4def5b92ec0109ef97c98e6c0 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 13:29:40 +0100
Subject: [PATCH 35/83] maint(resources): add commit status check for
 npm-publish

Build-bot: skip release:developer
---
 .github/workflows/npm-publish.yml | 56 +++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index c3c3707d1c..a14c05e640 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -22,14 +22,15 @@ on:
 
 permissions:
   id-token: write  # Required for OIDC
-  contents: read
+  contents: write
+  pull-requests: write
 
 env:
   GH_TOKEN: ${{ github.token }}
-  STATUS_CONTEXT: 'NPM Pack'
+  STATUS_CONTEXT: 'npm pack'
 
 jobs:
-  npm-publish:
+  npm_publish:
     name: Publish or pack @keymanapp packages
     if: github.repository == 'keymanapp/keyman' || github.event.client_payload.force
     runs-on: ubuntu-24.04
@@ -39,6 +40,19 @@ jobs:
       with:
         ref: '${{ github.event.client_payload.buildSha }}'
 
+    - name: Set pending status on PR builds
+      id: set_status
+      if: github.event.client_payload.isTestBuild == 'true'
+      shell: bash
+      run: |
+        gh api \
+          --method POST \
+          -H "Accept: application/vnd.github+json" \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
+          -f state='pending' \
+          -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
+          -f description='npm pack started' \
+          -f context="$STATUS_CONTEXT"
 
     - name: Report initial npm/node versions
       run: |
@@ -79,3 +93,39 @@ jobs:
         else
           echo WARNING: npm-publish.sh is not yet available on this branch
         fi
+
+  # We intentionally ignore the results of binary_packages_unreleased
+  set_status:
+    name: Set result status on PR builds
+    needs: [npm_publish]
+    runs-on: ubuntu-latest
+    if: ${{ always() && github.event.client_payload.isTestBuild == 'true' }}
+    steps:
+    - name: Set success
+      if: needs.npm_publish.result == 'success'
+      run: |
+        echo "RESULT=success" >> $GITHUB_ENV
+        echo "MSG=npm pack succeeded" >> $GITHUB_ENV
+
+    - name: Set cancelled
+      if: needs.npm_publish.result == 'cancelled'
+      run: |
+        echo "RESULT=error" >> $GITHUB_ENV
+        echo "MSG=npm pack cancelled" >> $GITHUB_ENV
+
+    - name: Set failure
+      if: needs.npm_publish.result == 'failure'
+      run: |
+        echo "RESULT=failure" >> $GITHUB_ENV
+        echo "MSG=npm pack failed" >> $GITHUB_ENV
+
+    - name: Set final status
+      run: |
+        gh api \
+          --method POST \
+          -H "Accept: application/vnd.github+json" \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
+          -f state="$RESULT" \
+          -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
+          -f description="$MSG" \
+          -f context="$STATUS_CONTEXT"

From 49161075f3484216e2130c4a1fa1e15c0d0d8699 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 13:30:57 +0100
Subject: [PATCH 36/83] maint(resources): lower case npm

---
 .github/workflows/npm-publish.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index a14c05e640..fb9d1cdfda 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -3,7 +3,7 @@
 #
 # Created by mcdurdin on 2025-10-27
 #
-# This workflow publishes all our NPM packages using Trusted Publishers OIDC
+# This workflow publishes all our npm packages using Trusted Publishers OIDC
 # permissions. It is triggered by a repository_dispatch event with the types
 # `npm-publish:*`, from the trigger-builds infrastructure. For test builds, this
 # does a `npm pack` only.
@@ -14,8 +14,8 @@
 #   user:        The user that triggered the build or created the PR
 #   isTestBuild: false for Releases, otherwise true
 
-name: "NPM publish"
-run-name: "NPM publish - sha: ${{ github.event.client_payload.buildSha }}, user: @${{ github.event.client_payload.user }}, isTestBuild: ${{ github.event.client_payload.isTestBuild }}"
+name: "npm publish"
+run-name: "npm publish - sha: ${{ github.event.client_payload.buildSha }}, user: @${{ github.event.client_payload.user }}, isTestBuild: ${{ github.event.client_payload.isTestBuild }}"
 on:
   repository_dispatch:
     types: ['npm-publish:*']
@@ -70,7 +70,7 @@ jobs:
         npm -v
         node -v
 
-    - name: NPM pack
+    - name: npm pack
       if: github.event.client_payload.isTestBuild == 'true'
       run: |
         export KEYMAN_TIER=$(cat TIER.md)
@@ -82,7 +82,7 @@ jobs:
           echo WARNING: npm-publish.sh is not yet available on this branch
         fi
 
-    - name: NPM publish
+    - name: npm publish
       if: github.event.client_payload.isTestBuild == 'false'
       run: |
         export KEYMAN_TIER=$(cat TIER.md)

From f1368dd418b2a41e41bc2351d6ee069b3cb6dfdd Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 13:34:37 +0100
Subject: [PATCH 37/83] maint(resources): rename npm-publish workflow and give
 detailed title

---
 .github/workflows/npm-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index fb9d1cdfda..c538598d49 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -14,8 +14,8 @@
 #   user:        The user that triggered the build or created the PR
 #   isTestBuild: false for Releases, otherwise true
 
-name: "npm publish"
-run-name: "npm publish - sha: ${{ github.event.client_payload.buildSha }}, user: @${{ github.event.client_payload.user }}, isTestBuild: ${{ github.event.client_payload.isTestBuild }}"
+name: "npm pack/publish"
+run-name: "npm pack/publish - branch: ${{ github.event.client_payload.branch }} sha: ${{ github.event.client_payload.buildSha }}, user: @${{ github.event.client_payload.user }}, isTestBuild: ${{ github.event.client_payload.isTestBuild }}"
 on:
   repository_dispatch:
     types: ['npm-publish:*']

From fe7209cdeba20667a762c86a23f44fa000f3561b Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 13:40:48 +0100
Subject: [PATCH 38/83] maint(resources): verify keyman_root

---
 resources/build/ci/npm-publish.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/build/ci/npm-publish.sh b/resources/build/ci/npm-publish.sh
index 83994355e4..cca4685fe5 100755
--- a/resources/build/ci/npm-publish.sh
+++ b/resources/build/ci/npm-publish.sh
@@ -34,6 +34,8 @@ builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
 
+echo "Keyman root: ${KEYMAN_ROOT}"
+
 function do_pack() {
   local npm_package_path
   for npm_package_path in "${PACKAGES[@]}"; do

From 17cc7fd321af535f1580a2313b892be21bc3d805 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 13:41:55 +0100
Subject: [PATCH 39/83] maint(resources): fix build call in npm-publish

---
 resources/build/ci/npm-publish.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/build/ci/npm-publish.sh b/resources/build/ci/npm-publish.sh
index cca4685fe5..1b49ceb680 100755
--- a/resources/build/ci/npm-publish.sh
+++ b/resources/build/ci/npm-publish.sh
@@ -40,7 +40,7 @@ function do_pack() {
   local npm_package_path
   for npm_package_path in "${PACKAGES[@]}"; do
     builder_heading "Building and packing ${npm_package_path}"
-    "${KEYMAN_ROOT}/${npm_package_path}/build.sh build test"
+    "${KEYMAN_ROOT}/${npm_package_path}/build.sh" build test
     ci_publish_npm_package pack "${npm_package_path}"
   done
 }
@@ -54,7 +54,7 @@ function do_publish() {
 
   for npm_package_path in "${PACKAGES[@]}"; do
     builder_heading "Building and publishing ${npm_package_path}"
-    "${KEYMAN_ROOT}/${npm_package_path}/build.sh build test"
+    "${KEYMAN_ROOT}/${npm_package_path}/build.sh" build test
     ci_publish_npm_package publish "${npm_package_path}"
   done
 }

From b582e3c0fbecebffbb67aa575a913e46d2cb7e5a Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 14:14:42 +0100
Subject: [PATCH 40/83] maint(resources): improve reporting of status for
 npm-publish

Build-bot: skip
---
 .github/workflows/npm-publish.yml | 55 ++++++++++++++++---------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index c538598d49..5441606647 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -27,7 +27,8 @@ permissions:
 
 env:
   GH_TOKEN: ${{ github.token }}
-  STATUS_CONTEXT: 'npm pack'
+  STATUS_CONTEXT: 'npm pack/publish'
+  IS_TEST_BUILD: ${{ github.event.client_payload.isTestBuild }}
 
 jobs:
   npm_publish:
@@ -35,14 +36,22 @@ jobs:
     if: github.repository == 'keymanapp/keyman' || github.event.client_payload.force
     runs-on: ubuntu-24.04
     steps:
+
+    - name: Set env var for pack vs publish
+      run: |
+        if [[ "$IS_TEST_BUILD" == true ]]; then
+          echo "NPM_ACTION=pack" >> $GITHUB_ENV
+        else
+          echo "NPM_ACTION=publish" >> $GITHUB_ENV
+        fi
+
     - name: Checkout
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
       with:
         ref: '${{ github.event.client_payload.buildSha }}'
 
-    - name: Set pending status on PR builds
+    - name: Set pending status
       id: set_status
-      if: github.event.client_payload.isTestBuild == 'true'
       shell: bash
       run: |
         gh api \
@@ -51,7 +60,7 @@ jobs:
           /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
           -f state='pending' \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
-          -f description='npm pack started' \
+          -f description='npm $NPM_ACTION started' \
           -f context="$STATUS_CONTEXT"
 
     - name: Report initial npm/node versions
@@ -70,54 +79,48 @@ jobs:
         npm -v
         node -v
 
-    - name: npm pack
-      if: github.event.client_payload.isTestBuild == 'true'
+    - name: npm pack/publish
       run: |
         export KEYMAN_TIER=$(cat TIER.md)
-        export GHA_TEST_BUILD="${{ github.event.client_payload.isTestBuild }}"
         export GHA_BRANCH="${{ github.event.client_payload.branch }}"
         if [[ -f ./resources/build/ci/npm-publish.sh ]]; then
-          ./resources/build/ci/npm-publish.sh pack
+          ./resources/build/ci/npm-publish.sh $NPM_ACTION
         else
-          echo WARNING: npm-publish.sh is not yet available on this branch
+          echo WARNING: npm-publish.sh is not yet available
         fi
 
-    - name: npm publish
-      if: github.event.client_payload.isTestBuild == 'false'
-      run: |
-        export KEYMAN_TIER=$(cat TIER.md)
-        export GHA_TEST_BUILD="${{ github.event.client_payload.isTestBuild }}"
-        export GHA_BRANCH="${{ github.event.client_payload.branch }}"
-        if [[ -f ./resources/build/ci/npm-publish.sh ]]; then
-          ./resources/build/ci/npm-publish.sh publish
-        else
-          echo WARNING: npm-publish.sh is not yet available on this branch
-        fi
-
-  # We intentionally ignore the results of binary_packages_unreleased
   set_status:
     name: Set result status on PR builds
     needs: [npm_publish]
     runs-on: ubuntu-latest
-    if: ${{ always() && github.event.client_payload.isTestBuild == 'true' }}
+    if: ${{ always() }}
     steps:
+
+    - name: Set env var for pack vs publish
+      run: |
+        if [[ "$IS_TEST_BUILD" == true ]]; then
+          echo "NPM_ACTION=pack" >> $GITHUB_ENV
+        else
+          echo "NPM_ACTION=publish" >> $GITHUB_ENV
+        fi
+
     - name: Set success
       if: needs.npm_publish.result == 'success'
       run: |
         echo "RESULT=success" >> $GITHUB_ENV
-        echo "MSG=npm pack succeeded" >> $GITHUB_ENV
+        echo "MSG=npm $NPM_ACTION succeeded" >> $GITHUB_ENV
 
     - name: Set cancelled
       if: needs.npm_publish.result == 'cancelled'
       run: |
         echo "RESULT=error" >> $GITHUB_ENV
-        echo "MSG=npm pack cancelled" >> $GITHUB_ENV
+        echo "MSG=npm $NPM_ACTION cancelled" >> $GITHUB_ENV
 
     - name: Set failure
       if: needs.npm_publish.result == 'failure'
       run: |
         echo "RESULT=failure" >> $GITHUB_ENV
-        echo "MSG=npm pack failed" >> $GITHUB_ENV
+        echo "MSG=npm $NPM_ACTION failed" >> $GITHUB_ENV
 
     - name: Set final status
       run: |

From a4779a7f9356787d2582d8e4293030f6cc387844 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 15:04:19 +0100
Subject: [PATCH 41/83] maint(resources): add write permission for statuses for
 npm-publish

Build-bot: skip
Test-bot: skip
---
 .github/workflows/npm-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 5441606647..9047b49696 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -22,8 +22,8 @@ on:
 
 permissions:
   id-token: write  # Required for OIDC
-  contents: write
-  pull-requests: write
+  contents: read
+  statuses: write
 
 env:
   GH_TOKEN: ${{ github.token }}

From 3040c7217497a2bfe483f42ca5d349fb41f5b962 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 28 Oct 2025 15:28:24 +0100
Subject: [PATCH 42/83] maint(resources): skip nvm in npm-publish script

Test-bot: skip
Build-bot: skip
---
 .github/workflows/npm-publish.yml | 4 ++++
 resources/build/node.inc.sh       | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 9047b49696..8fbaeab347 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -29,6 +29,10 @@ env:
   GH_TOKEN: ${{ github.token }}
   STATUS_CONTEXT: 'npm pack/publish'
   IS_TEST_BUILD: ${{ github.event.client_payload.isTestBuild }}
+  # This property causes node.inc.sh to skip invocation of nvm, as otherwise, we
+  # end up downgrading to node v20 as of Keyman 19. See #15040 and corresponding
+  # change in node.inc.sh; we should be able to remove this in Keyman 20.
+  KEYMAN_CI_SKIP_NVM: true
 
 jobs:
   npm_publish:
diff --git a/resources/build/node.inc.sh b/resources/build/node.inc.sh
index 15e66da78c..cf4da8131c 100644
--- a/resources/build/node.inc.sh
+++ b/resources/build/node.inc.sh
@@ -22,7 +22,12 @@ node_select_version_and_npm_ci() {
   # Also, a developer can set KEYMAN_USE_NVM variable to get this behaviour
   # automatically too (see /docs/build/node.md)
   if [[ "$KEYMAN_VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_NVM+x}" ]]; then
-    _node_select_version_with_nvm
+    # For npm publishing, we currently need to use an alternate version of node
+    # that includes npm 11.5.1 or later (see #15040). Once we move to node v24,
+    # we can probably remove this check
+    if [[ -z "${KEYMAN_CI_SKIP_NVM+x}" ]]; then
+      _node_select_version_with_nvm
+    fi
   fi
 
   # Check if Node.JS/npm is installed.

From 3d10ac4b870d34fbdc26828a3e07fc8d717490aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Tue, 28 Oct 2025 16:50:04 +0100
Subject: [PATCH 43/83] test(kmc-analyze): add tests for AnalyzeOskCharacterUse
 output formats

---
 .../src/osk-character-use/index.ts            |  4 +++-
 .../test/osk-character-use-format.tests.ts    | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/developer/src/kmc-analyze/src/osk-character-use/index.ts b/developer/src/kmc-analyze/src/osk-character-use/index.ts
index 80a0ea3e0a..7058ad6776 100644
--- a/developer/src/kmc-analyze/src/osk-character-use/index.ts
+++ b/developer/src/kmc-analyze/src/osk-character-use/index.ts
@@ -408,6 +408,8 @@ export class AnalyzeOskCharacterUse {
 
   /** @internal */
   public unitTestEndPoints = {
-    loadPreviousMap: this.loadPreviousMap.bind(this)
+    loadPreviousMap: this.loadPreviousMap.bind(this),
+    addStrings: this.addStrings.bind(this),
+    stringToUnicodeSequence: AnalyzeOskCharacterUse.stringToUnicodeSequence
   };
 }
\ No newline at end of file
diff --git a/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
index f4a8d6b7a1..23a4b1cbf3 100644
--- a/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
+++ b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
@@ -19,23 +19,27 @@ describe('AnalyzeOskCharacterUse output formats', function() {
   });
 
   this.afterEach(function() {
-    if(this.currentTest?.isFailed()) {
+    if (this.currentTest?.isFailed()) {
       callbacks.printMessages();
     }
   });
 
   it('generates .txt format correctly', function() {
     const a = new AnalyzeOskCharacterUse(callbacks, { includeCounts: true });
-    (a as any)._strings = dummyStrings;
+    a.unitTestEndPoints.addStrings(['a', 'b'], 'testfile.kvks');
     const txt = a.getStrings('.txt');
     assert.isTrue(txt.some(line => line.includes('U+')));
+    assert.match(txt[0], /^U\+[A-F0-9]{4}/);
   });
 
   it('generates .md format correctly', function() {
     const a = new AnalyzeOskCharacterUse(callbacks, { includeCounts: true });
     (a as any)._strings = dummyStrings;
     const md = a.getStrings('.md');
-    assert.isTrue(md[0].includes('PUA') && md[2].includes('|'));
+    // test header
+    assert.match(md[0], /^PUA\s+\|\s+Code Points\s+\|\s+Key Caps$/);
+    // test data
+    assert.match(md[2], /^U\+[A-F0-9]{4}\s+\|\s+U\+[A-F0-9]{4}\s+\|\s+\S/);
   });
 
   it('generates .json format correctly', function() {
@@ -44,10 +48,16 @@ describe('AnalyzeOskCharacterUse output formats', function() {
     const json = a.getStrings('.json').join('\n');
     const parsed = JSON.parse(json);
     assert.isArray(parsed.map);
+    assert.lengthOf(parsed.map, 2);
+    assert.equal(parsed.map[0].usages[0].filename, 'file1.kvks');
+    assert.equal(parsed.map[1].usages[0].filename, 'file2.kvks');
   });
 
-  it('converts strings to Unicode sequences correctly', function() {
-    const seq = (AnalyzeOskCharacterUse as any).stringToUnicodeSequence('ab');
-    assert.equal(seq, 'U+0061 U+0062');
+  describe('unitTestEndPoints', function() {
+    it('converts strings to Unicode sequences correctly', function() {
+      const a = new AnalyzeOskCharacterUse(callbacks);
+      const seq = a.unitTestEndPoints.stringToUnicodeSequence('ab');
+      assert.equal(seq, 'U+0061 U+0062');
+    });
   });
 });
\ No newline at end of file

From e2eb10312f486746878ab3b11ce27eb3ca22ce22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20V=C3=B6lker?= <christov@gmx.de>
Date: Tue, 28 Oct 2025 17:46:07 +0100
Subject: [PATCH 44/83] test(kmc-analyze): add supplementary plane tests for
 stringToUnicodeSequence

---
 .../kmc-analyze/test/osk-character-use-format.tests.ts   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
index 23a4b1cbf3..9acd87403f 100644
--- a/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
+++ b/developer/src/kmc-analyze/test/osk-character-use-format.tests.ts
@@ -54,10 +54,17 @@ describe('AnalyzeOskCharacterUse output formats', function() {
   });
 
   describe('unitTestEndPoints', function() {
-    it('converts strings to Unicode sequences correctly', function() {
+    it('converts BMP strings (U+0000–U+FFFF) correctly', function() {
       const a = new AnalyzeOskCharacterUse(callbacks);
       const seq = a.unitTestEndPoints.stringToUnicodeSequence('ab');
       assert.equal(seq, 'U+0061 U+0062');
     });
+
+    it('converts supplementary characters (U+10000–U+10FFFF) correctly', function() {
+      const a = new AnalyzeOskCharacterUse(callbacks);
+      // 😀 (U+1F600) and 🦊 (U+1F98A)
+      const seq = a.unitTestEndPoints.stringToUnicodeSequence('😀🦊');
+      assert.equal(seq, 'U+1F600 U+1F98A');
+    });
   });
 });
\ No newline at end of file

From 2176b13169ecc383022374d6f46fe0af9df4df2c Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Tue, 28 Oct 2025 13:02:36 -0500
Subject: [PATCH 45/83] auto: increment master version to 19.0.148

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 11 +++++++++++
 VERSION.md |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 984700a2b4..d5e33e180f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,16 @@
 # Keyman Version History
 
+## 19.0.147 alpha 2025-10-28
+
+* maint(resources): move npm package publishing to GitHub Actions (#15029)
+* maint(resources): use actions/setup-node to upgrade npm (#15035)
+* maint(resources): use a string for version, rather than number (#15036)
+* maint(resources): set env variables in npm publish GHA (#15037)
+* maint(mac): minor tweaks to mac setup, using build.sh (#15028)
+* maint(resources): add build and test for npm packaging and add status check results (#15038)
+* maint(resources): add write permission for statuses for npm-publish (#15039)
+* maint(resources): skip nvm in npm-publish script (#15041)
+
 ## 19.0.146 alpha 2025-10-27
 
 * fix(mac): ignore non-Unicode key caps when preparing OSK (#15008)
diff --git a/VERSION.md b/VERSION.md
index a82718a352..6a24417c12 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.147
\ No newline at end of file
+19.0.148
\ No newline at end of file

From f9b25890b64674a333b3649f6dbbcd9ffe60beb3 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 10:27:29 +0100
Subject: [PATCH 46/83] maint(resources): add meson and emscripten setup to
 npm-publish

Also splits the build and publish steps so all packages are built before
first is published, as publishing stomps on package.json files, which
makes subsequent builds trickier.

This needs to be merged to master in order for the action steps to pass.

Build-bot: skip
Test-bot: skip
---
 .github/workflows/npm-publish.yml |  6 ++-
 resources/build/ci/npm-publish.sh | 64 ++++++++++++++++++++++++-------
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 8fbaeab347..1b492d899e 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -64,7 +64,7 @@ jobs:
           /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
           -f state='pending' \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
-          -f description='npm $NPM_ACTION started' \
+          -f description="npm $NPM_ACTION started" \
           -f context="$STATUS_CONTEXT"
 
     - name: Report initial npm/node versions
@@ -83,6 +83,10 @@ jobs:
         npm -v
         node -v
 
+    - name: Configure build environment
+      run: |
+        ./resources/build/ci/npm-publish.sh configure
+
     - name: npm pack/publish
       run: |
         export KEYMAN_TIER=$(cat TIER.md)
diff --git a/resources/build/ci/npm-publish.sh b/resources/build/ci/npm-publish.sh
index 1b49ceb680..898c0a40bd 100755
--- a/resources/build/ci/npm-publish.sh
+++ b/resources/build/ci/npm-publish.sh
@@ -23,9 +23,11 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 . "$KEYMAN_ROOT/resources/build/ci/npm-packages.inc.sh"
+. "$KEYMAN_ROOT/resources/build/minimum-versions.inc.sh"
 
 builder_describe \
   "Publish @keymanapp packages to NPM" \
+  "configure         Install required modules for build on GHA" \
   "pack              Pack NPM packages to a .tgz for verification" \
   "publish           Publish NPM packages to the NPM Registry" \
   "--dry-run         Don't publish/pack anything, just dry run"
@@ -34,30 +36,66 @@ builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
 
-echo "Keyman root: ${KEYMAN_ROOT}"
-
 function do_pack() {
+  do_package_builds
+  do_pack_or_publish pack
+}
+
+function do_package_builds() {
   local npm_package_path
   for npm_package_path in "${PACKAGES[@]}"; do
-    builder_heading "Building and packing ${npm_package_path}"
+    builder_heading "Building ${npm_package_path}"
     "${KEYMAN_ROOT}/${npm_package_path}/build.sh" build test
-    ci_publish_npm_package pack "${npm_package_path}"
+  done
+}
+
+function do_pack_or_publish() {
+  local npm_action="$1"
+  local npm_package_path
+  for npm_package_path in "${PACKAGES[@]}"; do
+    builder_heading "npm ${npm_action} ${npm_package_path}"
+    ci_publish_npm_package "${npm_action}" "${npm_package_path}"
   done
 }
 
 function do_publish() {
-  local npm_package_path
-
   if [[ $KEYMAN_VERSION_ENVIRONMENT =~ local|test ]] && ! builder_has_option --dry-run; then
     builder_die "publish must use --dry-run flag for local or test builds"
   fi
 
-  for npm_package_path in "${PACKAGES[@]}"; do
-    builder_heading "Building and publishing ${npm_package_path}"
-    "${KEYMAN_ROOT}/${npm_package_path}/build.sh" build test
-    ci_publish_npm_package publish "${npm_package_path}"
-  done
+  do_package_builds
+  do_pack_or_publish publish
 }
 
-builder_run_action pack    do_pack
-builder_run_action publish do_publish
+function install_emscripten() {
+  local EMSDK_TEMP
+  EMSDK_TEMP=$(mktemp -d)
+  pushd "${EMSDK_TEMP}"
+  git clone https://github.com/emscripten-core/emsdk.git
+  cd emsdk
+  ./emsdk install "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
+  ./emsdk activate "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
+  cd upstream/emscripten
+  npm install
+  echo "EMSCRIPTEN_BASE=$(pwd)" >> $GITHUB_ENV
+  EMSCRIPTEN_BASE="$(pwd)"
+  export EMSCRIPTEN_BASE
+  popd
+}
+
+function install_meson() {
+  builder_echo "Starting apt-get update + install meson"
+  sudo apt-get update
+  sudo apt-get install meson
+  echo "meson version:"
+  meson -v
+}
+
+function do_configure() {
+  install_meson
+  install_emscripten
+}
+
+builder_run_action configure do_configure
+builder_run_action pack      do_pack
+builder_run_action publish   do_publish

From ba9500826daa5dff1c8d5e2eb5e73402305ce91f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 10:29:14 +0100
Subject: [PATCH 47/83] maint(resources): add npm pack/publish to
 pr-build-status bot

---
 .github/workflows/pr-build-status.yml               | 2 ++
 resources/build/pr-build-status/pr-build-status.mjs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/pr-build-status.yml b/.github/workflows/pr-build-status.yml
index 20d8007d9b..407dc23ef1 100644
--- a/.github/workflows/pr-build-status.yml
+++ b/.github/workflows/pr-build-status.yml
@@ -80,6 +80,8 @@ jobs:
                   summary += addStatus(o, 'check', status.context, status.state);
                 } else if(status.context == 'Ubuntu Packaging') {
                   summary += addStatus(o, 'build', status.context, status.state);
+                } else if(status.context == 'npm pack/publish') {
+                  summary += addStatus(o, 'build', status.context, status.state);
                 } else if(status.context == 'check/web/file-size') {
                   // Ignore check/web/file-size -- we won't block automerge for this at this point
                   summary += addLog(`Skipping ${status.context}`);
diff --git a/resources/build/pr-build-status/pr-build-status.mjs b/resources/build/pr-build-status/pr-build-status.mjs
index 137a17cea5..2af588f206 100644
--- a/resources/build/pr-build-status/pr-build-status.mjs
+++ b/resources/build/pr-build-status/pr-build-status.mjs
@@ -52,6 +52,8 @@
                   summary += addStatus(o, 'check', status.context, status.state);
                 } else if(status.context == 'Ubuntu Packaging') {
                   summary += addStatus(o, 'build', status.context, status.state);
+                } else if(status.context == 'npm pack/publish') {
+                  summary += addStatus(o, 'build', status.context, status.state);
                 } else if(status.context == 'check/web/file-size') {
                   // Ignore check/web/file-size -- we won't block automerge for this at this point
                   summary += addLog(`Skipping ${status.context}`);

From dd20ad068e8d9584702f03c096af7d56681c970e Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 10:29:33 +0100
Subject: [PATCH 48/83] maint(developer): reduce coverage threshold for node 24
 for dev-utils

I am not entirely clear why the coverage dropped, but I suspect it's due
to code paths that are not activated in node 24. For now, just dropping
coverage threshold to 40%.
---
 developer/src/common/web/utils/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh
index 293b772af8..fd94a8ab66 100755
--- a/developer/src/common/web/utils/build.sh
+++ b/developer/src/common/web/utils/build.sh
@@ -47,4 +47,4 @@ function do_build() {
 builder_run_action clean       rm -rf ./build/
 builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       do_build
-builder_run_action test        typescript_run_eslint_mocha_tests 45
+builder_run_action test        typescript_run_eslint_mocha_tests 40

From 12511894ef9af7b6974114ef23a46058e3993fec Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 10:30:27 +0100
Subject: [PATCH 49/83] chore(developer): skip git date test for shallow clones

If the repository is a shallow checkout, then the only commit will be
the most recent one, and the test will fail. We could lookup the date of
the most recent test, but it's a pretty meaningless test, so instead we
will skip the test in this scenario.

For example, this happens on GitHub Actions when we do a shallow
checkout. The only risk we have is if we move all builds to shallow
checkouts and end up always skipping this test, but (a) the code is
unlikely to change, and (b) issuse would be  picked up on local builds
in that situation pretty quickly.
---
 .../kmc/test/getLastGitCommitDate.tests.ts    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/developer/src/kmc/test/getLastGitCommitDate.tests.ts b/developer/src/kmc/test/getLastGitCommitDate.tests.ts
index 2aa88aa5fa..066d986f63 100644
--- a/developer/src/kmc/test/getLastGitCommitDate.tests.ts
+++ b/developer/src/kmc/test/getLastGitCommitDate.tests.ts
@@ -1,3 +1,4 @@
+import { execFileSync } from 'node:child_process';
 import { assert } from 'chai';
 import 'mocha';
 import { makePathToFixture } from './helpers/index.js';
@@ -17,8 +18,29 @@ describe('getLastGitCommitDate', function () {
     assert.isNull(date);
   });
 
+  function isShallowRepository() {
+    try {
+      const result = execFileSync('git', ['rev-parse', '--is-shallow-repository'], {
+        encoding: 'utf-8',                    // force a string result rather than Buffer
+        windowsHide: true,                    // on windows, we may need this to suppress a console window popup
+        stdio: ['pipe', 'pipe', 'pipe']       // all output via pipe, so we don't get git errors on console
+      });
+      return result.trim() == 'true';
+    } catch (e) {
+      return false;
+    }
+  }
+
   it('should return a valid date for a specific file in the repo', async function() {
     this.timeout(5000); // getLastGitCommitDate depends on git which can sometimes take longer
+
+    if(isShallowRepository()) {
+      // If we have a shallow clone, then the date will be the most recent
+      // commit date, and we'll just skip this test. For example, this happens
+      // on GHA checkouts by default with actions/checkout depth=1
+      this.skip();
+    }
+
     const path = makePathToFixture('get-last-git-commit-date/README.md');
     const date = getLastGitCommitDate(path);
     // The expected date was manually extracted using the following command, with msec appended:

From 6b369fa295c3ab9183afa68f5742fe46403cb487 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 29 Oct 2025 05:02:42 -0500
Subject: [PATCH 50/83] auto: increment master version to 19.0.149

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 5 +++++
 VERSION.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index d5e33e180f..d9bc1da3ff 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 19.0.148 alpha 2025-10-29
+
+* chore(web,android): Consolidate chirality.js test keyboard to `/common/test/resources/keyboards/` (#14989)
+* maint(resources): npm publish - build all packages first (#15042)
+
 ## 19.0.147 alpha 2025-10-28
 
 * maint(resources): move npm package publishing to GitHub Actions (#15029)
diff --git a/VERSION.md b/VERSION.md
index 6a24417c12..3005303805 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.148
\ No newline at end of file
+19.0.149
\ No newline at end of file

From 785a745f9ba0fc7ea7344a83e2c3e3e7e35cc6a0 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 11:38:20 +0100
Subject: [PATCH 51/83] maint(resources): don't report status check on release
 builds for npm-publish

This matches the pattern from deb-packaging.yml. It would be worth
reviewing why the sha doesn't match up?

Build-bot: skip
Test-bot: skip
---
 .github/workflows/npm-publish.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 1b492d899e..c554705161 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -56,6 +56,7 @@ jobs:
 
     - name: Set pending status
       id: set_status
+      if: github.event.client_payload.isTestBuild == 'true'
       shell: bash
       run: |
         gh api \
@@ -131,6 +132,7 @@ jobs:
         echo "MSG=npm $NPM_ACTION failed" >> $GITHUB_ENV
 
     - name: Set final status
+      if: github.event.client_payload.isTestBuild == 'true'
       run: |
         gh api \
           --method POST \

From 530103e5d6ce1395f363066e39ac248b0c2bd049 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 29 Oct 2025 05:49:30 -0500
Subject: [PATCH 52/83] auto: increment master version to 19.0.150

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 4 ++++
 VERSION.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index d9bc1da3ff..42fdc3161c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 19.0.149 alpha 2025-10-29
+
+* maint(resources): don't report status check on release builds for npm-publish (#15045)
+
 ## 19.0.148 alpha 2025-10-29
 
 * chore(web,android): Consolidate chirality.js test keyboard to `/common/test/resources/keyboards/` (#14989)
diff --git a/VERSION.md b/VERSION.md
index 3005303805..beaf41d53a 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.149
\ No newline at end of file
+19.0.150
\ No newline at end of file

From f29133d0bac5efdf90a70df91c2f1ecea0c86e3f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 12:09:38 +0100
Subject: [PATCH 53/83] maint(resources): set build flags for npm-publish

Test-bot: skip
Build-bot: skip
---
 .github/workflows/npm-publish.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index c554705161..fc94cc688e 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -91,7 +91,16 @@ jobs:
     - name: npm pack/publish
       run: |
         export KEYMAN_TIER=$(cat TIER.md)
+        export GHA_TEST_BUILD="${{ github.event.client_payload.isTestBuild }}"
         export GHA_BRANCH="${{ github.event.client_payload.branch }}"
+        echo "KEYMAN_TIER=$KEYMAN_TIER" >> $GITHUB_ENV
+        echo "GHA_TEST_BUILD=${GHA_TEST_BUILD}" >> $GITHUB_ENV
+        echo "GHA_BRANCH=${GHA_BRANCH}" >> $GITHUB_ENV
+
+        echo "KEYMAN_TIER: $KEYMAN_TIER"
+        echo "GHA_TEST_BUILD: $GHA_TEST_BUILD"
+        echo "GHA_BRANCH: $GHA_BRANCH"
+
         if [[ -f ./resources/build/ci/npm-publish.sh ]]; then
           ./resources/build/ci/npm-publish.sh $NPM_ACTION
         else

From 4077713d499d6ae4230c6d4068d3f9ac071d54b3 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 29 Oct 2025 06:39:41 -0500
Subject: [PATCH 54/83] auto: increment master version to 19.0.151

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 4 ++++
 VERSION.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 42fdc3161c..3274472d47 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 19.0.150 alpha 2025-10-29
+
+* maint(resources): set build flags for npm-publish (#15047)
+
 ## 19.0.149 alpha 2025-10-29
 
 * maint(resources): don't report status check on release builds for npm-publish (#15045)
diff --git a/VERSION.md b/VERSION.md
index beaf41d53a..bdc8e6b12d 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.150
\ No newline at end of file
+19.0.151
\ No newline at end of file

From df212364a2f543c7b63d4f004e34a01277e0a498 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 14:35:31 +0100
Subject: [PATCH 55/83] maint(resources): add repository record for all
 published packages

While not documented as such, it appears that the repository record is
required with trusted publishing of npm packages.

Test-bot: skip
Build-bot: skip
---
 common/web/keyman-version/package.json       | 5 +++++
 common/web/langtags/package.json             | 3 ++-
 common/web/types/package.json                | 3 ++-
 core/include/ldml/package.json               | 3 ++-
 developer/src/common/web/utils/package.json  | 3 ++-
 developer/src/kmc-analyze/package.json       | 3 ++-
 developer/src/kmc-copy/package.json          | 3 ++-
 developer/src/kmc-generate/package.json      | 3 ++-
 developer/src/kmc-keyboard-info/package.json | 3 ++-
 developer/src/kmc-kmn/package.json           | 3 ++-
 developer/src/kmc-ldml/package.json          | 3 ++-
 developer/src/kmc-model-info/package.json    | 3 ++-
 developer/src/kmc-model/package.json         | 3 ++-
 developer/src/kmc-package/package.json       | 3 ++-
 developer/src/kmc/package.json               | 3 ++-
 package.json                                 | 4 ++++
 16 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/common/web/keyman-version/package.json b/common/web/keyman-version/package.json
index 74cce896bd..891edbdb87 100644
--- a/common/web/keyman-version/package.json
+++ b/common/web/keyman-version/package.json
@@ -1,5 +1,10 @@
 {
   "name": "@keymanapp/keyman-version",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "common/web/keyman-version"
+  },
   "description": "Keyman global version data",
   "exports": {
     ".": {
diff --git a/common/web/langtags/package.json b/common/web/langtags/package.json
index f2848f587f..5746955d2d 100644
--- a/common/web/langtags/package.json
+++ b/common/web/langtags/package.json
@@ -33,7 +33,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "common/web/langtags"
   },
   "sideEffects": false
 }
diff --git a/common/web/types/package.json b/common/web/types/package.json
index 7823f0fa87..4c2e2bfd2e 100644
--- a/common/web/types/package.json
+++ b/common/web/types/package.json
@@ -54,7 +54,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "common/web/types"
   },
   "c8": {
     "all": true,
diff --git a/core/include/ldml/package.json b/core/include/ldml/package.json
index ba9acf063e..6cd3da4562 100644
--- a/core/include/ldml/package.json
+++ b/core/include/ldml/package.json
@@ -16,6 +16,7 @@
   "scripts": {},
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "core/include/ldml"
   }
 }
diff --git a/developer/src/common/web/utils/package.json b/developer/src/common/web/utils/package.json
index 089800c92f..3bf769dbad 100644
--- a/developer/src/common/web/utils/package.json
+++ b/developer/src/common/web/utils/package.json
@@ -43,6 +43,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/common/web/utils"
   }
 }
diff --git a/developer/src/kmc-analyze/package.json b/developer/src/kmc-analyze/package.json
index 496e04be05..c7e2ebabe2 100644
--- a/developer/src/kmc-analyze/package.json
+++ b/developer/src/kmc-analyze/package.json
@@ -43,6 +43,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-analyze"
   }
 }
diff --git a/developer/src/kmc-copy/package.json b/developer/src/kmc-copy/package.json
index 130ada5681..1b3f8de371 100644
--- a/developer/src/kmc-copy/package.json
+++ b/developer/src/kmc-copy/package.json
@@ -58,6 +58,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-copy"
   }
 }
diff --git a/developer/src/kmc-generate/package.json b/developer/src/kmc-generate/package.json
index da581a127e..20738b0d2a 100644
--- a/developer/src/kmc-generate/package.json
+++ b/developer/src/kmc-generate/package.json
@@ -59,6 +59,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-generate"
   }
 }
diff --git a/developer/src/kmc-keyboard-info/package.json b/developer/src/kmc-keyboard-info/package.json
index 13af66aae0..5b0c463b3a 100644
--- a/developer/src/kmc-keyboard-info/package.json
+++ b/developer/src/kmc-keyboard-info/package.json
@@ -43,6 +43,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-keyboard-info"
   }
 }
diff --git a/developer/src/kmc-kmn/package.json b/developer/src/kmc-kmn/package.json
index 34e076b5c0..f9c82fb4e9 100644
--- a/developer/src/kmc-kmn/package.json
+++ b/developer/src/kmc-kmn/package.json
@@ -61,6 +61,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-kmn"
   }
 }
diff --git a/developer/src/kmc-ldml/package.json b/developer/src/kmc-ldml/package.json
index ce0a83e18e..9e2a1c6831 100644
--- a/developer/src/kmc-ldml/package.json
+++ b/developer/src/kmc-ldml/package.json
@@ -65,6 +65,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-ldml"
   }
 }
diff --git a/developer/src/kmc-model-info/package.json b/developer/src/kmc-model-info/package.json
index 4c715ccf6f..c747a922c4 100644
--- a/developer/src/kmc-model-info/package.json
+++ b/developer/src/kmc-model-info/package.json
@@ -48,6 +48,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-model-info"
   }
 }
diff --git a/developer/src/kmc-model/package.json b/developer/src/kmc-model/package.json
index 8dff9fef1e..481822e686 100644
--- a/developer/src/kmc-model/package.json
+++ b/developer/src/kmc-model/package.json
@@ -63,6 +63,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-model"
   }
 }
diff --git a/developer/src/kmc-package/package.json b/developer/src/kmc-package/package.json
index 5e2df84fc6..edfba42073 100644
--- a/developer/src/kmc-package/package.json
+++ b/developer/src/kmc-package/package.json
@@ -61,6 +61,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc-package"
   }
 }
diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json
index 91d6cdd53b..069e676ed1 100644
--- a/developer/src/kmc/package.json
+++ b/developer/src/kmc/package.json
@@ -81,6 +81,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
+    "url": "git+https://github.com/keymanapp/keyman.git",
+    "directory": "developer/src/kmc"
   }
 }
diff --git a/package.json b/package.json
index 9ce87b3f12..3257ccfaa4 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,10 @@
       "fast-json-patch": "^3.1.1"
     }
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/keymanapp/keyman.git"
+  },
   "engines": {
     "node": "20.16.0"
   }

From c1e6ad505a0320298701255eb73525db7a5bb400 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 29 Oct 2025 08:47:12 -0500
Subject: [PATCH 56/83] auto: increment master version to 19.0.152

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 4 ++++
 VERSION.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 3274472d47..c44f0d02d6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 19.0.151 alpha 2025-10-29
+
+* maint(resources): add repository record for all published packages (#15049)
+
 ## 19.0.150 alpha 2025-10-29
 
 * maint(resources): set build flags for npm-publish (#15047)
diff --git a/VERSION.md b/VERSION.md
index bdc8e6b12d..3c45e0b3cf 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.151
\ No newline at end of file
+19.0.152
\ No newline at end of file

From 3fc29928daf1aca12b9e9ebfdc8b7004b6ec541d Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Oct 2025 16:56:58 +0100
Subject: [PATCH 57/83] maint(resources): include sourcemaps in npm publish

Build-bot: skip release:developer
Test-bot: skip
---
 resources/build/ci/npm-publish.sh | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/resources/build/ci/npm-publish.sh b/resources/build/ci/npm-publish.sh
index 898c0a40bd..e9b522e2aa 100755
--- a/resources/build/ci/npm-publish.sh
+++ b/resources/build/ci/npm-publish.sh
@@ -49,9 +49,44 @@ function do_package_builds() {
   done
 }
 
+function inject_sourcemaps() {
+  local SOURCEMAP_PATHS
+  SOURCEMAP_PATHS=( "${PACKAGES[@]}" )
+  SOURCEMAP_PATHS=( "${SOURCEMAP_PATHS[@]/%//build}" )
+
+  builder_heading "Injecting sourcemaps"
+
+  pushd "${KEYMAN_ROOT}"
+
+  sentry-cli sourcemaps inject \
+    --org keyman \
+    --project keyman-developer \
+    --release "$KEYMAN_VERSION_GIT_TAG"  \
+    "${SOURCEMAP_PATHS[@]}"
+
+  if [[ "${GHA_TEST_BUILD+x}" == false ]]; then
+    builder_heading "Uploading sourcemaps"
+
+    sentry-cli sourcemaps upload \
+      --no-dedupe \
+      --org keyman \
+      --project keyman-developer \
+      --release "$KEYMAN_VERSION_GIT_TAG"  \
+      --ext js --ext mjs --ext ts --ext map \
+      "${SOURCEMAP_PATHS[@]}"
+  else
+    builder_heading "Skipping upload of sourcemaps (test build)"
+  fi
+
+  popd
+}
+
 function do_pack_or_publish() {
   local npm_action="$1"
   local npm_package_path
+
+  inject_sourcemaps
+
   for npm_package_path in "${PACKAGES[@]}"; do
     builder_heading "npm ${npm_action} ${npm_package_path}"
     ci_publish_npm_package "${npm_action}" "${npm_package_path}"
@@ -68,6 +103,8 @@ function do_publish() {
 }
 
 function install_emscripten() {
+  builder_heading "Installing emscripten"
+
   local EMSDK_TEMP
   EMSDK_TEMP=$(mktemp -d)
   pushd "${EMSDK_TEMP}"
@@ -84,6 +121,8 @@ function install_emscripten() {
 }
 
 function install_meson() {
+  builder_heading "Installing meson"
+
   builder_echo "Starting apt-get update + install meson"
   sudo apt-get update
   sudo apt-get install meson
@@ -91,9 +130,17 @@ function install_meson() {
   meson -v
 }
 
+function install_sentry_cli() {
+  builder_heading "Installing sentry-cli"
+
+  curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION="2.57.0" sh
+  sentry-cli --version
+}
+
 function do_configure() {
   install_meson
   install_emscripten
+  install_sentry_cli
 }
 
 builder_run_action configure do_configure

From 66b5aeb614a70d8dadf49abed3bd9e1958e793dc Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 30 Oct 2025 11:56:07 +0700
Subject: [PATCH 58/83] chore(common): Move test9469 keyboard to
 common/test/keyboards/

---
 .../test/keyboards}/test9469/HISTORY.md             |   0
 .../test/keyboards}/test9469/LICENSE.md             |   0
 .../test/keyboards}/test9469/README.md              |   0
 .../test/keyboards}/test9469/build/test9469.js      |   0
 .../test/keyboards}/test9469/source/readme.htm      |   0
 .../test/keyboards}/test9469/source/test9469.ico    | Bin
 .../test9469/source/test9469.keyman-touch-layout    |   0
 .../test/keyboards}/test9469/source/test9469.kmn    |   0
 .../test/keyboards}/test9469/source/test9469.kps    |   0
 .../test/keyboards}/test9469/source/test9469.kvks   |   0
 .../test/keyboards}/test9469/source/welcome.htm     |   0
 .../test/keyboards}/test9469/test9469.keyboard_info |   0
 .../test/keyboards}/test9469/test9469.kpj           |   0
 13 files changed, 0 insertions(+), 0 deletions(-)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/HISTORY.md (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/LICENSE.md (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/README.md (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/build/test9469.js (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/source/readme.htm (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/source/test9469.ico (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/source/test9469.keyman-touch-layout (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/source/test9469.kmn (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/source/test9469.kps (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/source/test9469.kvks (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/source/welcome.htm (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/test9469.keyboard_info (100%)
 rename {web/src/test/manual/web/issue9469 => common/test/keyboards}/test9469/test9469.kpj (100%)

diff --git a/web/src/test/manual/web/issue9469/test9469/HISTORY.md b/common/test/keyboards/test9469/HISTORY.md
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/HISTORY.md
rename to common/test/keyboards/test9469/HISTORY.md
diff --git a/web/src/test/manual/web/issue9469/test9469/LICENSE.md b/common/test/keyboards/test9469/LICENSE.md
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/LICENSE.md
rename to common/test/keyboards/test9469/LICENSE.md
diff --git a/web/src/test/manual/web/issue9469/test9469/README.md b/common/test/keyboards/test9469/README.md
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/README.md
rename to common/test/keyboards/test9469/README.md
diff --git a/web/src/test/manual/web/issue9469/test9469/build/test9469.js b/common/test/keyboards/test9469/build/test9469.js
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/build/test9469.js
rename to common/test/keyboards/test9469/build/test9469.js
diff --git a/web/src/test/manual/web/issue9469/test9469/source/readme.htm b/common/test/keyboards/test9469/source/readme.htm
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/source/readme.htm
rename to common/test/keyboards/test9469/source/readme.htm
diff --git a/web/src/test/manual/web/issue9469/test9469/source/test9469.ico b/common/test/keyboards/test9469/source/test9469.ico
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/source/test9469.ico
rename to common/test/keyboards/test9469/source/test9469.ico
diff --git a/web/src/test/manual/web/issue9469/test9469/source/test9469.keyman-touch-layout b/common/test/keyboards/test9469/source/test9469.keyman-touch-layout
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/source/test9469.keyman-touch-layout
rename to common/test/keyboards/test9469/source/test9469.keyman-touch-layout
diff --git a/web/src/test/manual/web/issue9469/test9469/source/test9469.kmn b/common/test/keyboards/test9469/source/test9469.kmn
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/source/test9469.kmn
rename to common/test/keyboards/test9469/source/test9469.kmn
diff --git a/web/src/test/manual/web/issue9469/test9469/source/test9469.kps b/common/test/keyboards/test9469/source/test9469.kps
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/source/test9469.kps
rename to common/test/keyboards/test9469/source/test9469.kps
diff --git a/web/src/test/manual/web/issue9469/test9469/source/test9469.kvks b/common/test/keyboards/test9469/source/test9469.kvks
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/source/test9469.kvks
rename to common/test/keyboards/test9469/source/test9469.kvks
diff --git a/web/src/test/manual/web/issue9469/test9469/source/welcome.htm b/common/test/keyboards/test9469/source/welcome.htm
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/source/welcome.htm
rename to common/test/keyboards/test9469/source/welcome.htm
diff --git a/web/src/test/manual/web/issue9469/test9469/test9469.keyboard_info b/common/test/keyboards/test9469/test9469.keyboard_info
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/test9469.keyboard_info
rename to common/test/keyboards/test9469/test9469.keyboard_info
diff --git a/web/src/test/manual/web/issue9469/test9469/test9469.kpj b/common/test/keyboards/test9469/test9469.kpj
similarity index 100%
rename from web/src/test/manual/web/issue9469/test9469/test9469.kpj
rename to common/test/keyboards/test9469/test9469.kpj

From 9a36bd1e676b80e91d9e8361859830e7d19f6123 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 29 Oct 2025 23:59:22 -0500
Subject: [PATCH 59/83] auto: increment master version to 19.0.153

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 4 ++++
 VERSION.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index c44f0d02d6..0c97698f49 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 19.0.152 alpha 2025-10-30
+
+* maint(resources): include sourcemaps in npm publish (#15051)
+
 ## 19.0.151 alpha 2025-10-29
 
 * maint(resources): add repository record for all published packages (#15049)
diff --git a/VERSION.md b/VERSION.md
index 3c45e0b3cf..125305d3ef 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.152
\ No newline at end of file
+19.0.153
\ No newline at end of file

From 3872f57cbff494951daf81b49377884a485cef63 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 30 Oct 2025 12:20:02 +0700
Subject: [PATCH 60/83] fix(common): Update references to test9469 keyboard

---
 .../app/src/main/assets/keyboardharness.kmp   | Bin 218131 -> 220135 bytes
 .../app/src/main/assets/keyboardharness.kps   |  14 ++++++++
 .../app/src/main/assets/test9469.kmp          | Bin 4421 -> 0 bytes
 .../tests/keyboardHarness/MainActivity.java   |  30 +++++++++---------
 .../keyboards/test9469/build/test9469.kmp     | Bin 0 -> 4488 bytes
 .../keyboards/test9469/build/test9469.kmx     | Bin 0 -> 2080 bytes
 .../keyboards/test9469/build/test9469.kvk     | Bin 0 -> 77 bytes
 .../keyboards/test9469/source/test9469.kps    |   1 +
 web/src/test/manual/web/issue9469/index.html  |   3 +-
 9 files changed, 32 insertions(+), 16 deletions(-)
 delete mode 100644 android/Tests/KeyboardHarness/app/src/main/assets/test9469.kmp
 create mode 100644 common/test/keyboards/test9469/build/test9469.kmp
 create mode 100644 common/test/keyboards/test9469/build/test9469.kmx
 create mode 100644 common/test/keyboards/test9469/build/test9469.kvk

diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp
index a9bda34bba11fd3a7b5f576a0d294b9a4d06f7c9..78366a42e5ef4d0e8eca3f55f14a29142804eb72 100644
GIT binary patch
delta 3060
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
K&e$2q+WiZz&2~!w

delta 1037
zcmaF9op<sIUfuw2W)?061_lm>Af}j&yaAldKzefmrz9JQ(fm@Z{iPTq5HoFmDaO3Z
z0wlP7nLl$8dp(d9&2+ZpQ2`?ZLlY~=1O|re+ycF<;{3d`!Kbqh8wl)quHB-yS0s71
zllS^shYbGKX>qe;LaKAMC#ov1WEB46__wz%GQ4l`4bDQvy-$*s+?{*z&ASR)#g<vO
zA~as=Mn2|!FDd?k?^c1Tp~w2>32}Kw-YdM--Y2p;g)XSCcD?8;!1giJW#fjzt0AFc
z#m6q@F~y{1efL<jD(dr|4R$RDMSK=ja+fTzzh5ZP{-pGm&$3HR)6S&MSdd$LxpUH*
z7D1sae^$=$<6fpJVSHp=4g2v2f@S*~f1JBh6B93=dxzOt)<knhTGMT-h#7eW?OT{7
z*+r%%m<8|JlJMrGPJO4BBHv++4QAF8oit{KOC2xU)s-5_y5m><0&zC&{|%4J@9CxQ
zem9Y|^q;O{RMGZWvC6}dlb7@Dt?paiJolZ@>Ulr^$~P4rO!;^8(>&*2N^DMYDSA6J
zZMJ<^@OahiTRyAb@72=JJ+G7F>+btMzwUU7murpu)GfzzSDz``^Weay`X@<dx8+;>
z=N%N8ld67JA0;BApRH1D^ae&uGZO;?J2YZ4^U|hHJnILHmzMVvKk)_X#jHBPso-a~
z;Gahzw~JN*r;N{L-#b>XPux@b<grIJ?@|lb*F#@#e|&Ss>im&3eXok|d&3RFvYwO+
ze%||2ygrAIW#+}Df~Md1*7zQ}!2IB#r?KPI<Y4Be2J4@-fqNFXcss4MoRryb;9t0U
z?ytZr2M*hAk&l|ONQmv=tpcI8bB^X~C#JgE{PBx8)Kt2QD@esa<3y|As_VQr4_PGH
zo)iyiEPdD0-j}15*)r*hn|1ozX~$*rrYu-%X4<$kanhH1{t`yc<U*G%Z$Ff_Pd&ED
zQ1AYNeJ?-k%Twyy`=Lz5di6%<pPxedcuUhiaC(`WDzIKwjQ;Q@iKY44_e+xU#sABC
z`oG6>>hQmdmtdcBW@E^uu=MIjiT-6;6(#R@&P)G4Z!BqZT$&|3f9`XRe-d_Ur*ron
zIiLTs+Bh?|<J+MpMS>0T0p5&EA`I}{Gd(bh*&LKXrguj%TY(vj(ah3J`TW!6qM4<@
z0@gr*dL0jDhMfGo^n#+);$mQaK{E#<R{`S>3Kse^!}A!rF7zme>0w|n4}|CfCV&8M
URyHA!3>y%J0TambAZ8#B0EI!ClK=n!

diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
index 73a8e740ac..f18aac7a8e 100644
--- a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
+++ b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
@@ -31,6 +31,12 @@
       <CopyLocation>0</CopyLocation>
       <FileType>.js</FileType>
     </File>
+    <File>
+      <Name>../../../../../../../common/test/keyboards/test9469/build/test9469.js</Name>
+      <Description>File test9469.js</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.js</FileType>
+    </File>
     <File>
       <Name>code2001.ttf</Name>
       <Description>Font Code2001</Description>
@@ -61,6 +67,14 @@
         <Language ID="en">English</Language>
       </Languages>
     </Keyboard>
+    <Keyboard>
+      <Name>Test9469</Name>
+      <ID>test9469</ID>
+      <Version>1.0</Version>
+      <Languages>
+        <Language ID="en">English</Language>
+      </Languages>
+    </Keyboard>
     <Keyboard>
       <Name>longpress '"\|5% +</Name>
       <ID>longpress</ID>
diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/test9469.kmp b/android/Tests/KeyboardHarness/app/src/main/assets/test9469.kmp
deleted file mode 100644
index 8390d5dee317ad8a78b8ee4d33805019846f9907..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4421
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

diff --git a/android/Tests/KeyboardHarness/app/src/main/java/com/keyman/android/tests/keyboardHarness/MainActivity.java b/android/Tests/KeyboardHarness/app/src/main/java/com/keyman/android/tests/keyboardHarness/MainActivity.java
index 7b73341786..becec2868a 100644
--- a/android/Tests/KeyboardHarness/app/src/main/java/com/keyman/android/tests/keyboardHarness/MainActivity.java
+++ b/android/Tests/KeyboardHarness/app/src/main/java/com/keyman/android/tests/keyboardHarness/MainActivity.java
@@ -89,6 +89,21 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
       KMManager.KMDefault_KeyboardFont);
     KMManager.addKeyboard(this, platformtestKBbInfo);
 
+    // Issue #9469 Verify special characters in keyamnweb-osk.ttf keyboard
+    Keyboard specialKBInfo = new Keyboard(
+      "keyboardharness",
+      "test9469",
+      "test9469 Keyboard",
+      "en",
+      "English",
+      "1.0",
+      "",
+      "",
+      true,
+      KMManager.KMDefault_KeyboardFont,
+      KMManager.KMDefault_KeyboardFont);
+    KMManager.addKeyboard(this, specialKBInfo);
+
     // Final K_ENTER test keyboard
     Keyboard finalKBInfo = new Keyboard(
       "final",
@@ -103,21 +118,6 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
       KMManager.KMDefault_KeyboardFont,
       KMManager.KMDefault_KeyboardFont);
     KMManager.addKeyboard(this, finalKBInfo);
-
-    // Issue #9469 Verify special characters in keyamnweb-osk.ttf keyboard
-    Keyboard specialKBInfo = new Keyboard(
-      "test9469",
-      "test9469",
-      "test9469 Keyboard",
-      "en",
-      "English",
-      "1.0",
-      "",
-      "",
-      true,
-      KMManager.KMDefault_KeyboardFont,
-      KMManager.KMDefault_KeyboardFont);
-    KMManager.addKeyboard(this, specialKBInfo);
   }
 
   @Override
diff --git a/common/test/keyboards/test9469/build/test9469.kmp b/common/test/keyboards/test9469/build/test9469.kmp
new file mode 100644
index 0000000000000000000000000000000000000000..00a111e260087a2a41556bd7a3301e58e464ad35
GIT binary patch
literal 4488
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
F{sV}K^HTr-

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/test9469/build/test9469.kmx b/common/test/keyboards/test9469/build/test9469.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..717a37dad3276e6e02d514a28abc1504b2354ffb
GIT binary patch
literal 2080
zcmd^<KWmdw6vm%aQ4x_0{u_gebZN0wgn&arx}=o~Heg}}No!+EYu=JH)+{bX=;$C)
zf`YgyMbJfYDjoa;PJV(;euV1p+}y<XeSJHaO}y#3_c_n`ch9-Johp}RbX?m1^!>9~
zDce{l5yLs;`XT8j3)o+8;GP_oPJ3pL^Nh!n1fKPH8hp&-yWpc9*T6#_KL%g)_#OC?
z#~;D`x%CBb&f{<33m*RfAMtpYgr_{-1E2SJA6!sF3#w|3{k}3<*AjRUGzHVvLu_@l
z3A9JZiUO^2HsDNes7XZNe8!a3s4gR8x~gjq3tf?1!fHOoTh%6e*7;{)-ja75+qkZP
zW>nM-&La8Ex4~(5?N+RE8_Q<(<nGx{$T^DlJU9Ha+NhT4Vfg^d@9sya7^p>-MU7Ci
z%3MreBeLW>$Q<aCp@QX_Bc@6RHf76a^IM|(7VHYYHp~+JHQjvY@##g*<FN{#;jFuO
zdxg3lz}o9Iovp=Qg<HTcP^}-`eZh73Ic^`|wamoU_|>?7@|%@(Pj_@%)0!ktSS#u#
zuM*|*_)X{*mLg|&mG};N%V5eBw{hmAXOPd4RET?l-a&>!+)MP=$cYSbk=@dzlukQ?
z7WwAvI~zvQh_NZR1F*%{&hA(J@3O@V^7)2x`9egtpU%o`Wo$d|H~Vv{cZ@6axg?+7
zOyjm~t5w+?INoa4gF@s^@fy9_c7|<MyG-pZdI|SrK1u!WbQ+O(tGz|-aL#y*aP7FQ
z9K3Qf8zg?C!@Yx9_XdN+mn+2jH%y98>c98?X4|On-n$<X>&JWkm-P7mgTK{(0sGo_
A*Z=?k

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/test9469/build/test9469.kvk b/common/test/keyboards/test9469/build/test9469.kvk
new file mode 100644
index 0000000000000000000000000000000000000000..1f708b42b7f9ff91b6a249c4653a65cefa769542
GIT binary patch
literal 77
zcmeYc^LArkV_;z5WGG=sWhe%cmJB8gW<ZhwDDKEm#E{95$dCi%efj_YKL-QDf9#?_
G1q=W^zY(ke

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/test9469/source/test9469.kps b/common/test/keyboards/test9469/source/test9469.kps
index 607e31751f..64c5231819 100644
--- a/common/test/keyboards/test9469/source/test9469.kps
+++ b/common/test/keyboards/test9469/source/test9469.kps
@@ -20,6 +20,7 @@
     <Copyright URL="">© 2023 SIL International</Copyright>
     <Author URL="">SIL International</Author>
     <Version URL=""></Version>
+    <Description URL="">Test keyboard for displaying special characters rendered with keymanweb-osk.ttf</Description>
   </Info>
   <Files>
     <File>
diff --git a/web/src/test/manual/web/issue9469/index.html b/web/src/test/manual/web/issue9469/index.html
index 5db68244a2..a170b7e051 100644
--- a/web/src/test/manual/web/issue9469/index.html
+++ b/web/src/test/manual/web/issue9469/index.html
@@ -40,7 +40,8 @@
       kmw.init({
 		    attachType:'auto'
       }).then(function() {
-        kmw.addKeyboards({id:'test9469',name:'test9469',languages:{id:'en',name:'English'}, filename:'test9469/build/test9469.js'});
+        kmw.addKeyboards({id:'test9469',name:'test9469',languages:{id:'en',name:'English'}, 
+          filename:'../../../../../../common/test/keyboards/test9469/build/test9469.js'});
 
         var pageRef = (window.location.protocol == 'file:')
           ? window.location.href.substr(0, window.location.href.lastIndexOf('/')+1)

From b566bcfaf4adf75a0163388b43f7af40789f1d90 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 30 Oct 2025 15:39:19 +0700
Subject: [PATCH 61/83] fix(common): Set test9469 to Keyman 14 for build
 warnings

---
 common/test/keyboards/test9469/source/test9469.kmn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/test/keyboards/test9469/source/test9469.kmn b/common/test/keyboards/test9469/source/test9469.kmn
index d0f84c749a..cd90a48d70 100644
--- a/common/test/keyboards/test9469/source/test9469.kmn
+++ b/common/test/keyboards/test9469/source/test9469.kmn
@@ -1,6 +1,6 @@
 c test9469 generated from template at 2023-08-17 19:34:17
 c with name "test9469"
-store(&VERSION) '10.0'
+store(&VERSION) '14.0'
 store(&NAME) 'test9469'
 store(&COPYRIGHT) '© 2023 SIL International'
 store(&KEYBOARDVERSION) '1.1'

From 2ba22bbe51c4e6ab7281892f3cad09acff5cd0a8 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 30 Oct 2025 13:22:27 +0100
Subject: [PATCH 62/83] chore(developer): further debugging for assertion
 failure

Adds breadcrumbs for debug memo to try and narrow down sequence of
events leading to assertion failure with backspace.

Relates-to: #11706
Test-bot: skip
---
 .../KeymanDeveloperDebuggerMemo.pas           | 10 +++++++
 developer/src/tike/child/UfrmDebug.pas        | 28 +++++++++++++-----
 .../debug/Keyman.System.Debug.DebugEvent.pas  | 29 +++++++++++++++++++
 3 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas b/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
index c6a703581b..54e2c87ee8 100644
--- a/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
+++ b/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
@@ -36,6 +36,7 @@ type
   TMemoSelection = record
     Start, Finish: Integer;
     Anchor: Integer;
+    function ToString: string;
   end;
 
   TKeymanDeveloperDebuggerMemo = class(TRichEdit41)
@@ -107,6 +108,8 @@ end;
 
 function TKeymanDeveloperDebuggerMemo.GetSelection: TMemoSelection;
 begin
+  Result.Anchor := 0;
+
   // EM_GETSEL doesn't tell us the anchor position, but we can figure
   // it out with this kludge. I am not aware of side effects from this
   // at this time.
@@ -170,4 +173,11 @@ begin
   RegisterComponents('Keyman', [TKeymanDeveloperDebuggerMemo]);
 end;
 
+{ TMemoSelection }
+
+function TMemoSelection.ToString: string;
+begin
+  Result := Format('%d %d %d', [Start, Finish, Anchor]);
+end;
+
 end.
diff --git a/developer/src/tike/child/UfrmDebug.pas b/developer/src/tike/child/UfrmDebug.pas
index 15a5b858b7..6137cab712 100644
--- a/developer/src/tike/child/UfrmDebug.pas
+++ b/developer/src/tike/child/UfrmDebug.pas
@@ -109,7 +109,7 @@ type
 
     procedure ResetEvents;
     procedure ExecuteEvent(n: Integer);
-    procedure ExecuteEventAction(n: Integer);
+    procedure ExecuteEventAction(EventNumber: Integer);
     procedure ExecuteEventRule(n: Integer);
     procedure SetExecutionPointLine(ALine: Integer);
     procedure SetUIStatus(const Value: TDebugUIStatus);
@@ -210,6 +210,7 @@ uses
   dmActionsMain,
   Glossary,
   Keyman.Developer.System.Project.ProjectLog,
+  Keyman.System.KeymanSentryClient,
   Keyman.UI.Debug.CharacterGridRenderer,
   KeyNames,
   kmxfile,
@@ -462,6 +463,10 @@ begin
     modifier := modifier and not KM_CORE_MODIFIER_LCTRL;
   end;
 
+  TKeymanSentryClient.Instance.Breadcrumb('default',
+    Format('ProcessKeyEvent: vk=%x mod=%x scan=%x beforeText="%s" beforeSelection=%s',[vkey, modifier, scan, Copy(memo.GetTextCR, 1, 256), memo.Selection.ToString]),
+    'debugger');
+
   if not SetKeyEventContext then
     Exit(False);
 
@@ -598,8 +603,14 @@ end;
 
 procedure TfrmDebug.ExecuteEvent(n: Integer);
 begin
+  TKeymanSentryClient.Instance.Breadcrumb('default',
+    Format('ExecuteEvent(%d/%d): [%s]; b:%s; s:%s',
+      [n, FEvents.Count, FEvents[n].ToString, memo.Selection.ToString, FSavedSelection.ToString]),
+      'debugger');
+
   memo.ReadOnly := False;
   memo.Selection := FSavedSelection;
+
   if FEvents[n].EventType = etAction
     then ExecuteEventAction(n)
     else ExecuteEventRule(n);
@@ -667,7 +678,7 @@ begin
 end;
 
 
-procedure TfrmDebug.ExecuteEventAction(n: Integer);
+procedure TfrmDebug.ExecuteEventAction(EventNumber: Integer);
   type
     TMemoSelectionState = record
       Selection: TMemoSelection;
@@ -711,24 +722,25 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
   procedure DoBackspace(BackspaceType: km_core_backspace_type; ExpectedValue: NativeUInt);
   var
     t: string;
-    m, n: Integer;
+    m, m1: Integer;
     dk: TDeadKeyInfo;
     state: TMemoSelectionState;
 
     function AssertionMessage: string;
     begin
       Result := 'Assertion failed. Extra data: '+
+      'EventNumber='+IntToStr(EventNumber)+'; '+
       'BackspaceType='+IntToStr(Ord(BackspaceType))+'; '+
       'ExpectedValue=U+'+IntToHex(ExpectedValue, 4)+'; '+
       'memo.SelStart='+IntToStr(memo.SelStart)+'; '+
       'memo.SelLength='+IntToStr(memo.SelLength)+'; '+
-      'memo.Text='+Copy(memo.GetTextCR, 1, 256);
+      'memo.Text="'+Copy(memo.GetTextCR, 1, 256)+'"';
     end;
   begin
     // Offset is zero-based, but string is 1-based. Beware!
     state := SaveMemoSelectionState;
-    n := memo.SelStart;
-    m := n;
+    m1 := memo.SelStart;
+    m := m1;
 
     if memo.SelLength > 0 then
     begin
@@ -800,7 +812,7 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
 
     memo.Lines.BeginUpdate;
     try
-      memo.Text := Copy(t, 1, m) + Copy(t, n+1, MaxInt);
+      memo.Text := Copy(t, 1, m) + Copy(t, m1+1, MaxInt);
       memo.SelStart := m;
     finally
       memo.Lines.EndUpdate;
@@ -894,7 +906,7 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
 begin
   DisableUI;
   frmDebugStatus.Elements.UpdateStores(nil);
-  with FEvents[n].Action do
+  with FEvents[EventNumber].Action do
   begin
     case ActionType of
       KM_CORE_IT_EMIT_KEYSTROKE: DoEmitKeystroke(dwData);
diff --git a/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas b/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas
index 426a556b56..8b9875f7b0 100644
--- a/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas
+++ b/developer/src/tike/debug/Keyman.System.Debug.DebugEvent.pas
@@ -62,6 +62,7 @@ type
   public
     constructor Create;
     destructor Destroy; override;
+    function ToString: string; override;
     property Action: TDebugEventActionData read FAction;
     property Rule: TDebugEventRuleData read FRule;
     property EventType: TDebugEventType read FEventType write SetEventType;
@@ -94,6 +95,8 @@ type
       vk: uint16_t;
       modifier_state: uint16_t
     ): Boolean; overload;
+
+    function ToString: string; override;
   end;
 
 implementation
@@ -134,6 +137,23 @@ begin
   end;
 end;
 
+function TDebugEvent.ToString: string;
+begin
+  // Debug string
+  if FEventType = etAction then
+  begin
+    Result := Format('A %d %d %d "%s"', [Ord(FAction.ActionType), FAction.dwData, FAction.nExpectedValue, FAction.Text]);
+  end
+  else if FEventType = etRuleMatch then
+  begin
+    Result := Format('R %d %x %x %d "%s"', [FRule.ItemType, FRule.Key.VirtualKey, FRule.Key.Modifiers, FRule.Line, FRule.Context]);
+  end
+  else
+  begin
+    Result := '?'+IntToStr(Ord(FEventType));
+  end;
+end;
+
 function TDebugEventList.AddActionItem(key: Word; action: pkm_core_action_item): Boolean;
 begin
   Result := True;
@@ -330,6 +350,15 @@ begin
   end;
 end;
 
+function TDebugEventList.ToString: string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to Count - 1 do
+    Result := Result + '['+IntToStr(I)+': '+Items[I].ToString + '] ';
+end;
+
 function TDebugEventList.AddStateItems(
   state: pkm_core_state;
   vk: uint16_t;

From 037e199f3c9ef2f5a96d91331a8220ff5905ff87 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 30 Oct 2025 15:01:37 +0100
Subject: [PATCH 63/83] chore(developer): add breadcrumbs to trace sporadic
 crashes on exit

Relates-to: #11916
Test-bot: skip
---
 .../Keyman.Developer.System.HttpServer.AppSource.pas | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/developer/src/tike/http/Keyman.Developer.System.HttpServer.AppSource.pas b/developer/src/tike/http/Keyman.Developer.System.HttpServer.AppSource.pas
index 2260b8a183..904d389a08 100644
--- a/developer/src/tike/http/Keyman.Developer.System.HttpServer.AppSource.pas
+++ b/developer/src/tike/http/Keyman.Developer.System.HttpServer.AppSource.pas
@@ -56,6 +56,7 @@ uses
   Xml.XMLDoc,
   Xml.XMLIntf,
 
+  Keyman.System.KeymanSentryClient,
   RedistFiles;
 
 { TAppSourceHttpResponder }
@@ -145,6 +146,7 @@ begin
   begin
     AResponseInfo.ContentType := 'application/json';
     AResponseInfo.Charset := 'UTF-8';
+    TKeymanSentryClient.Breadcrumb('default', Format('RespondTouchEditorState: Filename=%s[#state]', [AFilename]), 'AppSourceHttpResponder');
     if TryGetSource(AFilename + '#state', FData)
       then AResponseInfo.ContentText := FData
       else AResponseInfo.ContentText := '{}';
@@ -167,6 +169,7 @@ var
   FData: string;
 begin
   // TODO: data will be passed separate call from touch editor later
+  TKeymanSentryClient.Breadcrumb('default', Format('RespondTouchEditor: Filename=%s', [AFilename]), 'AppSourceHttpResponder');
   if not TryGetSource(AFilename, FData) then
   begin
     Respond404(AContext, ARequestInfo, AResponseInfo);
@@ -216,6 +219,8 @@ var
 begin
   T := FSources.LockList;
   try
+    TKeymanSentryClient.Breadcrumb('default', Format('TrySetSource: Filename=%s count=%d', [Filename, T.Count]), 'AppSourceHttpResponder');
+
     for i := 0 to T.Count - 1 do
       if T[i].Filename = Filename then
       begin
@@ -236,6 +241,7 @@ procedure TAppSourceHttpResponder.RespondGet(const AFilename: string;
 var
   FData: string;
 begin
+  TKeymanSentryClient.Breadcrumb('default', Format('RespondGet: Filename=%s', [AFilename]), 'AppSourceHttpResponder');
   if TryGetSource(AFilename, FData) then
   begin
     AResponseInfo.ContentType := 'application/json';
@@ -267,6 +273,7 @@ var
 begin
   T := FSources.LockList;
   try
+    TKeymanSentryClient.Breadcrumb('default', Format('TryGetSource: Filename=%s count=%d', [Filename, T.Count]), 'AppSourceHttpResponder');
     for i := 0 to T.Count - 1 do
       if T[i].Filename = Filename then
       begin
@@ -281,6 +288,7 @@ end;
 
 function TAppSourceHttpResponder.GetSource(const Filename: string): string;
 begin
+  TKeymanSentryClient.Breadcrumb('default', Format('GetSource: Filename=%s', [Filename]), 'AppSourceHttpResponder');
   Assert(TryGetSource(Filename, Result),
     'TAppSourceHttpResponder.GetSource was asked for a file that was not registered: '+Filename);
 end;
@@ -289,6 +297,7 @@ function TAppSourceHttpResponder.IsSourceRegistered(const Filename: string): Boo
 var
   Data: string;
 begin
+  TKeymanSentryClient.Breadcrumb('default', Format('IsSourceRegistered: Filename=%s', [Filename]), 'AppSourceHttpResponder');
   Result := TryGetSource(Filename, Data);
 end;
 
@@ -300,6 +309,8 @@ var
 begin
   T := FSources.LockList;
   try
+    TKeymanSentryClient.Breadcrumb('default', Format('RegisterSource: Filename=%s Update=%s count=%d', [Filename, BoolToStr(Update,True), T.Count]), 'AppSourceHttpResponder');
+
     S.Filename := Filename;
     S.Data := Data;
 
@@ -326,6 +337,7 @@ var
 begin
   T := FSources.LockList;
   try
+    TKeymanSentryClient.Breadcrumb('default', Format('UnregisterSource: Filename=%s count=%d', [Filename, T.Count]), 'AppSourceHttpResponder');
     for i := 0 to T.Count - 1 do
       if T[i].Filename = Filename then
       begin

From 0b17c632a0ffaccc30603b3c8561a4558eac7d68 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 30 Oct 2025 15:22:47 +0100
Subject: [PATCH 64/83] fix(developer): handle exceptions loading
 .keyman-touch-layout files

If file is unreadable or contains invalid encoding, show a message
instead of crashing.

Build-bot: skip
Test-bot: skip
---
 .../src/tike/oskbuilder/UframeTouchLayoutBuilder.pas | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/developer/src/tike/oskbuilder/UframeTouchLayoutBuilder.pas b/developer/src/tike/oskbuilder/UframeTouchLayoutBuilder.pas
index 1bc2c5c8de..2ff812b350 100644
--- a/developer/src/tike/oskbuilder/UframeTouchLayoutBuilder.pas
+++ b/developer/src/tike/oskbuilder/UframeTouchLayoutBuilder.pas
@@ -355,8 +355,16 @@ begin
 
     with TStringList.Create do
     try
-      LoadFromFile(FBaseFileName, TEncoding.UTF8);
-      FNewLayoutJS := Text;
+      try
+        LoadFromFile(FBaseFileName, TEncoding.UTF8);
+        FNewLayoutJS := Text;
+      except
+        on E:Exception do
+        begin
+          ShowMessage(E.Message);
+          Exit(False);
+        end;
+      end;
     finally
       Free;
     end;

From 8e6ca011753b3a671a3aac78400600511cc8eb69 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 30 Oct 2025 15:24:15 +0100
Subject: [PATCH 65/83] chore(developer): fix always-false nullish coalescing

Test-bot: skip
Build-bot: skip
---
 developer/src/kmc-package/src/compiler/kmp-inf-writer.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/developer/src/kmc-package/src/compiler/kmp-inf-writer.ts b/developer/src/kmc-package/src/compiler/kmp-inf-writer.ts
index d7b6f8bab6..2c71035ae8 100644
--- a/developer/src/kmc-package/src/compiler/kmp-inf-writer.ts
+++ b/developer/src/kmc-package/src/compiler/kmp-inf-writer.ts
@@ -138,7 +138,7 @@ export class KmpInfWriter {
 
   private saveKeyboards() {
     // keyboards
-    for(let i = 0; i < this.data.keyboards?.length ?? 0; i++) {
+    for(let i = 0; i < (this.data.keyboards?.length ?? 0); i++) {
       const keyboard = this.data.keyboards[i];
       this.addSection('Keyboard'+i.toString());
       this.addString('Name', keyboard.name);
@@ -154,7 +154,7 @@ export class KmpInfWriter {
         this.addString('DisplayFont', keyboard.displayFont);
       }
 
-      for(let j = 0; j < keyboard.languages?.length ?? 0; j++) {
+      for(let j = 0; j < (keyboard.languages?.length ?? 0); j++) {
         const language = keyboard.languages[j];
         this.addString('Language'+j.toString(), language.id+','+language.name);
       }

From 9e1fe8e6ded2b38642cf6c60209c812ffa7f8d92 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 30 Oct 2025 16:31:45 +0100
Subject: [PATCH 66/83] chore(windows): upgrade VC++ projects to v143 (VS2022)

Test-bot: skip
Build-bot: skip release:developer,windows
---
 .../delphi/ext/tds2dbg/tds2dbg.vcxproj        | 236 ++---
 developer/src/kmanalyze/kmanalyze.vcxproj     | 418 ++++----
 developer/src/kmdecomp/kmdecomp.vcxproj       | 340 +++----
 .../src/samples/imsample/imsample.vcxproj     | 530 +++++-----
 .../src/engine/keyman32/keyman-engine.vcxproj | 802 +++++++--------
 windows/src/engine/keyman32/keyman32.vcxproj  | 930 +++++++++---------
 .../engine/keyman32/keyman32.vcxproj.filters  | 534 +++++-----
 .../keyman-engine-tests.vcxproj               | 320 +++---
 .../src/engine/keymanx64/keymanx64.vcxproj    | 304 +++---
 .../src/engine/kmrefresh/kmrefresh.vcxproj    | 312 +++---
 windows/src/engine/kmtip/kmtip.vcxproj        | 862 ++++++++--------
 windows/src/engine/mcompile/mcompile.vcxproj  | 266 ++---
 windows/src/engine/testhost/testhost.vcxproj  | 342 +++----
 windows/src/support/etl2log/etl2log.vcxproj   | 362 +++----
 windows/src/support/texteditor/Editor.vcxproj | 348 +++----
 .../shared-data/cpp/cppshareddata.vcxproj     | 350 +++----
 16 files changed, 3631 insertions(+), 3625 deletions(-)

diff --git a/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj b/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj
index 8d57ae5c66..5183081136 100644
--- a/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj
+++ b/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{40BFECE3-7FC0-4649-A3DC-E017FF84C75B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="fileutils.cpp" />
-    <ClCompile Include="log.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="tds2dbg.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="fileutils.h" />
-    <ClInclude Include="log.h" />
-    <ClInclude Include="tds2dbg.h" />
-    <ClInclude Include="tdscvstructs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="tds2dbg.bin" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{40BFECE3-7FC0-4649-A3DC-E017FF84C75B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="fileutils.cpp" />
+    <ClCompile Include="log.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="tds2dbg.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="fileutils.h" />
+    <ClInclude Include="log.h" />
+    <ClInclude Include="tds2dbg.h" />
+    <ClInclude Include="tdscvstructs.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="tds2dbg.bin" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/developer/src/kmanalyze/kmanalyze.vcxproj b/developer/src/kmanalyze/kmanalyze.vcxproj
index 20fd857a35..da59aaf833 100644
--- a/developer/src/kmanalyze/kmanalyze.vcxproj
+++ b/developer/src/kmanalyze/kmanalyze.vcxproj
@@ -1,210 +1,210 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{4EAE6DFD-E18A-493D-A00F-4846A2593F56}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>kmanalyze</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\vkeys.cpp" />
-    <ClCompile Include="kmanalyze.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{4EAE6DFD-E18A-493D-A00F-4846A2593F56}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>kmanalyze</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\vkeys.cpp" />
+    <ClCompile Include="kmanalyze.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/developer/src/kmdecomp/kmdecomp.vcxproj b/developer/src/kmdecomp/kmdecomp.vcxproj
index 223ae72199..36cea5f3ff 100644
--- a/developer/src/kmdecomp/kmdecomp.vcxproj
+++ b/developer/src/kmdecomp/kmdecomp.vcxproj
@@ -1,171 +1,171 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{963D608A-6689-469C-AE42-F56696DD42CC}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IncludePath>$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Debug/kmdecomp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/kmdecomp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Release/kmdecomp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/kmdecomp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\common\windows\cpp\src\vkeys.cpp" />
-    <ClCompile Include="kmdecomp.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="savekeyboard.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\common\windows\cpp\include\vkeys.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{963D608A-6689-469C-AE42-F56696DD42CC}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/kmdecomp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/kmdecomp.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/kmdecomp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/kmdecomp.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\windows\cpp\src\vkeys.cpp" />
+    <ClCompile Include="kmdecomp.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="savekeyboard.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\common\windows\cpp\include\vkeys.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/developer/src/samples/imsample/imsample.vcxproj b/developer/src/samples/imsample/imsample.vcxproj
index 9abee9aeff..93413dbe8f 100644
--- a/developer/src/samples/imsample/imsample.vcxproj
+++ b/developer/src/samples/imsample/imsample.vcxproj
@@ -1,266 +1,266 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <SccProjectName />
-    <SccLocalPath />
-    <ProjectGuid>{0C9DB8F9-B788-8782-A97D-4F8294AA0B4E}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>imsample</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>$(ProjectName).x64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>$(ProjectName).x64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <MinimalRebuild>true</MinimalRebuild>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <ImportLibrary>.\IMSample.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="imlib.cpp" />
-    <ClCompile Include="imsample.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="imlib.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="imsample.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <SccProjectName />
+    <SccLocalPath />
+    <ProjectGuid>{0C9DB8F9-B788-8782-A97D-4F8294AA0B4E}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>imsample</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(ProjectName).x64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(ProjectName).x64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <MinimalRebuild>true</MinimalRebuild>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <ImportLibrary>.\IMSample.lib</ImportLibrary>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="imlib.cpp" />
+    <ClCompile Include="imsample.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="imlib.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="imsample.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/keyman-engine.vcxproj b/windows/src/engine/keyman32/keyman-engine.vcxproj
index f958f9a797..e268b10e22 100644
--- a/windows/src/engine/keyman32/keyman-engine.vcxproj
+++ b/windows/src/engine/keyman32/keyman-engine.vcxproj
@@ -1,402 +1,402 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A7069186-5AE7-4504-8926-861B7A34BA9E}</ProjectGuid>
-    <RootNamespace>Keyman32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>./</AssemblerListingLocation>
-      <ObjectFileName>./</ObjectFileName>
-      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>keymancore.lib;libicuuc.a;libicuin.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>./Keyman32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>./Keyman32.map</MapFileName>
-      <MapExports>false</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>0x1c100000</BaseAddress>
-      <ImportLibrary>./Keyman32.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>./</AssemblerListingLocation>
-      <ObjectFileName>./</ObjectFileName>
-      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>keymancore.lib;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>./Keyman32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>./Keyman32.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <BaseAddress>0x1C100000</BaseAddress>
-      <ImportLibrary>./Keyman32.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="appcontext.cpp" />
-    <ClCompile Include="appint\aiTIP.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="appint\aiWin2000Unicode.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="appint\appint.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="calldll.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="capsstate.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="CoreEnvironment.cpp" />
-    <ClCompile Include="DebugEventTrace.cpp" />
-    <ClCompile Include="glossary.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="hookutils.cpp" />
-    <ClCompile Include="hotkeys.cpp" />
-    <ClCompile Include="K32_DBG.CPP">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="k32_globals.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="K32_LOAD.CPP">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
-    <ClCompile Include="k32_tsf.cpp" />
-    <ClCompile Include="keybd_shift.cpp" />
-    <ClCompile Include="keyboardoptions.cpp" />
-    <ClCompile Include="KEYMAN32.CPP">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="keystate.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmhook_callwndproc.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmhook_getmessage.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmhook_keyboard.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmprocess.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmprocessactions.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="preservedkeymap.cpp" />
-    <ClCompile Include="security.cpp" />
-    <ClCompile Include="selectkeyboard.cpp" />
-    <ClCompile Include="serialkeyeventclient.cpp" />
-    <ClCompile Include="serialkeyeventserver.cpp" />
-    <ClCompile Include="SharedBuffers.cpp" />
-    <ClCompile Include="syskbd.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="syskbdnt.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="syskbdnt64.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="versioninfo.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="VKScanCodes.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="keyman-debug-etw.man">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <SubType>Designer</SubType>
-    </CustomBuild>
-    <None Include="KEYMAN32.DEF" />
-    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
-    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="keyman-debug-etw.rc" />
-    <ResourceCompile Include="KEYMAN32.RC">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appcontext.h" />
-    <ClInclude Include="keymanengine.h" />
-    <ClInclude Include="addins.h" />
-    <ClInclude Include="appint\aiTIP.h" />
-    <ClInclude Include="appint\aiWin2000Unicode.h" />
-    <ClInclude Include="appint\appint.h" />
-    <ClInclude Include="calldll.h" />
-    <ClInclude Include="capsstate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
-    <ClInclude Include="globals.h" />
-    <ClInclude Include="kmprocessactions.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="hotkeys.h" />
-    <ClInclude Include="k32_tsf.h" />
-    <ClInclude Include="KBD.H" />
-    <ClInclude Include="keyboardoptions.h" />
-    <ClInclude Include="keyman64.h" />
-    <ClInclude Include="keymancontrol.h" />
-    <ClInclude Include="keyman-debug-etw.h" />
-    <ClInclude Include="keyeventsenderthread.h" />
-    <ClInclude Include="keystate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
-    <ClInclude Include="security.h" />
-    <ClInclude Include="serialkeyeventclient.h" />
-    <ClInclude Include="serialkeyeventcommon.h" />
-    <ClInclude Include="serialkeyeventserver.h" />
-    <ClInclude Include="SharedBuffers.h" />
-    <ClInclude Include="syskbd.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
-    <ClInclude Include="vkscancodes.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A7069186-5AE7-4504-8926-861B7A34BA9E}</ProjectGuid>
+    <RootNamespace>Keyman32</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>./</AssemblerListingLocation>
+      <ObjectFileName>./</ObjectFileName>
+      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>keymancore.lib;libicuuc.a;libicuin.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>./Keyman32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>./Keyman32.map</MapFileName>
+      <MapExports>false</MapExports>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x1c100000</BaseAddress>
+      <ImportLibrary>./Keyman32.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>./</AssemblerListingLocation>
+      <ObjectFileName>./</ObjectFileName>
+      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>keymancore.lib;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>./Keyman32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>./Keyman32.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x1C100000</BaseAddress>
+      <ImportLibrary>./Keyman32.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="appcontext.cpp" />
+    <ClCompile Include="appint\aiTIP.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="appint\aiWin2000Unicode.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="appint\appint.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="calldll.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="capsstate.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="CoreEnvironment.cpp" />
+    <ClCompile Include="DebugEventTrace.cpp" />
+    <ClCompile Include="glossary.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="hookutils.cpp" />
+    <ClCompile Include="hotkeys.cpp" />
+    <ClCompile Include="K32_DBG.CPP">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="k32_globals.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="K32_LOAD.CPP">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
+    <ClCompile Include="k32_tsf.cpp" />
+    <ClCompile Include="keybd_shift.cpp" />
+    <ClCompile Include="keyboardoptions.cpp" />
+    <ClCompile Include="KEYMAN32.CPP">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="keystate.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmhook_callwndproc.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmhook_getmessage.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmhook_keyboard.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmprocess.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmprocessactions.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="preservedkeymap.cpp" />
+    <ClCompile Include="security.cpp" />
+    <ClCompile Include="selectkeyboard.cpp" />
+    <ClCompile Include="serialkeyeventclient.cpp" />
+    <ClCompile Include="serialkeyeventserver.cpp" />
+    <ClCompile Include="SharedBuffers.cpp" />
+    <ClCompile Include="syskbd.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="syskbdnt.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="syskbdnt64.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="versioninfo.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="VKScanCodes.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="keyman-debug-etw.man">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <SubType>Designer</SubType>
+    </CustomBuild>
+    <None Include="KEYMAN32.DEF" />
+    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
+    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keyman-debug-etw.rc" />
+    <ResourceCompile Include="KEYMAN32.RC">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="appcontext.h" />
+    <ClInclude Include="keymanengine.h" />
+    <ClInclude Include="addins.h" />
+    <ClInclude Include="appint\aiTIP.h" />
+    <ClInclude Include="appint\aiWin2000Unicode.h" />
+    <ClInclude Include="appint\appint.h" />
+    <ClInclude Include="calldll.h" />
+    <ClInclude Include="capsstate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
+    <ClInclude Include="globals.h" />
+    <ClInclude Include="kmprocessactions.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="hotkeys.h" />
+    <ClInclude Include="k32_tsf.h" />
+    <ClInclude Include="KBD.H" />
+    <ClInclude Include="keyboardoptions.h" />
+    <ClInclude Include="keyman64.h" />
+    <ClInclude Include="keymancontrol.h" />
+    <ClInclude Include="keyman-debug-etw.h" />
+    <ClInclude Include="keyeventsenderthread.h" />
+    <ClInclude Include="keystate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
+    <ClInclude Include="security.h" />
+    <ClInclude Include="serialkeyeventclient.h" />
+    <ClInclude Include="serialkeyeventcommon.h" />
+    <ClInclude Include="serialkeyeventserver.h" />
+    <ClInclude Include="SharedBuffers.h" />
+    <ClInclude Include="syskbd.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
+    <ClInclude Include="vkscancodes.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/keyman32.vcxproj b/windows/src/engine/keyman32/keyman32.vcxproj
index 71ae7ec501..ba15db6516 100644
--- a/windows/src/engine/keyman32/keyman32.vcxproj
+++ b/windows/src/engine/keyman32/keyman32.vcxproj
@@ -1,466 +1,466 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BD5564FB-35A5-4A3C-B96A-4A6578E2B593}</ProjectGuid>
-    <RootNamespace>Keyman32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>keyman32</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapExports>false</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>0x1c100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapExports>false</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>0x1c100000</BaseAddress>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman64.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <BaseAddress>0x1C100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <BaseAddress>0x1C100000</BaseAddress>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="appcontext.cpp" />
-    <ClCompile Include="appint\aiTIP.cpp" />
-    <ClCompile Include="appint\aiWin2000Unicode.cpp" />
-    <ClCompile Include="appint\appint.cpp" />
-    <ClCompile Include="calldll.cpp" />
-    <ClCompile Include="capsstate.cpp" />
-    <ClCompile Include="CoreEnvironment.cpp" />
-    <ClCompile Include="DebugEventTrace.cpp" />
-    <ClCompile Include="glossary.cpp" />
-    <ClCompile Include="hookutils.cpp" />
-    <ClCompile Include="hotkeys.cpp" />
-    <ClCompile Include="K32_DBG.CPP" />
-    <ClCompile Include="k32_globals.cpp" />
-    <ClCompile Include="K32_load.cpp" />
-    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
-    <ClCompile Include="k32_tsf.cpp" />
-    <ClCompile Include="k32_visualkeyboardinterface.cpp" />
-    <ClCompile Include="keybd_shift.cpp" />
-    <ClCompile Include="keyboardoptions.cpp" />
-    <ClCompile Include="keyman32.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp" />
-    <ClCompile Include="keystate.cpp" />
-    <ClCompile Include="kmhook_callwndproc.cpp" />
-    <ClCompile Include="kmhook_getmessage.cpp" />
-    <ClCompile Include="kmhook_keyboard.cpp" />
-    <ClCompile Include="kmprocess.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp" />
-    <ClCompile Include="kmprocessactions.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="preservedkeymap.cpp" />
-    <ClCompile Include="security.cpp" />
-    <ClCompile Include="selectkeyboard.cpp" />
-    <ClCompile Include="serialkeyeventclient.cpp" />
-    <ClCompile Include="serialkeyeventserver.cpp" />
-    <ClCompile Include="SharedBuffers.cpp" />
-    <ClCompile Include="syskbd.cpp" />
-    <ClCompile Include="syskbdnt.cpp" />
-    <ClCompile Include="syskbdnt64.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp" />
-    <ClCompile Include="versioninfo.cpp" />
-    <ClCompile Include="VKScanCodes.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="keyman-debug-etw.man">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <SubType>Designer</SubType>
-    </CustomBuild>
-    <None Include="KEYMAN32.DEF">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
-    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
-    <None Include="keyman64.def">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="keyman-debug-etw.rc" />
-    <ResourceCompile Include="KEYMAN32.RC">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ResourceCompile>
-    <ResourceCompile Include="keyman64.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appcontext.h" />
-    <ClInclude Include="keymanengine.h" />
-    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
-    <ClInclude Include="appint\aiTIP.h" />
-    <ClInclude Include="appint\aiWin2000Unicode.h" />
-    <ClInclude Include="appint\appint.h" />
-    <ClInclude Include="calldll.h" />
-    <ClInclude Include="capsstate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
-    <ClInclude Include="globals.h" />
-    <ClInclude Include="kmprocessactions.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="hotkeys.h" />
-    <ClInclude Include="k32_tsf.h" />
-    <ClInclude Include="k32_visualkeyboardinterface.h" />
-    <ClInclude Include="KBD.H" />
-    <ClInclude Include="keyboardoptions.h" />
-    <ClInclude Include="keyman64.h" />
-    <ClInclude Include="keymancontrol.h" />
-    <ClInclude Include="keyman-debug-etw.h" />
-    <ClInclude Include="keyeventsenderthread.h" />
-    <ClInclude Include="keystate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
-    <ClInclude Include="security.h" />
-    <ClInclude Include="serialkeyeventclient.h" />
-    <ClInclude Include="serialkeyeventcommon.h" />
-    <ClInclude Include="serialkeyeventserver.h" />
-    <ClInclude Include="SharedBuffers.h" />
-    <ClInclude Include="syskbd.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
-    <ClInclude Include="vkscancodes.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BD5564FB-35A5-4A3C-B96A-4A6578E2B593}</ProjectGuid>
+    <RootNamespace>Keyman32</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>keyman32</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>false</MapExports>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x1c100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>false</MapExports>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x1c100000</BaseAddress>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman64.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x1C100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x1C100000</BaseAddress>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="appcontext.cpp" />
+    <ClCompile Include="appint\aiTIP.cpp" />
+    <ClCompile Include="appint\aiWin2000Unicode.cpp" />
+    <ClCompile Include="appint\appint.cpp" />
+    <ClCompile Include="calldll.cpp" />
+    <ClCompile Include="capsstate.cpp" />
+    <ClCompile Include="CoreEnvironment.cpp" />
+    <ClCompile Include="DebugEventTrace.cpp" />
+    <ClCompile Include="glossary.cpp" />
+    <ClCompile Include="hookutils.cpp" />
+    <ClCompile Include="hotkeys.cpp" />
+    <ClCompile Include="K32_DBG.CPP" />
+    <ClCompile Include="k32_globals.cpp" />
+    <ClCompile Include="K32_load.cpp" />
+    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
+    <ClCompile Include="k32_tsf.cpp" />
+    <ClCompile Include="k32_visualkeyboardinterface.cpp" />
+    <ClCompile Include="keybd_shift.cpp" />
+    <ClCompile Include="keyboardoptions.cpp" />
+    <ClCompile Include="keyman32.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp" />
+    <ClCompile Include="keystate.cpp" />
+    <ClCompile Include="kmhook_callwndproc.cpp" />
+    <ClCompile Include="kmhook_getmessage.cpp" />
+    <ClCompile Include="kmhook_keyboard.cpp" />
+    <ClCompile Include="kmprocess.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp" />
+    <ClCompile Include="kmprocessactions.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="preservedkeymap.cpp" />
+    <ClCompile Include="security.cpp" />
+    <ClCompile Include="selectkeyboard.cpp" />
+    <ClCompile Include="serialkeyeventclient.cpp" />
+    <ClCompile Include="serialkeyeventserver.cpp" />
+    <ClCompile Include="SharedBuffers.cpp" />
+    <ClCompile Include="syskbd.cpp" />
+    <ClCompile Include="syskbdnt.cpp" />
+    <ClCompile Include="syskbdnt64.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp" />
+    <ClCompile Include="versioninfo.cpp" />
+    <ClCompile Include="VKScanCodes.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="keyman-debug-etw.man">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <SubType>Designer</SubType>
+    </CustomBuild>
+    <None Include="KEYMAN32.DEF">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
+    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
+    <None Include="keyman64.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keyman-debug-etw.rc" />
+    <ResourceCompile Include="KEYMAN32.RC">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="keyman64.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="appcontext.h" />
+    <ClInclude Include="keymanengine.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
+    <ClInclude Include="appint\aiTIP.h" />
+    <ClInclude Include="appint\aiWin2000Unicode.h" />
+    <ClInclude Include="appint\appint.h" />
+    <ClInclude Include="calldll.h" />
+    <ClInclude Include="capsstate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
+    <ClInclude Include="globals.h" />
+    <ClInclude Include="kmprocessactions.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="hotkeys.h" />
+    <ClInclude Include="k32_tsf.h" />
+    <ClInclude Include="k32_visualkeyboardinterface.h" />
+    <ClInclude Include="KBD.H" />
+    <ClInclude Include="keyboardoptions.h" />
+    <ClInclude Include="keyman64.h" />
+    <ClInclude Include="keymancontrol.h" />
+    <ClInclude Include="keyman-debug-etw.h" />
+    <ClInclude Include="keyeventsenderthread.h" />
+    <ClInclude Include="keystate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
+    <ClInclude Include="security.h" />
+    <ClInclude Include="serialkeyeventclient.h" />
+    <ClInclude Include="serialkeyeventcommon.h" />
+    <ClInclude Include="serialkeyeventserver.h" />
+    <ClInclude Include="SharedBuffers.h" />
+    <ClInclude Include="syskbd.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
+    <ClInclude Include="vkscancodes.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/keyman32.vcxproj.filters b/windows/src/engine/keyman32/keyman32.vcxproj.filters
index 5627c72b04..cffae6a908 100644
--- a/windows/src/engine/keyman32/keyman32.vcxproj.filters
+++ b/windows/src/engine/keyman32/keyman32.vcxproj.filters
@@ -1,265 +1,271 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{2dc5904b-4033-47e6-88ac-ebe442c06c2e}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{27baf0f2-3926-4720-b5f9-045e47cd975c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{088a2b68-c9db-41f4-9f45-37fdf758931e}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="appint\aiTIP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="appint\aiWin2000Unicode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="appint\appint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="calldll.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="capsstate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="glossary.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hotkeys.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="K32_DBG.CPP">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="k32_globals.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="K32_LOAD.CPP">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keybd_shift.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keyboardoptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KEYMAN32.CPP">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keystate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmhook_callwndproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmhook_getmessage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmhook_keyboard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmprocess.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="selectkeyboard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="syskbd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="syskbdnt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="syskbdnt64.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="versioninfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VKScanCodes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="preservedkeymap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="k32_tsf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hookutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="k32_lowlevelkeyboardhook.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="security.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="serialkeyeventclient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="serialkeyeventserver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SharedBuffers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DebugEventTrace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmprocessactions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CoreEnvironment.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="appcontext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="KEYMAN32.DEF">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="keyman64.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="KEYMAN32.RC">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="keyman-debug-etw.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="keyman64.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appint\aiTIP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="appint\aiWin2000Unicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="appint\appint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="calldll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="capsstate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="globals.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hotkeys.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="KBD.H">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyboardoptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyman64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keymancontrol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keystate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="syskbd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vkscancodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="k32_tsf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyman-debug-etw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyeventsenderthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="security.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serialkeyeventclient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serialkeyeventcommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SharedBuffers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serialkeyeventserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keymanengine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="kmprocessactions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\kmtip_guids.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="appcontext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="keyman-debug-etw.man" />
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{2dc5904b-4033-47e6-88ac-ebe442c06c2e}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{27baf0f2-3926-4720-b5f9-045e47cd975c}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{088a2b68-c9db-41f4-9f45-37fdf758931e}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="appint\aiTIP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="appint\aiWin2000Unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="appint\appint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="calldll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="capsstate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="glossary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hotkeys.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="K32_DBG.CPP">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_globals.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="K32_LOAD.CPP">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keybd_shift.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keyboardoptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="KEYMAN32.CPP">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keystate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmhook_callwndproc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmhook_getmessage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmhook_keyboard.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmprocess.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="selectkeyboard.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="syskbd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="syskbdnt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="syskbdnt64.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="versioninfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VKScanCodes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="preservedkeymap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_tsf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hookutils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_lowlevelkeyboardhook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="security.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="serialkeyeventclient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="serialkeyeventserver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SharedBuffers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugEventTrace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmprocessactions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CoreEnvironment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="appcontext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_visualkeyboardinterface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="KEYMAN32.DEF">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="keyman64.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="KEYMAN32.RC">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="keyman-debug-etw.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="keyman64.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="appint\aiTIP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="appint\aiWin2000Unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="appint\appint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="calldll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="capsstate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="globals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="hotkeys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="KBD.H">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboardoptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyman64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keymancontrol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keystate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="syskbd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vkscancodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="k32_tsf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyman-debug-etw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyeventsenderthread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="security.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="serialkeyeventclient.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="serialkeyeventcommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SharedBuffers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="serialkeyeventserver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keymanengine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="kmprocessactions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\kmtip_guids.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="appcontext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="k32_visualkeyboardinterface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="keyman-debug-etw.man" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj b/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj
index 48afed6fdd..5bf2365a59 100644
--- a/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj
+++ b/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj
@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{46399ed7-79a1-4e7e-bd96-4b1aeec838ae}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <ProjectName>keyman-engine-tests</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Label="Shared" />
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LibraryPath>$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\kmtip\bin\Win32\$(Configuration);$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(LibraryPath)</LibraryPath>
-    <Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>true</Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\global\cpp\kmtip_guids.cpp" />
-    <ClCompile Include="appinttests.cpp" />
-    <ClCompile Include="gtest_main.cpp" />
-    <ClCompile Include="keyboardoptionstests.cpp" />
-    <ClCompile Include="kmprocessactionstests.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\keyman-engine.vcxproj">
-      <Project>{a7069186-5ae7-4504-8926-861b7a34ba9e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemDefinitionGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
-  </ImportGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>version.lib;psapi.lib;imm32.lib;libkeymancore.a;libicuuc.a;libicuin.a;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
-  </Target>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{46399ed7-79a1-4e7e-bd96-4b1aeec838ae}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectName>keyman-engine-tests</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LibraryPath>$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\kmtip\bin\Win32\$(Configuration);$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(LibraryPath)</LibraryPath>
+    <Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>true</Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\global\cpp\kmtip_guids.cpp" />
+    <ClCompile Include="appinttests.cpp" />
+    <ClCompile Include="gtest_main.cpp" />
+    <ClCompile Include="keyboardoptionstests.cpp" />
+    <ClCompile Include="kmprocessactionstests.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\keyman-engine.vcxproj">
+      <Project>{a7069186-5ae7-4504-8926-861b7a34ba9e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemDefinitionGroup />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>version.lib;psapi.lib;imm32.lib;libkeymancore.a;libicuuc.a;libicuin.a;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/windows/src/engine/keymanx64/keymanx64.vcxproj b/windows/src/engine/keymanx64/keymanx64.vcxproj
index 82b3bcb59f..2fd5955560 100644
--- a/windows/src/engine/keymanx64/keymanx64.vcxproj
+++ b/windows/src/engine/keymanx64/keymanx64.vcxproj
@@ -1,153 +1,153 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A34650EA-D6E8-4229-8091-6BF1443565B5}</ProjectGuid>
-    <RootNamespace>keymanx64</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-      <OutputManifestFile>
-      </OutputManifestFile>
-    </Manifest>
-    <ManifestResourceCompile>
-      <ResourceOutputFileName>
-      </ResourceOutputFileName>
-    </ManifestResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-    <ManifestResourceCompile>
-      <ResourceOutputFileName>
-      </ResourceOutputFileName>
-    </ManifestResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp" />
-    <ClCompile Include="keymanx64.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
-    <ClInclude Include="keymanx64.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="keymanx64.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A34650EA-D6E8-4229-8091-6BF1443565B5}</ProjectGuid>
+    <RootNamespace>keymanx64</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+      <OutputManifestFile>
+      </OutputManifestFile>
+    </Manifest>
+    <ManifestResourceCompile>
+      <ResourceOutputFileName>
+      </ResourceOutputFileName>
+    </ManifestResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+    <ManifestResourceCompile>
+      <ResourceOutputFileName>
+      </ResourceOutputFileName>
+    </ManifestResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp" />
+    <ClCompile Include="keymanx64.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
+    <ClInclude Include="keymanx64.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keymanx64.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/kmrefresh/kmrefresh.vcxproj b/windows/src/engine/kmrefresh/kmrefresh.vcxproj
index a978cb947e..0b252895f7 100644
--- a/windows/src/engine/kmrefresh/kmrefresh.vcxproj
+++ b/windows/src/engine/kmrefresh/kmrefresh.vcxproj
@@ -1,157 +1,157 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{A3B8F75F-E63E-434E-8A2A-034AD9B66571}</ProjectGuid>
-    <RootNamespace>kmrefresh</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>$(ProjectName).x64</TargetName>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).x86</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).x86</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>$(ProjectName).x64</TargetName>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="kmrefresh.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{A3B8F75F-E63E-434E-8A2A-034AD9B66571}</ProjectGuid>
+    <RootNamespace>kmrefresh</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>$(ProjectName).x64</TargetName>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName).x86</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName).x86</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>$(ProjectName).x64</TargetName>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="kmrefresh.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/kmtip/kmtip.vcxproj b/windows/src/engine/kmtip/kmtip.vcxproj
index f3fb74116f..173853f507 100644
--- a/windows/src/engine/kmtip/kmtip.vcxproj
+++ b/windows/src/engine/kmtip/kmtip.vcxproj
@@ -1,432 +1,432 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{93391ECB-E2F1-4D23-B85E-6FDEB7ACF9B4}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">kmtip64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">kmtip64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\common\windows\cpp\src\vkeys.cpp" />
-    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
-    <ClCompile Include="debug.cpp" />
-    <ClCompile Include="keyman32interface.cpp" />
-    <ClCompile Include="keys.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmkey.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmtip.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="register.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="registryw.cpp" />
-    <ClCompile Include="tmgrsink.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="inserttext.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="dllmain.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="globals.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="server.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="kmtip.def">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="kmtip64.def">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="kmtip.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
-    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
-    <ClInclude Include="editsess.h" />
-    <ClInclude Include="globals.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keynames.h" />
-    <ClInclude Include="kmtip.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{93391ECB-E2F1-4D23-B85E-6FDEB7ACF9B4}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">kmtip64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">kmtip64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\common\windows\cpp\src\vkeys.cpp" />
+    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
+    <ClCompile Include="debug.cpp" />
+    <ClCompile Include="keyman32interface.cpp" />
+    <ClCompile Include="keys.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmkey.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmtip.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="register.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="registryw.cpp" />
+    <ClCompile Include="tmgrsink.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="inserttext.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="dllmain.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="globals.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="server.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="kmtip.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="kmtip64.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="kmtip.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
+    <ClInclude Include="editsess.h" />
+    <ClInclude Include="globals.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keynames.h" />
+    <ClInclude Include="kmtip.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/mcompile/mcompile.vcxproj b/windows/src/engine/mcompile/mcompile.vcxproj
index e9c426a330..99f60fa722 100644
--- a/windows/src/engine/mcompile/mcompile.vcxproj
+++ b/windows/src/engine/mcompile/mcompile.vcxproj
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5C22DDDA-CEAD-45F1-96B0-1473111156AA}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mtop</RootNamespace>
-    <ProjectName>mcompile</ProjectName>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <GenerateManifest>false</GenerateManifest>
-    <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <GenerateManifest>false</GenerateManifest>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\engine\keyman32\KBD.H" />
-    <ClInclude Include="mc_kmxfile.h" />
-    <ClInclude Include="mcompile.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="mc_syskbd.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\global\cpp\VKScanCodes.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="mc_import_rules.cpp" />
-    <ClCompile Include="mc_kmxfile.cpp" />
-    <ClCompile Include="mcompile.cpp" />
-    <ClCompile Include="mc_savekeyboard.cpp" />
-    <ClCompile Include="mc_unicode.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="mc_syskbd.cpp" />
-    <ClCompile Include="mc_syskbdnt32.cpp" />
-    <ClCompile Include="mc_syskbdnt64.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="mcompile.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5C22DDDA-CEAD-45F1-96B0-1473111156AA}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>mtop</RootNamespace>
+    <ProjectName>mcompile</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <GenerateManifest>false</GenerateManifest>
+    <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <GenerateManifest>false</GenerateManifest>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\engine\keyman32\KBD.H" />
+    <ClInclude Include="mc_kmxfile.h" />
+    <ClInclude Include="mcompile.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="mc_syskbd.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\global\cpp\VKScanCodes.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="mc_import_rules.cpp" />
+    <ClCompile Include="mc_kmxfile.cpp" />
+    <ClCompile Include="mcompile.cpp" />
+    <ClCompile Include="mc_savekeyboard.cpp" />
+    <ClCompile Include="mc_unicode.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="mc_syskbd.cpp" />
+    <ClCompile Include="mc_syskbdnt32.cpp" />
+    <ClCompile Include="mc_syskbdnt64.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="mcompile.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/testhost/testhost.vcxproj b/windows/src/engine/testhost/testhost.vcxproj
index 8b965e942c..e9d06a87a6 100644
--- a/windows/src/engine/testhost/testhost.vcxproj
+++ b/windows/src/engine/testhost/testhost.vcxproj
@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{12818da3-0472-49a5-96fc-a4808a1a77fa}</ProjectGuid>
-    <RootNamespace>testhost</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="framework.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="targetver.h" />
-    <ClInclude Include="testhost.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="testhost.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testhost.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="small.ico" />
-    <Image Include="testhost.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{12818da3-0472-49a5-96fc-a4808a1a77fa}</ProjectGuid>
+    <RootNamespace>testhost</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="framework.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="testhost.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="testhost.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="testhost.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="small.ico" />
+    <Image Include="testhost.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/support/etl2log/etl2log.vcxproj b/windows/src/support/etl2log/etl2log.vcxproj
index d8e0372cb2..839d6f2886 100644
--- a/windows/src/support/etl2log/etl2log.vcxproj
+++ b/windows/src/support/etl2log/etl2log.vcxproj
@@ -1,182 +1,182 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{8754791A-42D7-4E93-84F1-97DEF9D644EB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>etl2log</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="etl2log.cpp" />
-    <ClCompile Include="load.cpp" />
-    <ClCompile Include="logging.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="logging.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{8754791A-42D7-4E93-84F1-97DEF9D644EB}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>etl2log</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="etl2log.cpp" />
+    <ClCompile Include="load.cpp" />
+    <ClCompile Include="logging.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="logging.h" />
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/support/texteditor/Editor.vcxproj b/windows/src/support/texteditor/Editor.vcxproj
index 4b01793829..30879810b3 100644
--- a/windows/src/support/texteditor/Editor.vcxproj
+++ b/windows/src/support/texteditor/Editor.vcxproj
@@ -1,175 +1,175 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{6804767e-857f-48cc-b843-22bf357a668c}</ProjectGuid>
-    <RootNamespace>Editor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="Editor.h" />
-    <ClInclude Include="framework.h" />
-    <ClInclude Include="FontSelect.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Editor.cpp" />
-    <ClCompile Include="FontSelect.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Editor.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="Editor.ico" />
-    <Image Include="small.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{6804767e-857f-48cc-b843-22bf357a668c}</ProjectGuid>
+    <RootNamespace>Editor</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Editor.h" />
+    <ClInclude Include="framework.h" />
+    <ClInclude Include="FontSelect.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Editor.cpp" />
+    <ClCompile Include="FontSelect.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Editor.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Editor.ico" />
+    <Image Include="small.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj b/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj
index 77f601a5c5..8c76a595a8 100644
--- a/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj
+++ b/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj
@@ -1,176 +1,176 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{748219AC-3BDE-40FC-8E93-7516C4BCE81D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>cppshareddata</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cppshareddata.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{748219AC-3BDE-40FC-8E93-7516C4BCE81D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>cppshareddata</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="cppshareddata.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file

From b0c9c0b56ab92850d3cf4cbc583445c6e61ba2fd Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Thu, 30 Oct 2025 13:05:18 -0500
Subject: [PATCH 67/83] auto: increment master version to 19.0.154

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 4 ++++
 VERSION.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 0c97698f49..1bbdd62327 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 19.0.153 alpha 2025-10-30
+
+* test(developer): add kmc-analyze tests for AnalyzeOskCharacterUse output formats (#15030)
+
 ## 19.0.152 alpha 2025-10-30
 
 * maint(resources): include sourcemaps in npm publish (#15051)
diff --git a/VERSION.md b/VERSION.md
index 125305d3ef..0ca1ffe960 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.153
\ No newline at end of file
+19.0.154
\ No newline at end of file

From 238094c4e6691b7eb696040d20c47e4065b17cb9 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 31 Oct 2025 11:25:32 +0700
Subject: [PATCH 68/83] fix(web): Use build/test-resources/keyboards path for
 web test page

---
 web/src/test/manual/build.sh                 | 1 +
 web/src/test/manual/web/issue9469/index.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 85cb2c4c7d..0a3cd59173 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -52,6 +52,7 @@ function do_copy() {
 
   # copy common test (resources) keyboards
   cp -f "$KEYMAN_ROOT/common/test/keyboards/platform-rules/platformtest.js" "$KEYMAN_ROOT/$DEST/keyboards/"
+  cp -f "$KEYMAN_ROOT/common/test/keyboards/test9469/build/test9469.js" "$KEYMAN_ROOT/$DEST/keyboards/"
   cp -f "$KEYMAN_ROOT/common/test/resources/keyboards/"*.js "$KEYMAN_ROOT/$DEST/keyboards/"
 }
 
diff --git a/web/src/test/manual/web/issue9469/index.html b/web/src/test/manual/web/issue9469/index.html
index a170b7e051..78c3a15f95 100644
--- a/web/src/test/manual/web/issue9469/index.html
+++ b/web/src/test/manual/web/issue9469/index.html
@@ -41,7 +41,7 @@
 		    attachType:'auto'
       }).then(function() {
         kmw.addKeyboards({id:'test9469',name:'test9469',languages:{id:'en',name:'English'}, 
-          filename:'../../../../../../common/test/keyboards/test9469/build/test9469.js'});
+          filename:'../../../../../build/test-resources/keyboards/test9469.js'});
 
         var pageRef = (window.location.protocol == 'file:')
           ? window.location.href.substr(0, window.location.href.lastIndexOf('/')+1)

From 29b02fb9551e29936794c2eb9a2466ff0390d36e Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 31 Oct 2025 07:23:43 +0100
Subject: [PATCH 69/83] docs(windows): visual studio 2022

Build-bot: skip
---
 docs/build/windows.md                   | 36 ++++++++++++++++++-------
 docs/minimum-versions.md                |  2 +-
 resources/build/minimum-versions.inc.sh |  2 +-
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/docs/build/windows.md b/docs/build/windows.md
index ccf74be55d..f485605f58 100644
--- a/docs/build/windows.md
+++ b/docs/build/windows.md
@@ -267,17 +267,35 @@ of appropriate node versions during builds.
     copying the relevant Delphi-built components into windows/bin folders from a
     compatible installed version of Keyman for testing and debugging purposes.
 
-* Visual C++ 2019 Community or Professional
+* Visual Studio 2022 Community (C++ native desktop workload)
 
-  ```ps1
-  choco install visualstudio2019community visualstudio2019-workload-nativedesktop visualstudio2019buildtools
+  ```cmd
+  winget install --id=Microsoft.VisualStudio.2022.Community -e --override "--passive --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.CppBuildInsights --add Microsoft.VisualStudio.Component.Debugger.JustInTime --add Microsoft.VisualStudio.Component.VC.ASAN --add Microsoft.VisualStudio.Component.VC.DiagnosticTools --add Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows11SDK.26100 --add Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit --add Microsoft.VisualStudio.Component.Windows10SDK.19041"
   ```
 
-  * Verify required build tools are installed
-    * Run `Visual Studio Installer`
-    * Check the `Individual components` tab
-    * Verify `MSVC v142 - VS 2019 c++ x64/x86 build tools (Latest)` is installed.
-      If not, install it.
+  * You can omit the `--passive` parameter to open the installer dialog and
+    modify the selection before continuing with the install.
+
+  * You can replace `--passive` with `--quiet` for a silent install (note that
+    the winget command returns before the Visual Studio Installer finishes, so
+    you won't be able to easily tell when installation completes; check Task
+    Manager for setup.exe).
+
+  * If you prefer to use the Visual Studio Installer instead of the command
+    line install, then the following workloads and components should be included:
+    * Visual Studio core editor
+    * Desktop development with C++
+      - C++ core desktop features
+      - MSVC v143 - VS 2022 C++ x64/x86 build tools (latest)
+      - C++ Build Insights
+      - Just-In-Time debugger
+      - C++ profiling tools
+      - Test Adapter for Google Test
+      - C++ AddressSanitizer
+      - Windows 10 SDK (10.0.19041.0)
+      - Windows 11 SDK (10.0.26100.6584)
+    * Under individual components, add:
+      - MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (latest)
 
   Recommended: configure Visual Studio to use two-space tab stops:
   1. Open the options dialog: Tools > Options.
@@ -287,7 +305,7 @@ of appropriate node versions during builds.
 
 * Windows SDK (C++ Desktop Development)
 
-  https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
+  This should be installed as a part of Visual Studio above
 
 **Required environment variables**:
 * `PATH`
diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md
index 19e0bf4420..d538083d61 100644
--- a/docs/minimum-versions.md
+++ b/docs/minimum-versions.md
@@ -65,7 +65,7 @@ https://help.keyman.com/developer/engine/android/latest-version/
 | KEYMAN_MIN_VERSION_MESON | 1.0.0 |
 | KEYMAN_MIN_VERSION_NODE_MAJOR | 20 |
 | KEYMAN_MIN_VERSION_NPM | 10.5.1 |
-| KEYMAN_MIN_VERSION_VISUAL_STUDIO | 2019 |
+| KEYMAN_MIN_VERSION_VISUAL_STUDIO | 2022 |
 | KEYMAN_VERSION_CLDR | 46 |
 | KEYMAN_VERSION_GRADLE | 8.12 |
 | KEYMAN_VERSION_ICU | 73.1 |
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index 8320c80954..d768697022 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -29,7 +29,7 @@ KEYMAN_MIN_TARGET_VERSION_WEB_SAFARI=13.0     # iOS 13.0, macOS 10.13.6+
 KEYMAN_MIN_VERSION_NODE_MAJOR=20              # node version source of truth is /package.json:/engines/node; use KEYMAN_USE_NVM to automatically update
 KEYMAN_MIN_VERSION_NPM=10.5.1                 # 10.5.0 has bug, discussed in #10350
 KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.58          # Use KEYMAN_USE_EMSDK to automatically update to this version
-KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019
+KEYMAN_MIN_VERSION_VISUAL_STUDIO=2022         # Visual Studio 2022, see /docs/build/windows.md for workloads and components
 KEYMAN_MIN_VERSION_MESON=1.0.0
 
 KEYMAN_VERSION_GRADLE=8.12                    # See /android/KMEA/gradle/wrapper/gradle-wrapper.properties

From 52621e3425b7093f7e13804bcf6ba426b67ba061 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Fri, 31 Oct 2025 01:39:05 -0500
Subject: [PATCH 70/83] auto: cherry-pick 18.0.244 history to alpha

Build-bot: skip
Test-bot: skip
---
 HISTORY.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/HISTORY.md b/HISTORY.md
index 1bbdd62327..d21702b177 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -937,6 +937,17 @@
 * refactor(windows): rename `TKeymanMutex.MutexOwned` to `TakeOwnership` and add `ReleaseOwnership` (#13168)
 * chore: increment to alpha 19.0 (#13187)
 
+## 18.0.244 stable 2025-10-31
+
+* fix(linux): use `ibus` command to restart ibus (#14975)
+* fix(android): Set the main app background white (#14982)
+* fix(developer): do not treat backslash as a string escape in syntax highlighting (#15005)
+* fix(developer): handle missing `begin Unicode` in KMW compiler (#15006)
+* fix(mac): ignore non-Unicode key caps when preparing OSK (#15009)
+* maint(resources): move NPM package publishing to GitHub Actions (#15054)
+* chore(developer): add breadcrumbs to trace sporadic crashes on exit (#15059)
+* chore(developer): further debugging for assertion failure (#15057)
+
 ## 18.0.243 stable 2025-10-15
 
 * chore(linux): Update debian changelog (#14855)

From 933ea5bb58ac68642fa582c6e3101627cb448388 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 31 Oct 2025 17:08:56 +0100
Subject: [PATCH 71/83] change(developer): remove kmlmc and kmlmp

These were replaced by kmc in v17.0. We kept them as legacy alternatives
in v18.0, but it is time to remove them now to reduce the maintenance of
having multiple entry points to kmc.

Fixes: #13181
Test-bot: skip
---
 developer/docs/help/context/index.md          |  6 --
 developer/docs/help/context/kmlmc.md          |  5 --
 developer/docs/help/context/kmlmi.md          |  5 --
 developer/docs/help/context/kmlmp.md          |  5 --
 .../reference/kmc/cli/kmcomp-migration.md     | 20 +-----
 developer/src/README.md                       |  2 +-
 developer/src/inst/kmdev.wxs                  |  8 ---
 developer/src/inst/node/kmlmc.cmd             |  4 --
 developer/src/inst/node/kmlmp.cmd             |  4 --
 developer/src/kmc/build-bundler.js            |  2 -
 developer/src/kmc/package.json                |  8 +--
 developer/src/kmc/src/kmlmc.ts                | 67 -------------------
 developer/src/kmc/src/kmlmp.ts                | 60 -----------------
 developer/src/tike/build.sh                   |  2 -
 developer/src/tike/kmlmc.cmd                  | 20 ------
 developer/src/tike/kmlmp.cmd                  | 20 ------
 package-lock.json                             |  4 +-
 17 files changed, 6 insertions(+), 236 deletions(-)
 delete mode 100644 developer/docs/help/context/kmlmc.md
 delete mode 100644 developer/docs/help/context/kmlmi.md
 delete mode 100644 developer/docs/help/context/kmlmp.md
 delete mode 100644 developer/src/inst/node/kmlmc.cmd
 delete mode 100644 developer/src/inst/node/kmlmp.cmd
 delete mode 100644 developer/src/kmc/src/kmlmc.ts
 delete mode 100644 developer/src/kmc/src/kmlmp.ts
 delete mode 100644 developer/src/tike/kmlmc.cmd
 delete mode 100644 developer/src/tike/kmlmp.cmd

diff --git a/developer/docs/help/context/index.md b/developer/docs/help/context/index.md
index 04028b35c1..d7bf164c30 100644
--- a/developer/docs/help/context/index.md
+++ b/developer/docs/help/context/index.md
@@ -42,12 +42,6 @@ title: Context Help
 
 [kmc Command-line Options](kmc)
 
-[kmlmc Command-line Options](kmlmc)
-
-[kmlmi Command-line Options](kmlmi)
-
-[kmlmp Command-line Options](kmlmp)
-
 [Character Map](character-map)
 
 [Message Window](messages)
diff --git a/developer/docs/help/context/kmlmc.md b/developer/docs/help/context/kmlmc.md
deleted file mode 100644
index 33edf500f5..0000000000
--- a/developer/docs/help/context/kmlmc.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: kmlmc - Command Line Lexical Model Compiler (deprecated)
----
-
-kmlmc has been replaced by [kmc](../reference/kmc).
diff --git a/developer/docs/help/context/kmlmi.md b/developer/docs/help/context/kmlmi.md
deleted file mode 100644
index dc47cbbc39..0000000000
--- a/developer/docs/help/context/kmlmi.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: kmlmi - Command Line Lexical Model model_info Compiler (deprecated)
----
-
-kmlmi has been replaced by [kmc](../reference/kmc).
diff --git a/developer/docs/help/context/kmlmp.md b/developer/docs/help/context/kmlmp.md
deleted file mode 100644
index 3442d8f142..0000000000
--- a/developer/docs/help/context/kmlmp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: kmlmp - Command Line Lexical Model Package Compiler (deprecated)
----
-
-kmlmp has been replaced by [kmc](../reference/kmc).
diff --git a/developer/docs/help/reference/kmc/cli/kmcomp-migration.md b/developer/docs/help/reference/kmc/cli/kmcomp-migration.md
index c864e1bc90..e3cd9f28b7 100644
--- a/developer/docs/help/reference/kmc/cli/kmcomp-migration.md
+++ b/developer/docs/help/reference/kmc/cli/kmcomp-migration.md
@@ -5,9 +5,8 @@ title: Migrating from kmcomp to kmc
 `kmcomp` was the command-line compiler for Keyman Developer through version
 16.0. Version 17.0 replaces `kmcomp` with `kmc`.
 
-The lexical model command-line tooling, `kmlmc`, `kmlmp`, and `kmlmi`, are all
-still present in version 17, but are deprecated, as the same tasks can be
-performed with `kmc`.
+The lexical model command-line tooling, `kmlmc`, `kmlmp`, and `kmlmi`, have
+been removed in version 19.0; instead use `kmc`.
 
 ## Benefits
 
@@ -99,21 +98,6 @@ kmcomp                 | kmc                                   | notes
 
 ## Compiling a lexical model
 
-`kmlmc` and `kmlmp` were separate tools in earlier versions of Keyman Developer,
-for compiling lexical models and lexical model packages. They have both been
-replaced with `kmc`.
-
-Old method, using kmlmc and kmlmp:
-
-```bash
-kmlmc file.model.ts
-# or specifying output filename
-kmlmc -o output/path/file.model.js file.model.ts
-kmlmp file.model.kps
-```
-
-New method, using kmc:
-
 ```bash
 # recommended, build the model project:
 kmc build .
diff --git a/developer/src/README.md b/developer/src/README.md
index f3419c71dc..f9b9092448 100644
--- a/developer/src/README.md
+++ b/developer/src/README.md
@@ -84,7 +84,7 @@ in Keyman for Windows.
 
 ## kmc
 
-node-based next generation compiler, hosts kmc, (and legacy kmlmc, kmlmp)
+node-based next generation compiler, hosts kmc
 
 ### kmc-analyze - Analysis tools
 
diff --git a/developer/src/inst/kmdev.wxs b/developer/src/inst/kmdev.wxs
index c57de43d82..8b10c138c7 100644
--- a/developer/src/inst/kmdev.wxs
+++ b/developer/src/inst/kmdev.wxs
@@ -262,14 +262,6 @@
         <File Name='README.md' Source="node\dist\README.md" />
       </Component>
 
-      <Component Directory="INSTALLDIR">
-        <File Name='kmlmc.cmd' KeyPath="yes" Source="node\kmlmc.cmd" />
-      </Component>
-
-      <Component Directory="INSTALLDIR">
-        <File Name='kmlmp.cmd' KeyPath="yes" Source="node\kmlmp.cmd" />
-      </Component>
-
       <Component Directory="INSTALLDIR">
         <File Name='kmc.cmd' KeyPath="yes" Source="node\kmc.cmd" />
       </Component>
diff --git a/developer/src/inst/node/kmlmc.cmd b/developer/src/inst/node/kmlmc.cmd
deleted file mode 100644
index be3bdf06e0..0000000000
--- a/developer/src/inst/node/kmlmc.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem This script avoids path dependencies for node for distribution
-@rem with Keyman Developer. When used on platforms other than Windows,
-@rem node can be used directly with the compiler (`npm link` will setup).
-@"%~dp0\node.js\node.exe" "%~dp0\kmc\kmlmc.mjs" %*
diff --git a/developer/src/inst/node/kmlmp.cmd b/developer/src/inst/node/kmlmp.cmd
deleted file mode 100644
index 2062ae091c..0000000000
--- a/developer/src/inst/node/kmlmp.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem This script avoids path dependencies for node for distribution
-@rem with Keyman Developer. When used on platforms other than Windows,
-@rem node can be used directly with the compiler (`npm link` will setup).
-@"%~dp0\node.js\node.exe" "%~dp0\kmc\kmlmp.mjs" %*
diff --git a/developer/src/kmc/build-bundler.js b/developer/src/kmc/build-bundler.js
index 9b5f9cdd9b..1cfbe2568f 100644
--- a/developer/src/kmc/build-bundler.js
+++ b/developer/src/kmc/build-bundler.js
@@ -7,8 +7,6 @@ import esbuild from 'esbuild';
 await esbuild.build({
   entryPoints: [
     'build/src/kmc.js',
-    'build/src/kmlmc.js',
-    'build/src/kmlmp.js',
   ],
   bundle: true,
   format: 'esm',
diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json
index 069e676ed1..39d839bc84 100644
--- a/developer/src/kmc/package.json
+++ b/developer/src/kmc/package.json
@@ -11,10 +11,8 @@
   ],
   "scripts": {
     "build": "tsc -b",
-    "bundle": "npm run bundle-kmc && npm run bundle-kmlmc && npm run bundle-kmlmp",
+    "bundle": "npm run bundle-kmc",
     "bundle-kmc": "esbuild build/src/kmc.js --bundle --platform=node --target=es2022 > build/cjs-src/kmc.cjs",
-    "bundle-kmlmc": "esbuild build/src/kmlmc.js --bundle --platform=node --target=es2022 > build/cjs-src/kmlmc.cjs",
-    "bundle-kmlmp": "esbuild build/src/kmlmp.js --bundle --platform=node --target=es2022 > build/cjs-src/kmlmp.cjs",
     "test": "eslint . && cd test && tsc -b && cd .. && mocha"
   },
   "type": "module",
@@ -29,9 +27,7 @@
   },
   "main": "build/src/kmc.js",
   "bin": {
-    "kmc": "build/src/kmc.js",
-    "kmlmc": "build/src/kmlmc.js",
-    "kmlmp": "build/src/kmlmp.js"
+    "kmc": "build/src/kmc.js"
   },
   "dependencies": {
     "@keymanapp/common-types": "*",
diff --git a/developer/src/kmc/src/kmlmc.ts b/developer/src/kmc/src/kmlmc.ts
deleted file mode 100644
index ca2fd4d6b0..0000000000
--- a/developer/src/kmc/src/kmlmc.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env node
-/**
- * kmlmc - Keyman Lexical Model Compiler
- */
-
-import { Command } from 'commander';
-import { LexicalModelCompiler } from '@keymanapp/kmc-model';
-import { SysExits } from './util/sysexits.js';
-import KEYMAN_VERSION from "@keymanapp/keyman-version";
-import { NodeCompilerCallbacks } from './util/NodeCompilerCallbacks.js';
-
-let inputFilename: string;
-const program = new Command();
-
-/* Arguments */
-program
-  .description('Compiles Keyman lexical models')
-  .version(KEYMAN_VERSION.VERSION_WITH_TAG)
-  .arguments('<infile>')
-  .action(infile => inputFilename = infile)
-  .option('-o, --outFile <filename>', 'where to save the resultant file');
-
-program.parse(process.argv);
-
-// Deal with input arguments:
-if (!inputFilename) {
-  exitDueToUsageError('Must provide a lexical model source file.');
-}
-
-const callbacks = new NodeCompilerCallbacks({logLevel: 'info'});
-
-const compiler = new LexicalModelCompiler();
-if(!await compiler.init(callbacks, null)) {
-  console.error('Initialization failed.');
-  process.exit(SysExits.EX_DATAERR);
-}
-
-let code = null;
-// Compile:
-try {
-  code = await compiler.run(inputFilename, program.opts().outFile);
-} catch(e) {
-  console.error(e);
-  process.exit(SysExits.EX_DATAERR);
-}
-
-if(!code) {
-  console.error('Compilation failed.')
-  process.exit(SysExits.EX_DATAERR);
-}
-
-// Output:
-if (program.opts().outFile) {
-  compiler.write(code.artifacts);
-} else {
-  // TODO(lowpri): if writing to console then log messages should all be to stderr?
-  const decoder = new TextDecoder();
-  const text = decoder.decode(code.artifacts.js.data);
-  console.log(text);
-}
-
-function exitDueToUsageError(message: string): never  {
-  console.error(`${program.name()}: ${message}`);
-  console.error();
-  program.outputHelp();
-  return process.exit(SysExits.EX_USAGE);
-}
\ No newline at end of file
diff --git a/developer/src/kmc/src/kmlmp.ts b/developer/src/kmc/src/kmlmp.ts
deleted file mode 100644
index d5fdb20c16..0000000000
--- a/developer/src/kmc/src/kmlmp.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env node
-/**
- * kmlmp - Keyman Lexical Model Package Compiler
- */
-
-// Note: this is a deprecated package and will be removed in Keyman 19.0
-
-import { Command } from 'commander';
-import { KmpCompiler } from '@keymanapp/kmc-package';
-import { SysExits } from './util/sysexits.js';
-import KEYMAN_VERSION from "@keymanapp/keyman-version";
-import { NodeCompilerCallbacks } from './util/NodeCompilerCallbacks.js';
-
-let inputFilename: string;
-const program = new Command();
-
-/* Arguments */
-program
-  .description('Compiles Keyman lexical model packages\nDeprecated: use <kmc build> instead; will be removed in v18')
-  .version(KEYMAN_VERSION.VERSION_WITH_TAG)
-  .arguments('<infile>')
-  .action(infile => inputFilename = infile)
-  .option('-o, --outFile <filename>', 'where to save the resultant file');
-
-program.parse(process.argv);
-
-// Deal with input arguments:
-
-if (!inputFilename) {
-  exitDueToUsageError('Must provide a lexical model package source file.');
-}
-
-const outputFilename: string = program.opts().outFile ? program.opts().outFile : inputFilename.replace(/\.kps$/, ".kmp");
-
-//
-// Run the compiler
-//
-
-const callbacks = new NodeCompilerCallbacks({logLevel: 'info'});
-const kmpCompiler = new KmpCompiler();
-if(!await kmpCompiler.init(callbacks, null)) {
-  process.exit(1);
-}
-
-const result = await kmpCompiler.run(inputFilename, outputFilename);
-if(!result) {
-  process.exit(1);
-}
-
-if(!await kmpCompiler.write(result.artifacts)) {
-  console.error('Failed to write kmp file');
-  process.exit(1);
-}
-
-function exitDueToUsageError(message: string): never  {
-  console.error(`${program.name()}: ${message}`);
-  console.error();
-  program.outputHelp();
-  return process.exit(SysExits.EX_USAGE);
-}
diff --git a/developer/src/tike/build.sh b/developer/src/tike/build.sh
index b9e5349f3e..15e2add3c4 100755
--- a/developer/src/tike/build.sh
+++ b/developer/src/tike/build.sh
@@ -72,8 +72,6 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$DEVELOPER_PROGRAM"
-  cp kmlmc.cmd "$DEVELOPER_PROGRAM"
-  cp kmlmp.cmd "$DEVELOPER_PROGRAM"
   cp kmc.cmd "$DEVELOPER_PROGRAM"
   cp "$KEYMAN_ROOT/core/build/x86/$TARGET_PATH/src/$KEYMANCORE_DLL" "$DEVELOPER_PROGRAM"
   builder_if_release_build_level cp "$WIN32_TARGET_PATH/tike.dbg" "$DEVELOPER_DEBUGPATH"
diff --git a/developer/src/tike/kmlmc.cmd b/developer/src/tike/kmlmc.cmd
deleted file mode 100644
index 4f86f2e3bd..0000000000
--- a/developer/src/tike/kmlmc.cmd
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-setlocal
-rem This script is based on /developer/src/node/inst/kmlmc.cmd. It is stored here
-rem in order to allow TIKE to call out to the compiler while debugging.
-if exist "%~dp0..\inst\node\dist\node.exe" (
-  rem If running in developer/src/tike/:
-  set nodeexe="%~dp0..\inst\node\dist\node.exe"
-  set nodecli="%~dp0..\kmc\build\src\kmlmc.js"
-) else if exist "%~dp0..\src\inst\node\dist\node.exe" (
-  rem If running in developer/bin/:
-  set nodeexe="%~dp0..\src\inst\node\dist\node.exe"
-  set nodecli="%~dp0..\src\kmc\build\src\kmlmc.js"
-) else (
-  rem Cannot find node or kmlmc.js relative to execution path
-  echo Error: node.exe or kmlmc.js not found.
-  exit /b 1
-)
-
-%nodeexe% --enable-source-maps %nodecli% %*
-exit /b %errorlevel%
diff --git a/developer/src/tike/kmlmp.cmd b/developer/src/tike/kmlmp.cmd
deleted file mode 100644
index 716a5bf940..0000000000
--- a/developer/src/tike/kmlmp.cmd
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-setlocal
-rem This script is based on /developer/src/node/inst/kmlmp.cmd. It is stored here
-rem in order to allow TIKE to call out to the compiler while debugging.
-if exist "%~dp0..\inst\node\dist\node.exe" (
-  rem If running in developer/src/tike/:
-  set nodeexe="%~dp0..\inst\node\dist\node.exe"
-  set nodecli="%~dp0..\kmc\build\src\kmlmp.js"
-) else if exist "%~dp0..\src\inst\node\dist\node.exe" (
-  rem If running in developer/bin/:
-  set nodeexe="%~dp0..\src\inst\node\dist\node.exe"
-  set nodecli="%~dp0..\src\kmc\build\src\kmlmp.js"
-) else (
-  rem Cannot find node or kmlmp.js relative to execution path
-  echo Error: node.exe or kmlmp.js not found.
-  exit /b 1
-)
-
-%nodeexe% --enable-source-maps %nodecli% %*
-exit /b %errorlevel%
diff --git a/package-lock.json b/package-lock.json
index 7618527727..f5c4e68d9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -281,9 +281,7 @@
         "supports-color": "^9.4.0"
       },
       "bin": {
-        "kmc": "build/src/kmc.js",
-        "kmlmc": "build/src/kmlmc.js",
-        "kmlmp": "build/src/kmlmp.js"
+        "kmc": "build/src/kmc.js"
       },
       "devDependencies": {
         "@sentry/cli": "^2.31.0",

From eb1babfee18c5dab88194369c3f77b0ef3b436e3 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 31 Oct 2025 17:16:10 +0100
Subject: [PATCH 72/83] maint(resources): auto merge on branch name rather than
 label

In order to avoid a race condition where label can be added after the
GHA starts, we will check the branch name instead of `automerge` label.

Fixes: #15027
Test-bot: skip
Build-bot: skip
---
 .github/workflows/auto-merge-keyman-server-pr.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/auto-merge-keyman-server-pr.yml b/.github/workflows/auto-merge-keyman-server-pr.yml
index 771fd6ae5e..bc1759f6bc 100644
--- a/.github/workflows/auto-merge-keyman-server-pr.yml
+++ b/.github/workflows/auto-merge-keyman-server-pr.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'keymanapp/keyman' && github.actor == 'keyman-server' && startsWith(github.event.pull_request.title, 'auto:') }}
+    if: ${{ github.repository == 'keymanapp/keyman' && github.actor == 'keyman-server' && startsWith(github.head_ref, 'auto/') }}
     steps:
     - name: auto approve PR from keyman-server
       shell: bash
@@ -23,7 +23,6 @@ jobs:
         gh pr review -R keymanapp/keyman --approve ${{ github.event.pull_request.number }}
     - name: mark PR for auto-merge from keyman-server
       shell: bash
-      if: contains(github.event.pull_request.labels.*.name, 'automerge')
       env:
         GH_TOKEN: "${{ secrets.AUTOINC_GITHUB_TOKEN }}"
       run: |

From 20397bd7e32d0653bd0fcedf3d49ad91eba2f647 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Fri, 31 Oct 2025 13:02:10 -0500
Subject: [PATCH 73/83] auto: increment master version to 19.0.155

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 8 ++++++++
 VERSION.md | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index d21702b177..29bd4a91a3 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,13 @@
 # Keyman Version History
 
+## 19.0.154 alpha 2025-10-31
+
+* chore(developer): further debugging for assertion failure (#15056)
+* chore(developer): add breadcrumbs to trace sporadic crashes on exit (#15058)
+* fix(developer): handle exceptions loading .keyman-touch-layout files (#15060)
+* chore(developer): fix always-false nullish coalescing (#15061)
+* chore(windows): upgrade VC++ projects to v143 (VS2022) (#15062)
+
 ## 19.0.153 alpha 2025-10-30
 
 * test(developer): add kmc-analyze tests for AnalyzeOskCharacterUse output formats (#15030)
diff --git a/VERSION.md b/VERSION.md
index 0ca1ffe960..b89ca9ee96 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.154
\ No newline at end of file
+19.0.155
\ No newline at end of file

From 23b5dca1b34ed0710a409c7389c4d9e3e0c0c245 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 3 Nov 2025 10:54:44 +0100
Subject: [PATCH 74/83] fix(developer): remove package version if
 FollowKeyboardVersion is set in Package Editor

To reduce confusion when 'Follow Keyboard Version' is set, clear the
cached package version data from UI and .kps source when saving the
package or making changes to it.

Fixes: #11892
Test-bot: skip
---
 .../windows/delphi/packages/PackageInfo.pas   | 10 ++++++++
 .../src/common/delphi/packages/kpsfile.pas    | 10 ++++++++
 .../src/tike/child/UfrmPackageEditor.pas      | 25 +++++++++++--------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/common/windows/delphi/packages/PackageInfo.pas b/common/windows/delphi/packages/PackageInfo.pas
index 6be3bb82a9..7de369f957 100644
--- a/common/windows/delphi/packages/PackageInfo.pas
+++ b/common/windows/delphi/packages/PackageInfo.pas
@@ -455,6 +455,7 @@ type
     procedure DoSaveJSON(ARoot: TJSONObject); virtual;
     procedure DoLoadIni(ini: TIniFile); virtual;
     procedure DoSaveIni(ini: TIniFile); virtual;
+    procedure Cleanup; virtual;
   public
     Options: TPackageOptions;
     StartMenu: TPackageStartMenu;
@@ -1889,11 +1890,18 @@ begin
   end;
 end;
 
+procedure TPackage.Cleanup;
+begin
+  // No op in basic package
+end;
+
 procedure TPackage.SaveXML;
 var
   doc: IXMLDocument;
   root: IXMLNode;
 begin
+  Cleanup;
+
   doc := NewXMLDocument;
   doc.Encoding := 'utf-8';
 
@@ -1914,6 +1922,8 @@ var
   doc: IXMLDocument;
   root: IXMLNode;
 begin
+  Cleanup;
+
   doc := NewXMLDocument;
   doc.Encoding := 'utf-8';
 
diff --git a/developer/src/common/delphi/packages/kpsfile.pas b/developer/src/common/delphi/packages/kpsfile.pas
index d92c8b9ae7..87bd7b2296 100644
--- a/developer/src/common/delphi/packages/kpsfile.pas
+++ b/developer/src/common/delphi/packages/kpsfile.pas
@@ -70,6 +70,7 @@ type
     procedure DoSaveJSON(ARoot: TJSONObject); override;
     procedure DoLoadIni(ini: TIniFile); override;
     procedure DoSaveIni(ini: TIniFile); override;
+    procedure Cleanup; override;
   public
 
     function KPSOptions: TKPSOptions;
@@ -110,6 +111,15 @@ begin
     FStrings.Assign((Source as TKPSFile).Strings);
 end;
 
+procedure TKPSFile.Cleanup;
+begin
+  inherited;
+  if KPSOptions.FollowKeyboardVersion then
+  begin
+    Info.Desc[PackageInfo_Version] := '';
+  end;
+end;
+
 constructor TKPSFile.Create;
 begin
   FStrings := TStringList.Create;
diff --git a/developer/src/tike/child/UfrmPackageEditor.pas b/developer/src/tike/child/UfrmPackageEditor.pas
index f3dcc71f09..5beb0c6d77 100644
--- a/developer/src/tike/child/UfrmPackageEditor.pas
+++ b/developer/src/tike/child/UfrmPackageEditor.pas
@@ -635,21 +635,21 @@ end;
 procedure TfrmPackageEditor.editInfoNameChange(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
-  pack.Info.Desc['Name'] := Trim(editInfoName.Text);
+  pack.Info.Desc[PackageInfo_Name] := Trim(editInfoName.Text);
   Modified := True;
 end;
 
 procedure TfrmPackageEditor.editInfoVersionChange(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
-  pack.Info.Desc['Version'] := Trim(editInfoVersion.Text);
+  pack.Info.Desc[PackageInfo_Version] := Trim(editInfoVersion.Text);
   Modified := True;
 end;
 
 procedure TfrmPackageEditor.editInfoCopyrightChange(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
-  pack.Info.Desc['Copyright'] := Trim(editInfoCopyright.Text);
+  pack.Info.Desc[PackageInfo_Copyright] := Trim(editInfoCopyright.Text);
   Modified := True;
 end;
 
@@ -663,7 +663,7 @@ end;
 procedure TfrmPackageEditor.editInfoAuthorChange(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
-  pack.Info.Desc['Author'] := Trim(editInfoAuthor.Text);
+  pack.Info.Desc[PackageInfo_Author] := Trim(editInfoAuthor.Text);
   Modified := True;
 end;
 
@@ -671,16 +671,16 @@ procedure TfrmPackageEditor.editInfoEmailChange(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
   if Trim(editInfoEmail.Text) = ''
-    then pack.Info.URL['Author'] := ''
-    else pack.Info.URL['Author'] := 'mailto:'+Trim(editInfoEmail.Text);
+    then pack.Info.URL[PackageInfo_Author] := ''
+    else pack.Info.URL[PackageInfo_Author] := 'mailto:'+Trim(editInfoEmail.Text);
   Modified := True;
 end;
 
 procedure TfrmPackageEditor.editInfoWebSiteChange(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
-  pack.Info.Desc['WebSite'] := Trim(editInfoWebSite.Text);
-  pack.Info.URL['WebSite'] := Trim(editInfoWebSite.Text);
+  pack.Info.Desc[PackageInfo_WebSite] := Trim(editInfoWebSite.Text);
+  pack.Info.URL[PackageInfo_WebSite] := Trim(editInfoWebSite.Text);
   Modified := True;
 end;
 
@@ -734,7 +734,7 @@ begin
           try
             f.Description := 'Keyboard '+ki.KeyboardName;
             // Fill in some info stuff as well...
-            if pack.Info.Desc[PackageInfo_Version] = '' then   // I4690
+            if not pack.KPSOptions.FollowKeyboardVersion and (pack.Info.Desc[PackageInfo_Version] = '') then   // I4690
             begin
               pack.Info.Desc[PackageInfo_Version] := ki.KeyboardVersion;
             end;
@@ -1021,6 +1021,11 @@ procedure TfrmPackageEditor.chkFollowKeyboardVersionClick(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
   pack.KPSOptions.FollowKeyboardVersion := chkFollowKeyboardVersion.Checked;
+  if chkFollowKeyboardVersion.Checked then
+  begin
+    editInfoVersion.Text := '';
+    pack.Info.Desc[PackageInfo_Version] := '';
+  end;
   EnableDetailsTabControls;
   Modified := True;
 end;
@@ -1082,7 +1087,7 @@ end;
 procedure TfrmPackageEditor.memoInfoDescriptionChange(Sender: TObject);
 begin
   if FSetup > 0 then Exit;
-  pack.Info.Desc['Description'] := Trim(memoInfoDescription.Text);
+  pack.Info.Desc[PackageInfo_Description] := Trim(memoInfoDescription.Text);
   Modified := True;
 end;
 

From 1199f8c4976b8ed76f9740bcbb1328e214d18936 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Mon, 3 Nov 2025 12:01:57 -0600
Subject: [PATCH 75/83] auto: increment master version to 19.0.156

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 5 +++++
 VERSION.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 29bd4a91a3..fa1c49e99d 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 19.0.155 alpha 2025-11-03
+
+* maint(resources): auto merge on branch name rather than label (#15084)
+* change(developer): remove kmlmc and kmlmp (#15083)
+
 ## 19.0.154 alpha 2025-10-31
 
 * chore(developer): further debugging for assertion failure (#15056)
diff --git a/VERSION.md b/VERSION.md
index b89ca9ee96..19983b8a91 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.155
\ No newline at end of file
+19.0.156
\ No newline at end of file

From e96cab6307d8210ccdb228496e633bf493d29e83 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 4 Nov 2025 10:02:42 +0100
Subject: [PATCH 76/83] maint(windows): new timestamp server for test signing

Old timestamp servers are no longer working

Test-bot: skip
Build-bot: skip
---
 common/windows/signtime.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/windows/signtime.bat b/common/windows/signtime.bat
index 80eb4770ef..d29cf58b75 100644
--- a/common/windows/signtime.bat
+++ b/common/windows/signtime.bat
@@ -4,8 +4,8 @@ rem Build agents have a separate signtime script. We don't use 'call' here so
 rem executing that script will terminate this one.
 if exist c:\codesign\signtime.bat c:\codesign\signtime.bat %1 %2 %3 %4 %5 %6 %7 %8
 
-set SERVERLIST=(http://timestamp.comodoca.com/authenticode http://timestamp.verisign.com/scripts/timstamp.dll http://timestamp.globalsign.com/scripts/timestamp.dll http://tsa.starfieldtech.com)
-set RFC3161SERVERLIST=(http://timestamp.comodoca.com/rfc3161)
+set SERVERLIST=(http://timestamp.digicert.com http://timestamp.sectigo.com)
+set RFC3161SERVERLIST=(http://timestamp.digicert.com http://timestamp.sectigo.com)
 set SIGNTOOL=%1
 set PFX_SHA1=%2
 set PFX_SHA256=%3

From e86c419a42dcf5147a9267ee910008b4cbad91b3 Mon Sep 17 00:00:00 2001
From: Markus Greiner <90342882+Markus-SWAG@users.noreply.github.com>
Date: Tue, 4 Nov 2025 22:48:00 +0100
Subject: [PATCH 77/83] Update resources/docker-images/android/Dockerfile

Forgotten to remove when CHANGE_PERMISSIONS was invented.

Co-authored-by: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
---
 resources/docker-images/android/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/docker-images/android/Dockerfile b/resources/docker-images/android/Dockerfile
index f943f880d3..f961182bde 100644
--- a/resources/docker-images/android/Dockerfile
+++ b/resources/docker-images/android/Dockerfile
@@ -40,8 +40,6 @@ uid=\$(stat -c "%u" /home/build/build)
 gid=\$(stat -c "%g" /home/build/build)
 
 if [[ -v CHANGE_PERMISSIONS ]]; then
-  uid=\$(stat -c "%u" /home/build/build)
-  gid=\$(stat -c "%g" /home/build/build)
   if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
     sudo chown -R build:build /home/build/build

From 473b177050287038a05fe8b4a15716028ff8993c Mon Sep 17 00:00:00 2001
From: Markus Greiner <mrks.grnr@gmail.com>
Date: Tue, 4 Nov 2025 22:53:26 +0100
Subject: [PATCH 78/83] Handle uid and gid the same way as in the other
 Dockerfiles

---
 resources/docker-images/android/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/docker-images/android/Dockerfile b/resources/docker-images/android/Dockerfile
index f961182bde..7261ed97dc 100644
--- a/resources/docker-images/android/Dockerfile
+++ b/resources/docker-images/android/Dockerfile
@@ -36,10 +36,9 @@ EOF
 # Finish bashwrapper script and adjust permissions
 RUN <<EOF cat >> /usr/bin/bashwrapper
 
-uid=\$(stat -c "%u" /home/build/build)
-gid=\$(stat -c "%g" /home/build/build)
-
 if [[ -v CHANGE_PERMISSIONS ]]; then
+  uid=\$(stat -c "%u" /home/build/build)
+  gid=\$(stat -c "%g" /home/build/build)
   if [[ "\${uid}" != "\$(id -u)" && "\${gid}" != "\$(id -g)" ]]; then
     echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
     sudo chown -R build:build /home/build/build

From a78d68662eae3ad0df2bc6f71944ce9363bd4b01 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 5 Nov 2025 12:01:53 -0600
Subject: [PATCH 79/83] auto: increment master version to 19.0.157

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 7 +++++++
 VERSION.md | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index fa1c49e99d..aa1acf3842 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,12 @@
 # Keyman Version History
 
+## 19.0.156 alpha 2025-11-05
+
+* chore(linux): Update debian changelog (#14965)
+* maint(resources): Docker container changes permissions to match the file owner uid and gid (#14900)
+* fix(developer): remove package version if FollowKeyboardVersion is set in Package Editor (#15088)
+* maint(windows): new timestamp server for test signing (#15091)
+
 ## 19.0.155 alpha 2025-11-03
 
 * maint(resources): auto merge on branch name rather than label (#15084)
diff --git a/VERSION.md b/VERSION.md
index 19983b8a91..157cf22467 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.156
\ No newline at end of file
+19.0.157
\ No newline at end of file

From 5a324c2d4284c82b93c37ffeae44ba009b58e582 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 5 Nov 2025 17:12:50 +0100
Subject: [PATCH 80/83] refactor(web): change default export of ContextManager

This change replaces the default export of ContextManager with a regular
export.

Test-bot: skip
---
 web/src/app/browser/src/contextManager.ts        | 2 +-
 web/src/app/browser/src/defaultBrowserRules.ts   | 2 +-
 web/src/app/browser/src/hardwareEventKeyboard.ts | 2 +-
 web/src/app/browser/src/keyboardInterface.ts     | 2 +-
 web/src/app/browser/src/keymanEngine.ts          | 2 +-
 web/src/app/browser/src/oskConfiguration.ts      | 2 +-
 web/src/app/browser/src/test-index.ts            | 2 +-
 web/src/app/webview/src/contextManager.ts        | 2 +-
 web/src/app/webview/src/keymanEngine.ts          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index d079ea6d9d..a7c3708a26 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -42,7 +42,7 @@ function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
   }
 }
 
-export default class ContextManager extends ContextManagerBase<BrowserConfiguration> {
+export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   private _activeKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
   readonly focusAssistant = new FocusAssistant(() => this.activeTarget?.isForcingScroll());
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index f85baac16d..d6740978d6 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -6,7 +6,7 @@ import {
   type TextStore
 } from 'keyman/engine/keyboard';
 
-import ContextManager from './contextManager.js';
+import { ContextManager } from './contextManager.js';
 
 export default class DefaultBrowserRules extends DefaultRules {
   private contextManager: ContextManager;
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 1ce8893744..4db23cc0d5 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -7,7 +7,7 @@ import { DomEventTracker } from 'keyman/engine/events';
 import { DesignIFrameElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import { textStoreForEvent, textStoreForElement } from 'keyman/engine/attachment';
 
-import ContextManager from './contextManager.js';
+import { ContextManager } from './contextManager.js';
 
 type KeyboardState = {
   activeKeyboard: JSKeyboard,
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index ded3a1d71c..dc9a8cbe80 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -2,7 +2,7 @@ import { type AbstractElementTextStore } from 'keyman/engine/element-text-stores
 import { FloatingOSKView } from 'keyman/engine/osk';
 import { KeyboardInterfaceBase } from 'keyman/engine/main';
 
-import ContextManager from './contextManager.js';
+import { ContextManager }  from './contextManager.js';
 import { KeymanEngine } from './keymanEngine.js';
 
 export class KeyboardInterface extends KeyboardInterfaceBase<ContextManager> {
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 1479f9be79..200b205a0a 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -12,7 +12,7 @@ import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 
 import * as views from './viewsAnchorpoint.js';
 import { BrowserConfiguration, BrowserInitOptionDefaults, BrowserInitOptionSpec } from './configuration.js';
-import { default as ContextManager } from './contextManager.js';
+import { ContextManager } from './contextManager.js';
 import DefaultBrowserRules from './defaultBrowserRules.js';
 import HardwareEventKeyboard from './hardwareEventKeyboard.js';
 import { FocusStateAPIObject } from './context/focusAssistant.js';
diff --git a/web/src/app/browser/src/oskConfiguration.ts b/web/src/app/browser/src/oskConfiguration.ts
index d9f5764671..f8ee6360d9 100644
--- a/web/src/app/browser/src/oskConfiguration.ts
+++ b/web/src/app/browser/src/oskConfiguration.ts
@@ -1,6 +1,6 @@
 import { OSKView } from "keyman/engine/osk";
 import { KEYMAN_VERSION } from "@keymanapp/keyman-version";
-import ContextManager from "./contextManager.js";
+import { ContextManager } from "./contextManager.js";
 import { KeymanEngine } from "./keymanEngine.js";
 import { LanguageMenu } from "./languageMenu.js";
 
diff --git a/web/src/app/browser/src/test-index.ts b/web/src/app/browser/src/test-index.ts
index 83df5dc8e7..d094fe7c25 100644
--- a/web/src/app/browser/src/test-index.ts
+++ b/web/src/app/browser/src/test-index.ts
@@ -1,5 +1,5 @@
 export { BrowserConfiguration, BrowserInitOptionSpec } from './configuration.js';
-export { default as ContextManager, KeyboardCookie } from "./contextManager.js";
+export { ContextManager, KeyboardCookie } from "./contextManager.js";
 export { preprocessKeyboardEvent, default as HardwareEventKeyboard } from './hardwareEventKeyboard.js';
 
 export { KeymanEngine } from './keymanEngine.js';
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index dfb6c2fd30..e2057035f3 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -116,7 +116,7 @@ export class HostTextStore extends SyntheticTextStore {
   }
 }
 
-export default class ContextManager extends ContextManagerBase<WebviewConfiguration> {
+export class ContextManager extends ContextManagerBase<WebviewConfiguration> {
   // Change of context?  Just replace the SyntheticTextStore.  Context will be ENTIRELY controlled
   // by whatever is hosting the WebView.  (Some aspects of this context replacement have
   // yet to be modularized at this time, though.)
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index e7d98ee987..14b63dcc51 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -5,7 +5,7 @@ import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
 import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 
 import { WebviewConfiguration, WebviewInitOptionDefaults, WebviewInitOptionSpec } from './configuration.js';
-import ContextManager, { HostTextStore } from './contextManager.js';
+import { ContextManager, HostTextStore } from './contextManager.js';
 import PassthroughKeyboard from './passthroughKeyboard.js';
 import { buildEmbeddedGestureConfig, setupEmbeddedListeners } from './oskConfiguration.js';
 import { WorkerFactory } from '@keymanapp/lexical-model-layer';

From c58ce35248438ac151ffbf3c9a17cfd40ffb065c Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Thu, 6 Nov 2025 12:01:22 -0600
Subject: [PATCH 81/83] auto: increment master version to 19.0.158

Test-bot: skip
Build-bot: skip
---
 HISTORY.md | 5 +++++
 VERSION.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index aa1acf3842..9340e79af5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 19.0.157 alpha 2025-11-06
+
+* chore(common): Consolidate platformtest.js keyboard to `/common/test/keyboards/` (#15034)
+* chore(common): Consolidate test9469.js keyboard to `/common/test/keyboards/` (#15053)
+
 ## 19.0.156 alpha 2025-11-05
 
 * chore(linux): Update debian changelog (#14965)
diff --git a/VERSION.md b/VERSION.md
index 157cf22467..6823fd6611 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.157
\ No newline at end of file
+19.0.158
\ No newline at end of file

From fb728d922d2e285a881d09dab5addc5757d619dd Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 6 Nov 2025 18:55:22 +0100
Subject: [PATCH 82/83] refactor(web): remove duplicate element-text-stores
 folder

Test-bot: skip
---
 .../abstractElementTextStore.ts               |  52 ---
 .../contentEditableElementTextStore.ts        | 273 -------------
 .../createTextStoreForElement.ts              |  42 --
 .../designIFrameElementTextStore.ts           | 358 ------------------
 web/src/engine/element-text-stores/index.ts   |  11 -
 .../inputElementTextStore.ts                  | 233 ------------
 web/src/engine/element-text-stores/readme.md  |   9 -
 .../textAreaElementTextStore.ts               | 201 ----------
 web/src/engine/element-text-stores/utils.ts   |  38 --
 .../engine/src/element-text-stores/readme.md  |   2 +-
 10 files changed, 1 insertion(+), 1218 deletions(-)
 delete mode 100644 web/src/engine/element-text-stores/abstractElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/contentEditableElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/createTextStoreForElement.ts
 delete mode 100644 web/src/engine/element-text-stores/designIFrameElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/index.ts
 delete mode 100644 web/src/engine/element-text-stores/inputElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/readme.md
 delete mode 100644 web/src/engine/element-text-stores/textAreaElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/utils.ts

diff --git a/web/src/engine/element-text-stores/abstractElementTextStore.ts b/web/src/engine/element-text-stores/abstractElementTextStore.ts
deleted file mode 100644
index e22d6588ae..0000000000
--- a/web/src/engine/element-text-stores/abstractElementTextStore.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { TextStore } from "keyman/engine/keyboard";
-import { EventEmitter } from 'eventemitter3';
-
-export abstract class AbstractElementTextStore<EventMap extends EventEmitter.ValidEventTypes> extends TextStore {
-  // JS/TS can't do true multiple inheritance, so we maintain class events on a readonly field.
-  public readonly events: EventEmitter<EventMap, this> = new EventEmitter<EventMap, this>();
-
-  /**
-   * A field that may be used to track whether or not the represented context has changed over an
-   * arbitrary period of time.
-   */
-  public changed = false;
-
-  /**
-   * Returns the underlying element / document modeled by the wrapper.
-   */
-  abstract getElement(): HTMLElement;
-
-  public focus(): void {
-    const ele = this.getElement();
-    if(ele.focus) {
-      ele.focus();
-    }
-  }
-
-  /**
-   * Denotes when the represented element is forcing a text scroll via focus manipulation.
-   * As the intent is not to change the focused element, but just to have the browser update
-   * the scroll location, standard focus handlers (for updating the active context) should
-   * not deactivate the element while this state is active.
-   */
-  isForcingScroll(): boolean {
-    return false;
-  }
-
-  /**
-   * A helper method for doInputEvent; creates a simple common event and default dispatching.
-   * @param elem
-   */
-  protected dispatchInputEventOn(elem: HTMLElement) {
-    let event: InputEvent;
-
-    // `undefined` in pre-Chrome Edge and Chrome for Android before version 60.
-    if(window['InputEvent']) { // can't condition on the type directly; TS optimizes that out.
-      event = new InputEvent('input', {"bubbles": true, "cancelable": false});
-    }
-
-    if(elem && event) {
-      elem.dispatchEvent(event);
-    }
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/contentEditableElementTextStore.ts b/web/src/engine/element-text-stores/contentEditableElementTextStore.ts
deleted file mode 100644
index bd2aebcf1f..0000000000
--- a/web/src/engine/element-text-stores/contentEditableElementTextStore.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-class SelectionCaret {
-  node: Node;
-  offset: number;
-
-  constructor(node: Node, offset: number) {
-    this.node = node;
-    this.offset = offset;
-  }
-}
-
-class SelectionRange {
-  start: SelectionCaret;
-  end: SelectionCaret;
-
-  constructor(start: SelectionCaret, end: SelectionCaret) {
-    this.start = start;
-    this.end = end;
-  }
-}
-
-export class ContentEditableElementTextStore extends AbstractElementTextStore<{}> {
-  root: HTMLElement;
-
-  constructor(ele: HTMLElement) {
-    if(ele.isContentEditable) {
-      super();
-      this.root = ele;
-    } else {
-      throw "Specified element is not already content-editable!";
-    }
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  getElement(): HTMLElement {
-    return this.root;
-  }
-
-  isSelectionEmpty(): boolean {
-    if(!this.hasSelection()) {
-      return true;
-    }
-
-    return this.root.ownerDocument.getSelection().isCollapsed;
-  }
-
-  hasSelection(): boolean {
-    const Lsel = this.root.ownerDocument.getSelection();
-
-    if(this.root != Lsel.anchorNode && !this.root.contains(Lsel.anchorNode)) {
-      return false;
-    }
-
-    if(this.root != Lsel.focusNode && !this.root.contains(Lsel.focusNode)) {
-      return false;
-    }
-
-    return true;
-  }
-
-  clearSelection(): void {
-    if(this.hasSelection()) {
-      const Lsel = this.root.ownerDocument.getSelection();
-
-      if(!Lsel.isCollapsed) {
-        Lsel.deleteFromDocument();  // I2134, I2192
-      }
-    } else {
-      console.warn("Attempted to clear an unowned Selection!");
-    }
-  }
-
-  invalidateSelection(): void { /* No cache maintenance needed here, partly because
-                                  * it's impossible to cache a Selection; it mutates.
-                                  */  }
-
-  getCarets(): SelectionRange {
-    const Lsel = this.root.ownerDocument.getSelection();
-    let code = Lsel.anchorNode.compareDocumentPosition(Lsel.focusNode);
-
-    if(Lsel.isCollapsed) {
-      const caret = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      return new SelectionRange(caret, caret);
-    } else {
-      const anchor = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      const focus = new SelectionCaret(Lsel.focusNode, Lsel.focusOffset);
-
-      if(anchor.node == focus.node) {
-        code = (focus.offset - anchor.offset > 0) ? 2 : 4;
-      }
-
-      if(code & 2) {
-        return new SelectionRange(anchor, focus);
-      } else { // Default
-        // can test against code & 4 to ensure Focus is before anchor, though.
-        return new SelectionRange(focus, anchor);
-      }
-    }
-  }
-
-  getDeadkeyCaret(): number {
-    return KMWString.length(this.getTextBeforeCaret());
-  }
-
-  getTextBeforeCaret(): string {
-    if(!this.hasSelection()) {
-      return this.getText();
-    }
-
-    const caret = this.getCarets().start;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(0, caret.offset);
-  }
-
-  getSelectedText(): string {
-    // TODO:  figure out the proper implementation.
-    // KMW 16 and before behavior may be maintained by just returning the empty string.
-    return '';
-  }
-
-  getTextAfterCaret(): string {
-    if(!this.hasSelection()) {
-      return '';
-    }
-
-    const caret = this.getCarets().end;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(caret.offset);
-  }
-
-  getText(): string {
-    return this.root.innerText;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(!this.hasSelection() || dn <= 0) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-
-    // Bounds-check on the number of chars to delete.
-    if(dn > start.offset) {
-      dn = start.offset;
-    }
-
-    if(start.node.nodeType != 3) {
-      console.warn("Deletion of characters requested without available context!");
-      return; // No context to delete characters from.
-    }
-
-    const range = this.root.ownerDocument.createRange();
-    const dnOffset = start.offset - KMWString.substr(start.node.nodeValue.substr(0, start.offset), -dn).length;
-
-    range.setStart(start.node, dnOffset);
-    range.setEnd(start.node, start.offset);
-
-    this.adjustDeadkeys(-dn);
-    range.deleteContents();
-    // No need to reposition the caret - the DOM will auto-move the selection accordingly, since
-    // we didn't use the selection to delete anything.
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-    const delta = KMWString.length(s);
-    const Lsel = this.root.ownerDocument.getSelection();
-
-    if(delta == 0) {
-      return;
-    }
-
-    this.adjustDeadkeys(delta);
-
-    // While Selection.extend() was really nice for this, IE didn't support it whatsoever.
-    // However, IE (11, at least) DID support setting selections via ranges, so we were still
-    // able to manage the caret properly.
-    //
-    // TODO:  double-check that it was only IE-motivated, re-implement with Selection.extend().
-    const finalCaret = this.root.ownerDocument.createRange();
-
-    if(start.node.nodeType == 3) {
-      const textStart = <Text> start.node;
-      textStart.insertData(start.offset, s);
-      finalCaret.setStart(textStart, start.offset + s.length);
-    } else {
-      // Create a new text node - empty control
-      const n = start.node.ownerDocument.createTextNode(s);
-
-      const range = this.root.ownerDocument.createRange();
-      range.setStart(start.node, start.offset);
-      range.collapse(true);
-      range.insertNode(n);
-      finalCaret.setStart(n, s.length);
-    }
-
-    finalCaret.collapse(true);
-    Lsel.removeAllRanges();
-    try {
-      Lsel.addRange(finalCaret);
-    } catch(e) {
-      // Chrome (through 4.0 at least) throws an exception because it has not synchronised its content with the selection.
-      // scrollIntoView synchronises the content for selection
-      start.node.parentElement.scrollIntoView();
-      Lsel.addRange(finalCaret);
-    }
-    Lsel.collapseToEnd();
-  }
-
-  handleNewlineAtCaret(): void {
-    // TODO:  Implement.
-    //
-    // As it turns out, we never had an implementation for handling newline inputs from the OSK for this element type.
-    // At least this way, it's more explicit.
-    //
-    // Note:  consult "// Create a new text node - empty control" case in insertTextBeforeCaret -
-    // this helps to handle the browser-default implementation of newline handling.  In particular,
-    // entry of the first character after a newline.
-    //
-    // If raw newlines are entered into the HTML, but as with usual HTML, they're interpreted as excess whitespace and
-    // have no effect.  We need to add DOM elements for a functional newline.
-  }
-
-  protected setTextAfterCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const caret = this.getCarets().end;
-    const delta = KMWString.length(s);
-
-    if(delta == 0) {
-      return;
-    }
-
-    // This is designed explicitly for use in direct-setting operations; deadkeys
-    // will be handled after this method.
-
-    if(caret.node.nodeType == 3) {
-      const textStart = <Text> caret.node;
-      textStart.replaceData(caret.offset, textStart.length, s);
-    } else {
-      // Create a new text node - empty control
-      const n = caret.node.ownerDocument.createTextNode(s);
-
-      const range = this.root.ownerDocument.createRange();
-      range.setStart(caret.node, caret.offset);
-      range.collapse(true);
-      range.insertNode(n);
-    }
-  }
-
-  doInputEvent() {
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/createTextStoreForElement.ts b/web/src/engine/element-text-stores/createTextStoreForElement.ts
deleted file mode 100644
index a591ae32f9..0000000000
--- a/web/src/engine/element-text-stores/createTextStoreForElement.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Keyman is copyright (C) SIL Global. MIT License.
- */
-
-import { type AbstractElementTextStore }  from './abstractElementTextStore.js';
-import { InputElementTextStore } from './inputElementTextStore.js';
-import { TextAreaElementTextStore } from './textAreaElementTextStore.js';
-import { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
-import { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
-import { nestedInstanceOf } from './utils.js';
-
-/**
- * Wraps an HTMLElement in a concrete text-store implementation.
- *
- * @param e - The HTMLElement to create a text-store for.
- * @returns A concrete AbstractElementTextStore for the element, or null if the element
- *          type is not supported or no suitable store can be created.
- */
-export function createTextStoreForElement(e: HTMLElement): AbstractElementTextStore<any> {
-  // Complex type scoping is implemented here so that kmwutils.ts is not a dependency for test compilations.
-
-  if(nestedInstanceOf(e, "HTMLInputElement")) {
-    return new InputElementTextStore(<HTMLInputElement> e);
-  } else if(nestedInstanceOf(e, "HTMLTextAreaElement")) {
-    return new TextAreaElementTextStore(<HTMLTextAreaElement> e);
-  } else if(nestedInstanceOf(e, "HTMLIFrameElement")) {
-    const iframe = <HTMLIFrameElement> e;
-
-    if(iframe.contentWindow && iframe.contentWindow.document && iframe.contentWindow.document.designMode == "on") {
-      return new DesignIFrameElementTextStore(iframe);
-    } else if (e.isContentEditable) {
-      // Do content-editable <iframe>s make sense?
-      return new ContentEditableElementTextStore(e);
-    } else {
-      return null;
-    }
-  } else if(e.isContentEditable) {
-    return new ContentEditableElementTextStore(e);
-  }
-
-  return null;
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/designIFrameElementTextStore.ts b/web/src/engine/element-text-stores/designIFrameElementTextStore.ts
deleted file mode 100644
index e9a0fc1eff..0000000000
--- a/web/src/engine/element-text-stores/designIFrameElementTextStore.ts
+++ /dev/null
@@ -1,358 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-class SelectionCaret {
-  node: Node;
-  offset: number;
-
-  constructor(node: Node, offset: number) {
-    this.node = node;
-    this.offset = offset;
-  }
-}
-
-class SelectionRange {
-  start: SelectionCaret;
-  end: SelectionCaret;
-
-  constructor(start: SelectionCaret, end: SelectionCaret) {
-    this.start = start;
-    this.end = end;
-  }
-}
-
-class StyleCommand {
-  cmd: string;
-  stateType: number;
-  cache: string|boolean;
-
-  constructor(c: string, s:number) {
-    this.cmd = c;
-    this.stateType = s;
-  }
-}
-
-export class DesignIFrameElementTextStore extends AbstractElementTextStore<{}> {
-  root: HTMLIFrameElement;
-  doc: Document;
-  docRoot: HTMLElement;
-
-  commandCache: StyleCommand[];
-
-  constructor(ele: HTMLIFrameElement) {
-    super();
-    this.root = ele;
-
-    if(ele.contentWindow && ele.contentWindow.document && ele.contentWindow.document.designMode == 'on') {
-      this.doc = ele.contentWindow.document;
-      this.docRoot = ele.contentWindow.document.documentElement;
-    } else {
-      throw "Specified IFrame is not in design-mode!";
-    }
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  getElement(): HTMLIFrameElement {
-    return this.root;
-  }
-
-  focus(): void {
-    this.doc.defaultView.focus(); // I3363 (Build 301)
-  }
-
-  isSelectionEmpty(): boolean {
-    if(!this.hasSelection()) {
-      return true;
-    }
-
-    return this.doc.getSelection().isCollapsed;
-  }
-
-  hasSelection(): boolean {
-    const Lsel = this.doc.getSelection();
-    const outerSel = document.getSelection();
-
-    // If the outer doc's selection matches, we're active.
-    if(outerSel.anchorNode == Lsel.anchorNode && outerSel.focusNode == Lsel.focusNode) {
-      return true;
-    } else {
-      // Problem:  for testing, we can't enforce the ideal (ie: first) condition.
-      // Technically, the IFrame _will_ always have its own internal selection, though... so... it kinda works?
-      return true;
-    }
-  }
-
-  clearSelection(): void {
-    if(this.hasSelection()) {
-      const Lsel = this.doc.getSelection();
-
-      if(!Lsel.isCollapsed) {
-        Lsel.deleteFromDocument();  // I2134, I2192
-      }
-    } else {
-      console.warn("Attempted to clear an unowned Selection!");
-    }
-  }
-
-  invalidateSelection(): void { /* No cache maintenance needed here, partly because
-                                  * it's impossible to cache a Selection; it mutates.
-                                  */  }
-
-  getCarets(): SelectionRange {
-    const Lsel = this.doc.getSelection();
-    let code = Lsel.anchorNode.compareDocumentPosition(Lsel.focusNode);
-
-    if(Lsel.isCollapsed) {
-      const caret = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      return new SelectionRange(caret, caret);
-    } else {
-      const anchor = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      const focus = new SelectionCaret(Lsel.focusNode, Lsel.focusOffset);
-
-      if(anchor.node == focus.node) {
-        code = (focus.offset - anchor.offset > 0) ? 2 : 4;
-      }
-
-      if(code & 2) {
-        return new SelectionRange(anchor, focus);
-      } else { // Default
-        // can test against code & 4 to ensure Focus is before anchor, though.
-        return new SelectionRange(focus, anchor);
-      }
-    }
-  }
-
-  getDeadkeyCaret(): number {
-    return KMWString.length(this.getTextBeforeCaret());
-  }
-
-  getTextBeforeCaret(): string {
-    if(!this.hasSelection()) {
-      return this.getText();
-    }
-
-    const caret = this.getCarets().start;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(0, caret.offset);
-  }
-
-  getSelectedText(): string {
-    // TODO:  figure out the proper implementation.
-    // KMW 16 and before behavior may be maintained by just returning the empty string.
-    return '';
-  }
-
-  getTextAfterCaret(): string {
-    if(!this.hasSelection()) {
-      return '';
-    }
-
-    const caret = this.getCarets().end;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(caret.offset);
-  }
-
-  getText(): string {
-    return this.docRoot.innerText;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(!this.hasSelection() || dn <= 0) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-
-    // Bounds-check on the number of chars to delete.
-    if(dn > start.offset) {
-      dn = start.offset;
-    }
-
-    if(start.node.nodeType != 3) {
-      console.warn("Deletion of characters requested without available context!");
-      return; // No context to delete characters from.
-    }
-
-    const range = this.doc.createRange();
-    const dnOffset = start.offset - KMWString.substr(start.node.nodeValue.substr(0, start.offset), -dn).length;
-
-    range.setStart(start.node, dnOffset);
-    range.setEnd(start.node, start.offset);
-
-    this.adjustDeadkeys(-dn);
-    range.deleteContents();
-    // No need to reposition the caret - the DOM will auto-move the selection accordingly, since
-    // we didn't use the selection to delete anything.
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-    const delta = KMWString.length(s);
-    const Lsel = this.doc.getSelection();
-
-    if(delta == 0) {
-      return;
-    }
-
-    this.adjustDeadkeys(delta);
-
-    // While Selection.extend() was really nice for this, IE didn't support it whatsoever.
-    // However, IE (11, at least) DID support setting selections via ranges, so we were still
-    // able to manage the caret properly.
-    //
-    // TODO:  double-check that it was only IE-motivated, re-implement with Selection.extend().
-    const finalCaret = this.root.ownerDocument.createRange();
-
-    if(start.node.nodeType == 3) {
-      const textStart = <Text> start.node;
-      textStart.insertData(start.offset, s);
-      finalCaret.setStart(textStart, start.offset + s.length);
-    } else {
-      // Create a new text node - empty control
-      const n = this.doc.createTextNode(s);
-
-      const range = this.doc.createRange();
-      range.setStart(start.node, start.offset);
-      range.collapse(true);
-      range.insertNode(n);
-      finalCaret.setStart(n, s.length);
-    }
-
-    finalCaret.collapse(true);
-    Lsel.removeAllRanges();
-    try {
-      Lsel.addRange(finalCaret);
-    } catch(e) {
-      // Chrome (through 4.0 at least) throws an exception because it has not synchronised its content with the selection.
-      // scrollIntoView synchronises the content for selection
-      start.node.parentElement.scrollIntoView();
-      Lsel.addRange(finalCaret);
-    }
-    Lsel.collapseToEnd();
-  }
-
-  handleNewlineAtCaret(): void {
-    // TODO:  Implement.
-    //
-    // As it turns out, we never had an implementation for handling newline inputs from the OSK for this element type.
-    // At least this way, it's more explicit.
-    //
-    // Note:  consult "// Create a new text node - empty control" case in insertTextBeforeCaret -
-    // this helps to handle the browser-default implementation of newline handling.  In particular,
-    // entry of the first character after a newline.
-    //
-    // If raw newlines are entered into the HTML, but as with usual HTML, they're interpreted as excess whitespace and
-    // have no effect.  We need to add DOM elements for a functional newline.
-  }
-
-  protected setTextAfterCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const caret = this.getCarets().end;
-    const delta = KMWString.length(s);
-
-    if(delta == 0) {
-      return;
-    }
-
-    // This is designed explicitly for use in direct-setting operations; deadkeys
-    // will be handled after this method.
-
-    if(caret.node.nodeType == 3) {
-      const textStart = <Text> caret.node;
-      textStart.replaceData(caret.offset, textStart.length, s);
-    } else {
-      // Create a new text node - empty control
-      const n = caret.node.ownerDocument.createTextNode(s);
-
-      const range = this.root.ownerDocument.createRange();
-      range.setStart(caret.node, caret.offset);
-      range.collapse(true);
-      range.insertNode(n);
-    }
-  }
-
-  /**
-   * Function     saveProperties
-   * Scope        Private
-   * Description  Build and create list of styles that can be applied in iframes
-   */
-  saveProperties() {
-    // Formerly _CacheCommands.
-    const _CacheableCommands=[
-      new StyleCommand('backcolor',1), new StyleCommand('fontname',1), new StyleCommand('fontsize',1),
-      new StyleCommand('forecolor',1), new StyleCommand('bold',0), new StyleCommand('italic',0),
-      new StyleCommand('strikethrough',0), new StyleCommand('subscript',0),
-      new StyleCommand('superscript',0), new StyleCommand('underline',0)
-    ];
-
-    if(this.doc.defaultView) {
-      _CacheableCommands.push(new StyleCommand('hilitecolor',1));
-    }
-
-    for(let n=0; n < _CacheableCommands.length; n++) { // I1511 - array prototype extended
-      const cmd = _CacheableCommands[n];
-      //KeymanWeb._Debug('Command:'+_CacheableCommands[n][0]);
-      if(cmd.stateType == 1) {
-        cmd.cache = this.doc.queryCommandValue(cmd.cmd);
-      } else {
-        cmd.cache = this.doc.queryCommandState(cmd.cmd);
-      }
-    }
-    this.commandCache = _CacheableCommands;
-  }
-
-  /**
-   * Function     restoreProperties
-   * Scope        Private
-   * Description  Restore styles in IFRAMEs (??)
-   */
-  restoreProperties(_func?: () => void): void {
-    // Formerly _CacheCommandsReset.
-    if(!this.commandCache) {
-      console.error("No command cache exists to restore!");
-    }
-
-    for(let n=0; n < this.commandCache.length; n++) { // I1511 - array prototype extended
-      const cmd = this.commandCache[n];
-
-      //KeymanWeb._Debug('ResetCacheCommand:'+_CacheableCommands[n][0]+'='+_CacheableCommands[n][2]);
-      if(cmd.stateType == 1) {
-        if(this.doc.queryCommandValue(cmd.cmd) != cmd.cache) {
-          if(_func) {
-            _func();
-          }
-          this.doc.execCommand(cmd.cmd, false, <string> cmd.cache);
-        }
-      } else if(this.doc.queryCommandState(cmd.cmd) != cmd.cache) {
-        if(_func) {
-          _func();
-        }
-        //KeymanWeb._Debug('executing command '+_CacheableCommand[n][0]);
-        this.doc.execCommand(cmd.cmd, false, null);
-      }
-    }
-  }
-
-  doInputEvent() {
-    // Root = the iframe, the outermost component and the one we were originally told to attach to.
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/index.ts b/web/src/engine/element-text-stores/index.ts
deleted file mode 100644
index 4a5dfe6e61..0000000000
--- a/web/src/engine/element-text-stores/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Keyman is copyright (C) SIL Global. MIT License.
- */
-
-export { createTextStoreForElement } from './createTextStoreForElement.js';
-export { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
-export { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
-export { InputElementTextStore } from './inputElementTextStore.js';
-export { AbstractElementTextStore } from './abstractElementTextStore.js';
-export { TextAreaElementTextStore } from './textAreaElementTextStore.js';
-export { nestedInstanceOf } from './utils.js';
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/inputElementTextStore.ts b/web/src/engine/element-text-stores/inputElementTextStore.ts
deleted file mode 100644
index 24235626ed..0000000000
--- a/web/src/engine/element-text-stores/inputElementTextStore.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-interface EventMap  {
-  /**
-   * This event will be raised when a newline is received by wrapped elements not of
-   * the 'search' or 'submit' types.
-   *
-   * Original code this is replacing:
-   ```
-      // Allows compiling this separately from the main body of KMW.
-      // TODO:  rework class to accept a class-static 'callback' from the DOM module that this can call.
-      //        Would eliminate the need for this 'static' reference.
-      //        Only strongly matters once we better modularize KMW, with web-dom vs web-dom-targets vs web-core, etc.
-      if(com.keyman["singleton"]) {
-        com.keyman["singleton"].domManager.moveToNext(false);
-      }
-   ```
-   * This does not belong in a modularized version of this class; it must be supplied
-   * by the consuming top-level products instead.
-   */
-  'unhandlednewline': (element: HTMLInputElement) => void
-}
-
-export class InputElementTextStore extends AbstractElementTextStore<EventMap> {
-  root: HTMLInputElement;
-
-  /**
-   * Tracks the most recently-cached selection start index.
-   */
-  private _cachedSelectionStart: number
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection start index.
-   * When the element's selectionStart value changes, this should be invalidated.
-   */
-  private processedSelectionStart: number;
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection end index.
-   * When the element's selectionEnd value changes, this should be invalidated.
-   */
-  private processedSelectionEnd: number;
-
-  /**
-   * Set, then unset within the `forceScroll` method in order to facilitate the
-   * `isForcingScroll` flag.
-   */
-  private _activeForcedScroll: boolean;
-
-  constructor(ele: HTMLInputElement) {
-    super();
-
-    this.root = ele;
-    this._cachedSelectionStart = -1;
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  static isSupportedType(type: string): boolean {
-    return type == 'email' || type == 'search' || type == 'text' || type == 'url';
-  }
-
-  getElement(): HTMLInputElement {
-    return this.root;
-  }
-
-  clearSelection(): void {
-    // Processes our codepoint-based variants of selectionStart and selectionEnd.
-    this.getCaret(); // updates processedSelectionStart if required
-    this.root.value = KMWString.substr(this.root.value, 0, this.processedSelectionStart) + KMWString.substr(this.root.value, this.processedSelectionEnd); //I3319
-
-    this.setCaret(this.processedSelectionStart);
-  }
-
-  isSelectionEmpty(): boolean {
-    return this.root.selectionStart == this.root.selectionEnd;
-  }
-
-  hasSelection(): boolean {
-    return true;
-  }
-
-  invalidateSelection() {
-    // Since .selectionStart will never return this value, we use it to indicate
-    // the need to refresh our processed indices.
-    this._cachedSelectionStart = -1;
-  }
-
-  getCaret(): number {
-    if(this.root.selectionStart != this._cachedSelectionStart) {
-      this._cachedSelectionStart = this.root.selectionStart; // KMW-1
-      this.processedSelectionStart = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionStart); // I3319
-      this.processedSelectionEnd = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionEnd);     // I3319
-    }
-    return this.root.selectionDirection == 'forward' ? this.processedSelectionEnd : this.processedSelectionStart;
-  }
-
-  getDeadkeyCaret(): number {
-    return this.getCaret();
-  }
-
-  setCaret(caret: number) {
-    this.setSelection(caret, caret, "none");
-  }
-
-  setSelection(start: number, end: number, direction: "forward" | "backward" | "none") {
-    const domStart = KMWString.codePointToCodeUnit(this.root.value, start);
-    const domEnd = KMWString.codePointToCodeUnit(this.root.value, end);
-    this.root.setSelectionRange(domStart, domEnd, direction);
-
-    this.processedSelectionStart = start;
-    this.processedSelectionEnd = end;
-
-    this.forceScroll();
-
-    this.root.setSelectionRange(domStart, domEnd, direction);
-  }
-
-  forceScroll() {
-    // Only executes when com.keyman.DOMEventHandlers is defined.
-    //
-    // We bypass this whenever operating in the embedded format.
-    const element = this.getElement();
-
-    const selectionStart = element.selectionStart;
-    const selectionEnd = element.selectionEnd;
-
-    this._activeForcedScroll = true;
-
-    try {
-      //Forces scrolling; the re-focus triggers the scroll, at least.
-      element.blur();
-      element.focus();
-    } finally {
-      // On Edge, it appears that the blur/focus combination will reset the caret position
-      // under certain scenarios during unit tests.  So, we re-set it afterward.
-      element.selectionStart = selectionStart;
-      element.selectionEnd = selectionEnd;
-      this._activeForcedScroll = false;
-    }
-  }
-
-  isForcingScroll(): boolean {
-    return this._activeForcedScroll;
-  }
-
-  getSelectionDirection(): "forward" | "backward" | "none" {
-    return this.root.selectionDirection;
-  }
-
-  getTextBeforeCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), 0, this.processedSelectionStart);
-  }
-
-  getSelectedText(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionStart, this.processedSelectionEnd);
-  }
-
-  setTextBeforeCaret(text: string) {
-    this.getCaret();
-    const selectionLength = this.processedSelectionEnd - this.processedSelectionStart;
-    const direction = this.getSelectionDirection();
-    const newCaret = KMWString.length(text);
-    this.root.value = text + KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.setSelection(newCaret, newCaret + selectionLength, direction);
-  }
-
-  protected setTextAfterCaret(s: string) {
-    const direction = this.getSelectionDirection();
-
-    this.root.value = this.getTextBeforeCaret() + s;
-    this.setSelection(this.processedSelectionStart, this.processedSelectionEnd, direction);
-  }
-
-  getTextAfterCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionEnd);
-  }
-
-  getText(): string {
-    return this.root.value;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(dn > 0) {
-      const curText = this.getTextBeforeCaret();
-      const caret = this.processedSelectionStart;
-
-      if(dn > caret) {
-        dn = caret;
-      }
-
-      this.adjustDeadkeys(-dn);
-      this.setTextBeforeCaret(KMWString.substring(curText, 0, caret - dn));
-      this.setCaret(caret - dn);
-    }
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!s) {
-      return;
-    }
-
-    const caret = this.getCaret();
-    const front = this.getTextBeforeCaret();
-    const back = KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.adjustDeadkeys(KMWString.length(s));
-    this.root.value = front + s + back;
-    this.setCaret(caret + KMWString.length(s));
-  }
-
-  handleNewlineAtCaret(): void {
-    const inputEle = this.root;
-    // Can't occur for Mocks - just Input types.
-    if (inputEle && (inputEle.type == 'search' || inputEle.type == 'submit')) {
-      inputEle.disabled=false;
-      inputEle.form.submit();
-    } else {
-      this.events.emit('unhandlednewline', inputEle);
-    }
-  }
-
-  doInputEvent() {
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/readme.md b/web/src/engine/element-text-stores/readme.md
deleted file mode 100644
index 4e40b46178..0000000000
--- a/web/src/engine/element-text-stores/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## engine/element-wrappers
-
-This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage
-elements as part of KMW attachment and interface the element with the `keyboard` submodule.
-
-
-Please keep any code in this folder / namespace as free as possible from dependencies on other parts of KMW.  Some of our unit tests wish to run against these types without requiring KMW to be active.
-
-Note that with a little work, we _could_ completely spin this into its own separate module - this could be useful for development and testing purposes, especially now that we've dropped the old `TouchAlias` type that was a bit entangled with main engine code.
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/textAreaElementTextStore.ts b/web/src/engine/element-text-stores/textAreaElementTextStore.ts
deleted file mode 100644
index 02423b261d..0000000000
--- a/web/src/engine/element-text-stores/textAreaElementTextStore.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-export class TextAreaElementTextStore extends AbstractElementTextStore<{}> {
-  root: HTMLTextAreaElement;
-
-  /**
-   * Tracks the most recently-cached selection start index.
-   */
-  private _cachedSelectionStart: number
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection start index.
-   * When the element's selectionStart value changes, this should be invalidated.
-   */
-  private processedSelectionStart: number;
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection end index.
-   * When the element's selectionEnd value changes, this should be invalidated.
-   */
-  private processedSelectionEnd: number;
-
-  /**
-   * Set, then unset within the `forceScroll` method in order to facilitate the
-   * `isForcingScroll` flag.
-   */
-  private _activeForcedScroll: boolean;
-
-  constructor(ele: HTMLTextAreaElement) {
-    super();
-
-    this.root = ele;
-    this._cachedSelectionStart = -1;
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  getElement(): HTMLTextAreaElement {
-    return this.root;
-  }
-
-  clearSelection(): void {
-    // Processes our codepoint-based variants of selectionStart and selectionEnd.
-    this.getCaret(); // updates processedSelectionStart if required
-    this.root.value = KMWString.substr(this.root.value, 0, this.processedSelectionStart) + KMWString.substr(this.root.value, this.processedSelectionEnd); //I3319
-
-    this.setCaret(this.processedSelectionStart);
-  }
-
-  isSelectionEmpty(): boolean {
-    return this.root.selectionStart == this.root.selectionEnd;
-  }
-
-  hasSelection(): boolean {
-    return true;
-  }
-
-  invalidateSelection() {
-    // Since .selectionStart will never return this value, we use it to indicate
-    // the need to refresh our processed indices.
-    this._cachedSelectionStart = -1;
-  }
-
-  getCaret(): number {
-    if(this.root.selectionStart != this._cachedSelectionStart) {
-      this._cachedSelectionStart = this.root.selectionStart; // KMW-1
-      this.processedSelectionStart = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionStart); // I3319
-      this.processedSelectionEnd = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionEnd);     // I3319
-    }
-    return this.root.selectionDirection == 'forward' ? this.processedSelectionEnd : this.processedSelectionStart;
-  }
-
-  getDeadkeyCaret(): number {
-    return this.getCaret();
-  }
-
-  setCaret(caret: number) {
-    this.setSelection(caret, caret, "none");
-  }
-
-  setSelection(start: number, end: number, direction: "forward" | "backward" | "none") {
-    const domStart = KMWString.codePointToCodeUnit(this.root.value, start);
-    const domEnd = KMWString.codePointToCodeUnit(this.root.value, end);
-    this.root.setSelectionRange(domStart, domEnd, direction);
-
-    this.processedSelectionStart = start;
-    this.processedSelectionEnd = end;
-
-    this.forceScroll();
-
-    this.root.setSelectionRange(domStart, domEnd, direction);
-  }
-
-  forceScroll() {
-    // Only executes when com.keyman.DOMEventHandlers is defined.
-    //
-    // We bypass this whenever operating in the embedded format.
-    const element = this.getElement();
-
-    const selectionStart = element.selectionStart;
-    const selectionEnd = element.selectionEnd;
-
-    this._activeForcedScroll = true;
-
-    try {
-      //Forces scrolling; the re-focus triggers the scroll, at least.
-      element.blur();
-      element.focus();
-    } finally {
-      // On Edge, it appears that the blur/focus combination will reset the caret position
-      // under certain scenarios during unit tests.  So, we re-set it afterward.
-      element.selectionStart = selectionStart;
-      element.selectionEnd = selectionEnd;
-      this._activeForcedScroll = false;
-    }
-  }
-
-  isForcingScroll(): boolean {
-    return this._activeForcedScroll;
-  }
-
-  getSelectionDirection(): "forward" | "backward" | "none" {
-    return this.root.selectionDirection;
-  }
-
-  getTextBeforeCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), 0, this.processedSelectionStart);
-  }
-
-  setTextBeforeCaret(text: string) {
-    this.getCaret();
-    const selectionLength = this.processedSelectionEnd - this.processedSelectionStart;
-    const direction = this.getSelectionDirection();
-    const newCaret = KMWString.length(text);
-    this.root.value = text + KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.setSelection(newCaret, newCaret + selectionLength, direction);
-  }
-
-  protected setTextAfterCaret(s: string) {
-    const direction = this.getSelectionDirection();
-
-    this.root.value = this.getTextBeforeCaret() + s;
-    this.setSelection(this.processedSelectionStart, this.processedSelectionEnd, direction);
-  }
-
-  getTextAfterCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionEnd);
-  }
-
-  getSelectedText(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionStart, this.processedSelectionEnd);
-  }
-
-  getText(): string {
-    return this.root.value;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(dn > 0) {
-      const curText = this.getTextBeforeCaret();
-      const caret = this.processedSelectionStart;
-
-      if(dn > caret) {
-        dn = caret;
-      }
-
-      this.adjustDeadkeys(-dn);
-      this.setTextBeforeCaret(KMWString.substr(curText, 0, caret - dn));
-      this.setCaret(caret - dn);
-    }
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!s) {
-      return;
-    }
-
-    const caret = this.getCaret();
-    const front = this.getTextBeforeCaret();
-    const back = KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.adjustDeadkeys(KMWString.length(s));
-    this.root.value = front + s + back;
-    this.setCaret(caret + KMWString.length(s));
-  }
-
-  handleNewlineAtCaret(): void {
-    this.insertTextBeforeCaret('\n');
-  }
-
-  doInputEvent() {
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/utils.ts b/web/src/engine/element-text-stores/utils.ts
deleted file mode 100644
index 739f11a982..0000000000
--- a/web/src/engine/element-text-stores/utils.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Checks the type of an input DOM-related object while ensuring that it is checked against the correct prototype,
- * as class prototypes are (by specification) scoped upon the owning Window.
- *
- * See https://stackoverflow.com/questions/43587286/why-does-instanceof-return-false-on-chrome-safari-and-edge-and-true-on-firefox
- * for more details.
- *
- * @param {EventTarget}   Pelem       An element of the web page or one of its IFrame-based subdocuments.
- * @param {string}        className   The plain-text name of the expected Element type.
- * @return {boolean}
- */
-export function nestedInstanceOf(Pelem: EventTarget, className: string): boolean {
-  let scopedClass;
-
-  if(!Pelem) {
-    // If we're bothering to check something's type, null references don't match
-    // what we're looking for.
-    return false;
-  }
-  // @ts-ignore
-  if (Pelem['Window']) { // Window objects contain the class definitions for types held within them.  So, we can check for those.
-    return className == 'Window';
-    // @ts-ignore
-  } else if (Pelem['defaultView']) { // Covers Document.
-    // @ts-ignore
-    scopedClass = (Pelem as Document)['defaultView'][className];
-    // @ts-ignore
-  } else if(Pelem['ownerDocument']) {
-    // @ts-ignore
-    scopedClass = (Pelem as Node).ownerDocument.defaultView[className];
-  }
-
-  if(scopedClass) {
-    return Pelem instanceof scopedClass;
-  } else {
-    return false;
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/src/element-text-stores/readme.md b/web/src/engine/src/element-text-stores/readme.md
index 4e40b46178..d4a5e94da3 100644
--- a/web/src/engine/src/element-text-stores/readme.md
+++ b/web/src/engine/src/element-text-stores/readme.md
@@ -1,4 +1,4 @@
-## engine/element-wrappers
+## engine/element-text-stores
 
 This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage
 elements as part of KMW attachment and interface the element with the `keyboard` submodule.

From 7a7dcf887841e105f4d03ab7726b82071dedaed8 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 22 May 2025 19:05:02 +0200
Subject: [PATCH 83/83] chore(web): apply suggestions from code review

Theses changes come out of code review of #12291.

Follow-up-of: #12291
Test-bot: skip
---
 web/src/app/browser/src/keymanEngine.ts     | 2 +-
 web/src/engine/src/main/keymanEngineBase.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 200b205a0a..a2a3eab486 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -443,7 +443,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
       kbd = this.core.activeKeyboard;
     }
 
-    // TODO-web-core: implement for KMX keyboards if needed
+    // We only support isCJK on legacy .js keyboards; see #7928
     return kbd && kbd instanceof JSKeyboard && kbd.isCJK;
   }
 
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index ce41ec7323..168be7c42a 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -1,4 +1,4 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, KMXKeyboard } from "keyman/engine/keyboard";
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 // TODO-web-core: remove alias
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard";
@@ -566,7 +566,7 @@ export class KeymanEngineBase<
         const kbdObj = this.keyboardRequisitioner.cache.getKeyboard(k0);
         if (!kbdObj) {
           throw new Error(`Keyboard '${k0}' has not been loaded.`);
-        } else if (!(kbdObj instanceof JSKeyboard)) {
+        } else if (kbdObj instanceof KMXKeyboard) {
           return false; // TODO-web-core: implement for KMX keyboards
         } else {
           k0 = kbdObj;