diff --git a/ports/wintoast/portfile.cmake b/ports/wintoast/portfile.cmake
index c99d50212d..3cbb33b65e 100644
--- a/ports/wintoast/portfile.cmake
+++ b/ports/wintoast/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
@@ -12,19 +8,18 @@ vcpkg_from_github(
   HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_RELEASE -DINSTALL_HEADERS=ON
     OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
     
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Install license
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/wintoast/vcpkg.json b/ports/wintoast/vcpkg.json
index 2d0a41de5d..b96aa95b30 100644
--- a/ports/wintoast/vcpkg.json
+++ b/ports/wintoast/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "wintoast",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.0",
+  "port-version": 2,
   "description": "WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10.",
-  "supports": "!uwp"
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b8a62208d3..4b0de10b1b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1543,10 +1543,6 @@ winreg:x64-linux=fail
 winreg:x64-osx=fail
 winsock2:x64-linux=fail
 winsock2:x64-osx=fail
-wintoast:arm-uwp=fail
-wintoast:x64-linux=fail
-wintoast:x64-osx=fail
-wintoast:x64-uwp=fail
 wpilib:arm64-windows=fail
 wpilib:x64-osx=fail
 wxchartdir:x64-osx=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index bfdbc2a8ea..988d310abf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7302,7 +7302,7 @@
     },
     "wintoast": {
       "baseline": "1.2.0",
-      "port-version": 1
+      "port-version": 2
     },
     "woff2": {
       "baseline": "1.0.2",
diff --git a/versions/w-/wintoast.json b/versions/w-/wintoast.json
index 712905b577..b61765e3e8 100644
--- a/versions/w-/wintoast.json
+++ b/versions/w-/wintoast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7e0b224e777c1a12676204204a97636e3639c4c1",
+      "version": "1.2.0",
+      "port-version": 2
+    },
     {
       "git-tree": "186a3b60dc0a76ecb0b1a5a2147306dbfe734797",
       "version-string": "1.2.0",