microsoft · BillyONeal · Sep 17, 2021 · Sep 8, 2021 · Sep 17, 2021 · Sep 17, 2021
diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "atk",
   "version": "2.36.0",
+  "port-version": 1,
   "description": "GNOME Accessibility Toolkit",
   "homepage": "https://developer.gnome.org/atk/",
-  "supports": "!(osx | arm)",
+  "supports": "!arm",
   "dependencies": [
     "gettext",
     "glib",

diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "atkmm",
   "version": "2.36.0",
+  "port-version": 1,
   "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.",
   "homepage": "https://www.gtkmm.org",
-  "supports": "!osx",
   "dependencies": [
     "atk",
     "gettext",

diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "azure-kinect-sensor-sdk",
   "version": "1.4.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
   "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
-  "supports": "!osx",
+  "supports": "linux & windows",
   "dependencies": [
     "azure-c-shared-utility",
     "cjson",

diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "behaviortree-cpp",
   "version": "3.5.6",
+  "port-version": 1,
   "description": "Behavior Trees Library in C++.",
   "homepage": "https://www.behaviortree.dev",
-  "supports": "!uwp & !osx",
+  "supports": "!uwp",
   "dependencies": [
     "boost-coroutine2",
     "cppzmq"

diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "bitserializer",
   "version": "0.10",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML",
   "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer",
-  "supports": "!(arm | osx)",
   "default-features": [
     "cpprestjson-archive",
     "pugixml-archive",

diff --git a/ports/directxsdk/vcpkg.json b/ports/directxsdk/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "directxsdk",
   "version-string": "jun10",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Legacy DirectX SDK",
   "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-",
-  "supports": "windows & !windows",
+  "supports": "windows & !uwp & !arm",
   "features": {
     "xaudio2-7": {
       "description": "Include headers/libs for legacy XAudio 2.7 (prefer use of XAudio2Redist)"

diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake
@@ -13,10 +13,9 @@ file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake")
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME)
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    PREFER_NINJA
     OPTIONS
         -DEMBREE_ISPC_SUPPORT=OFF
         -DEMBREE_TUTORIALS=OFF
@@ -28,14 +27,16 @@ vcpkg_configure_cmake(
 
 # just wait, the release build of embree is insanely slow in MSVC
 # a single file will took about 2-10 min
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # these cmake files do not seem to contain helpful configuration for find libs, just remove them
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/uninstall.command" "${CURRENT_PACKAGES_DIR}/debug/uninstall.command")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json
@@ -1,11 +1,14 @@
 {
   "name": "embree2",
   "version-semver": "2.17.7",
-  "port-version": 2,
+  "port-version": 3,
   "description": "High Performance Ray Tracing Kernels.",
   "homepage": "https://github.com/embree/embree",
-  "supports": "windows",
   "dependencies": [
-    "tbb"
+    "tbb",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/ports/freealut/vcpkg.json b/ports/freealut/vcpkg.json
@@ -1,12 +1,13 @@
 {
   "name": "freealut",
-  "version-string": "1.1.0",
+  "version": "1.1.0",
+  "port-version": 1,
   "description": [
     "FreeALUT is a free implementation of OpenAL's ALUT standard.",
     "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. "
   ],
   "homepage": "https://github.com/vancegroup/freealut",
-  "supports": "!uwp & !arm & !arm64",
+  "supports": "!uwp",
   "dependencies": [
     "openal-soft",
     {

diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake
@@ -1,12 +1,9 @@
 set(VCPKG_LIBRARY_LINKAGE "dynamic")
 
-message(WARNING "Download ${PORT} may take a several hours to complete!")
-message(WARNING "Port ${PORT} source resides NGA US Government military ftp server with an extremely slow connection.")
-
 # We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries
 # which we re-build anyway.  There is no source only package provided or it would be preferred (and smaller).
 vcpkg_download_distfile(ARCHIVE
-    URLS "ftp://ftp.nga.mil/pub2/gandg/website/wgs84/apps/geotrans/current-version/sw/master_version/master.tgz"
+    URLS "https://earth-info.nga.mil/php/download.php?file=wgs-mastertgz"
     FILENAME "geotrans-3.8-master.tgz"
     SHA512 359704ee9700762111006d126872feab9f644af0cebd433a657473347ea48f4eb172681f5f564fbca171bbf58fe0e8fb0829597403958770b7d22ad380afeac3
 )

diff --git a/ports/geotrans/vcpkg.json b/ports/geotrans/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "geotrans",
-  "version-string": "3.8",
+  "version": "3.8",
+  "port-version": 1,
   "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.",
   "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home",
-  "supports": "(((x86 | x64) & windows & !static) | ((x86 | x64) & linux)) & !uwp & !arm & !arm64 & !osx & !android"
+  "supports": "!uwp"
 }
diff --git a/ports/iir1/vcpkg.json b/ports/iir1/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "iir1",
   "version": "1.8.0",
+  "port-version": 1,
   "description": "Realtime C++ filter library",
   "homepage": "https://github.com/berndporr/iir1",
   "license": "MIT",
-  "supports": "!uwp & !osx"
+  "supports": "!uwp"
 }
diff --git a/ports/libcbor/vcpkg.json b/ports/libcbor/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libcbor",
-  "version-string": "0.8.0",
+  "version": "0.8.0",
+  "port-version": 1,
   "description": "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format",
-  "homepage": "https://github.com/PJK/libcbor",
-  "supports": "(x86 | x64) & windows"
+  "homepage": "https://github.com/PJK/libcbor"
 }
diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "libunifex",
   "version-date": "2021-08-01",
+  "port-version": 1,
   "description": "Unified Executors",
   "homepage": "https://github.com/facebookexperimental/libunifex",
-  "supports": "!osx",
   "dependencies": [
     {
       "name": "liburing",

diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libxmlpp",
   "version": "5.0.0",
+  "port-version": 1,
   "description": "a C++ wrapper for the libxml XML parser library.",
   "supports": "!(windows & static)",
   "dependencies": [

diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "matplotplusplus",
   "version-date": "2021-04-11",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A C++ graphics library for data visualization",
   "homepage": "https://alandefreitas.github.io/matplotplusplus/",
   "license": "MIT",
-  "supports": "!(arm | uwp)",
+  "supports": "!uwp & !(windows & arm)",
   "dependencies": [
     "cimg",
     {

diff --git a/ports/portmidi/vcpkg.json b/ports/portmidi/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "portmidi",
-  "version-string": "0.234",
-  "port-version": 2,
+  "version": "0.234",
+  "port-version": 3,
   "description": "Free, cross-platform, open-source I/O library for MIDI",
   "homepage": "https://sourceforge.net/projects/portmedia/",
-  "supports": "!(uwp | arm)",
+  "supports": "!uwp & !linux",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/xnnpack/vcpkg.json b/ports/xnnpack/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "xnnpack",
   "version-date": "2021-05-17",
+  "port-version": 1,
   "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web",
   "homepage": "https://github.com/google/XNNPACK",
-  "supports": "!arm & !uwp",
+  "supports": "!(arm & windows) & !uwp",
   "dependencies": [
     "cpuinfo",
     "fp16",

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -54,6 +54,9 @@ aubio:arm-uwp=fail
 aubio:x64-uwp=fail
 # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
 bde:x64-linux=fail
+bitserializer:x64-osx=fail
+bitserializer:arm64-windows=fail
+bitserializer:arm-uwp=fail
 blend2d:arm64-windows=fail
 blend2d:arm-uwp=fail
 blend2d:x64-uwp=fail

diff --git a/versions/a-/atk.json b/versions/a-/atk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cf5656ae96a202ad1846f5cb233cc4daf4f3336d",
+      "version": "2.36.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b8ace143cf9715262f419c85a5840fa15a4cf0ce",
       "version": "2.36.0",

diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "340ce8d9ccb6154374ecbe6bf6c9a70b83442578",
+      "version": "2.36.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1feae8dc89c99e89b47bb8a028cca2e77d9d4352",
       "version": "2.36.0",

diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "11fbd98a9560da0ad96abf61d8731778db6e5b8b",
+      "version": "1.4.1",
+      "port-version": 3
+    },
     {
       "git-tree": "012a033caf02486f3079b0c42036a807f3a7c4d7",
       "version": "1.4.1",

diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "96c8331bb642e665bd66a9aa82797d4db84b86fa",
+      "version": "3.5.6",
+      "port-version": 1
+    },
     {
       "git-tree": "32f97d9bfd43e38949f858a9ce271117b0380c85",
       "version": "3.5.6",

diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ea63e330fbf462f7d5ab3fa119d105501366ea9c",
+      "version": "0.10",
+      "port-version": 2
+    },
     {
       "git-tree": "a840c1d638565cbc8c4fd9a4200c0f54136275d7",
       "version": "0.10",