Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (#17331)

* Update to CUDA 11.3 on Windows.

* Update PowerShell to 7.1.3.

* Update CUDA to 11.3 on Linux.

* "Explode" VM provisioning scripts for more consistent feedback during deploy. This resolves the deployment script often hanging with no feedback as to why.

* [libdatachannel] Fix use of deprecated result_type typedef.

Submitted upstream as https://github.com/paullouisageneau/libdatachannel/pull/413

* [libvpx] Get the libvpx outputs from the correct place.

(Perhaps VS2019 version 16.10 moved where these are placed? I've been defensive and left an attempt to find from the old location in place.)

* [chromaprint] Support implementations where lrintf is an intrinsic.

* Add provision-entire-image script.

* [cudnn] Disable download-on-the-fly due to licensing concerns.

* Add libnccl to Linux VMs.

* [wangle] Disable x64-windows due to an ICE.

* [cmake] Update cmake to 3.20.1 to avoid https://gitlab.kitware.com/cmake/cmake/-/issues/21571 race

* [libudis86] Fix passing a bogus working directory which fails on CMake 3.20.x

* [dartsim] Disable unit tests, examples, and tutorials, some of which have CMake authoring errors rejected by 3.20.1.

* Add thrust to the cuda installees.

* [tensorflow] Put .bzl in CURRENT_BUILDTREES_DIR to avoid running out of disk space in CI and to respect --clean-after-build.

* [dimcli] Skip port broken by changes in VS2019 project system.

* [upb] Disable an additional warning.

* [libhv] Fix typo DISABLE_PARALLEL => DISABLE_PARALLEL_CONFIGURE

* Update pools

22 files changed, 132 insertions, 108 deletions

diff --git a/ports/chromaprint/fix_lrintf_detection.patch b/ports/chromaprint/fix_lrintf_detection.patch
new file mode 100644
index 000000000..27248f0c8
--- /dev/null
+++ b/ports/chromaprint/fix_lrintf_detection.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 3a0eecb..4fa5e8d 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -17,6 +17,7 @@ set_property(CACHE FFT_LIB PROPERTY STRINGS avfft fftw3 fftw3f kissfft vdsp)

+ 

+ include(CMakePushCheckState)

+ include(CheckFunctionExists)

++include(CheckSymbolExists)

+ include(CheckCXXCompilerFlag)

+ 

+ find_package(Threads)

+@@ -37,8 +38,8 @@ endif()

+ 

+ cmake_push_check_state(RESET)

+ set(CMAKE_REQUIRED_LIBRARIES -lm)

+-check_function_exists(lrintf HAVE_LRINTF)

+-check_function_exists(round HAVE_ROUND)

++check_symbol_exists(lrintf math.h HAVE_LRINTF)

++check_symbol_exists(round math.h HAVE_ROUND)

+ cmake_pop_check_state()

+ 

+ add_definitions(

diff --git a/ports/chromaprint/portfile.cmake b/ports/chromaprint/portfile.cmake
index da430faa5..286edaeb3 100644
--- a/ports/chromaprint/portfile.cmake
+++ b/ports/chromaprint/portfile.cmake
@@ -3,6 +3,8 @@ vcpkg_from_github(
     REPO acoustid/chromaprint
     REF v1.5.0
     SHA512 333114949928abdf5d4b11aba1db6ec487eebe526324c68d903b3fa80a3af87a28d942af765a2f873e63a1bf222b658b6438cd10cde4446f61b26ea91f537469
+    PATCHES
+        fix_lrintf_detection.patch # submitted upstream as https://github.com/acoustid/chromaprint/pull/85
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/chromaprint/vcpkg.json b/ports/chromaprint/vcpkg.json
index 4808008c9..271532380 100644
--- a/ports/chromaprint/vcpkg.json
+++ b/ports/chromaprint/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "chromaprint",
-  "version-string": "1.5.0",
+  "version": "1.5.0",
+  "port-version": 1,
   "description": "C library for generating audio fingerprints used by AcoustID",
   "homepage": "https://github.com/acoustid/chromaprint",
   "license": "LGPL-2.1-or-later",
diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL
index ebb814349..db910a7bc 100644
--- a/ports/cudnn/CONTROL
+++ b/ports/cudnn/CONTROL
@@ -1,6 +1,6 @@
 Source: cudnn
 Version: 7.6.5
-Port-Version: 1
+Port-Version: 2
 Description: NVIDIA's cuDNN deep neural network acceleration library
 Build-Depends: cuda
 Supports: (windows|linux)&x64
diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake
index 1c1f0641e..6a0083130 100644
--- a/ports/cudnn/portfile.cmake
+++ b/ports/cudnn/portfile.cmake
@@ -7,7 +7,6 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 endif()
 
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
-set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # only release bits are provided
 
 set(MINIMUM_CUDNN_VERSION "7.6.5")
 
@@ -64,74 +63,10 @@ if(CUDNN_HEADER_CONTENTS)
 endif()
 
 if (CUDNN_INCLUDE_DIR AND CUDNN_LIBRARY AND _CUDNN_VERSION VERSION_GREATER_EQUAL MINIMUM_CUDNN_VERSION)
-  set(CUDNN_FOUND TRUE)
-else()
-  set(CUDNN_FOUND FALSE)
-endif()
-
-# Download CUDNN if not found
-if (CUDNN_FOUND)
   message(STATUS "Found CUDNN ${_CUDNN_VERSION} located on system: (include ${CUDNN_INCLUDE_DIR} lib: ${CUDNN_LIBRARY})")
   set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-elseif(CUDA_VERSION VERSION_EQUAL "10.1" OR CUDA_VERSION VERSION_EQUAL "10.2")
-  message(STATUS "CUDNN not found on system - downloading a version compatible with your CUDA v${CUDA_VERSION}...")
-  if(${CUDA_VERSION} VERSION_EQUAL "10.1")
-    set(CUDNN_VERSION "7.6.5")
-    set(CUDNN_VERSION_MAJOR "7")
-    set(CUDNN_FULL_VERSION "7.6.5-cuda10.1_0")
-    if(VCPKG_TARGET_IS_WINDOWS)
-      set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/win-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2")
-      set(SHA512_CUDNN "0fb18dd49de877ad6bae24b53ffe007a99915cc9601697a556897e018cc6d99d3aa68716ea99248cf6a9dfaeeb1a551453c606d04e8bbb3e9315bf768184f15b")
-      set(CUDNN_OS "windows")
-    elseif(VCPKG_TARGET_IS_LINUX)
-      set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/linux-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2")
-      set(SHA512_CUDNN "4d901d96ee8f37e3977240b9e6e6eeecb33848388db953a789be47de8f357d815c3a106ceab04297c4df0d8ed9c2795b2a22304e93cd1e53322307d3f3cd668e")
-      set(CUDNN_OS "linux")
-    endif()
-  elseif(${CUDA_VERSION} VERSION_EQUAL "10.2")
-    set(CUDNN_VERSION "7.6.5")
-    set(CUDNN_VERSION_MAJOR "7")
-    set(CUDNN_FULL_VERSION "7.6.5-cuda10.2_0")
-    if(VCPKG_TARGET_IS_WINDOWS)
-      set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/win-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2")
-      set(SHA512_CUDNN "86ca2f5f510d4fbeb37548d0bcab42474a1c4041be2cf96c4964f1e51c3641dc4bf25e8434cd5ff99fac9f53946e5f0e83bd845613144731d136cd60913d4aaa")
-      set(CUDNN_OS "windows")
-    elseif(VCPKG_TARGET_IS_LINUX)
-      set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/linux-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2")
-      set(SHA512_CUDNN "b15b554c2ec004105cec8ee2a99f33fab0f9aed12128522730be4fa6204a5b2dff29e42901b5c4840b5ebf35607e8a54f35eb30525885067165b05dd95aa391b")
-      set(CUDNN_OS "linux")
-    endif()
-  endif()
-
-  vcpkg_download_distfile(ARCHIVE
-      URLS ${CUDNN_DOWNLOAD_LINK}
-      FILENAME "cudnn-${CUDNN_FULL_VERSION}-${CUDNN_OS}.tar.bz2"
-      SHA512 ${SHA512_CUDNN}
-  )
-
-  vcpkg_extract_source_archive_ex(
-      OUT_SOURCE_PATH SOURCE_PATH
-      ARCHIVE ${ARCHIVE}
-      NO_REMOVE_ONE_LEVEL
-  )
-
-  if(VCPKG_TARGET_IS_WINDOWS)
-    file(INSTALL "${SOURCE_PATH}/Library/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-    file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    set(LICENSE_PATH "${SOURCE_PATH}/info/LICENSE.txt")
-  elseif(VCPKG_TARGET_IS_LINUX)
-    file(INSTALL "${SOURCE_PATH}/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-    file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    set(LICENSE_PATH "${SOURCE_PATH}/info/licenses/NVIDIA_SLA_cuDNN_Support.txt")
-  endif()
-
-  file(INSTALL "${LICENSE_PATH}" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-  file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-  file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
-else() # CUDNN NOT FOUND AND NOT AUTO-DOWNLOADABLE
-  message(FATAL_ERROR "Please install manually cuDNN for your CUDA v${CUDA_VERSION}")
+elseif(VCPKG_TARGET_IS_WINDOWS)
+  message(FATAL_ERROR "Please download CUDNN from official sources (such as https://developer.nvidia.com/rdp/cudnn-download ) and extract the zip into your CUDA_TOOLKIT_ROOT (${CUDA_TOOLKIT_ROOT}). (For example: tar.exe -xvf cudnn-11.2-windows-x64-v8.1.1.33.zip --strip 1 --directory \"${CUDA_TOOLKIT_ROOT}\"")
+else()
+  message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.")
 endif()
diff --git a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch
new file mode 100644
index 000000000..08119ce39
--- /dev/null
+++ b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e32147d..5c85186 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -279,6 +279,7 @@ add_subdirectory(dart)
+ 
+ set(DART_IN_SOURCE_BUILD TRUE)
+ 
++if (0)
+ if(TARGET dart AND NOT DART_BUILD_DARTPY)
+ 
+   # Add a "tests" target to build unit tests.
+@@ -330,6 +331,7 @@ if(TARGET dart AND NOT DART_BUILD_DARTPY)
+   endif(DART_VERBOSE)
+ 
+ endif()
++endif()
+ 
+ if (DART_BUILD_DARTPY)
+   add_subdirectory(python)
diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake
index 0af5f8e9a..c208482f1 100644
--- a/ports/dartsim/portfile.cmake
+++ b/ports/dartsim/portfile.cmake
@@ -7,20 +7,23 @@ vcpkg_from_github(
     REF v6.9.4

     SHA512 a9e8712a294286772ee1e3c3899aac7d202f1d3c2b9242ebeaddb2a142787b192d5421a6e3f889dd9ff9ca9e9106b1f893a0c8ab2e1656b04fac6d0be13494ba

     HEAD_REF release-6.9

-    PATCHES 1478.patch

-            1497.patch

+    PATCHES

+        1478.patch

+        1497.patch

+        disable_unit_tests_examples_and_tutorials.patch

 )

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

-    OPTIONS -DDART_VERBOSE=ON

-            -DDART_MSVC_DEFAULT_OPTIONS=ON

-            -DDART_SKIP_DOXYGEN=ON

-            -DDART_SKIP_FLANN=ON

-            -DDART_SKIP_IPOPT=ON

-            -DDART_SKIP_NLOPT=ON

-            -DDART_SKIP_OPENGL=ON

-            -DDART_SKIP_pagmo=ON

+    OPTIONS

+        -DDART_VERBOSE=ON

+        -DDART_MSVC_DEFAULT_OPTIONS=ON

+        -DDART_SKIP_DOXYGEN=ON

+        -DDART_SKIP_FLANN=ON

+        -DDART_SKIP_IPOPT=ON

+        -DDART_SKIP_NLOPT=ON

+        -DDART_SKIP_OPENGL=ON

+        -DDART_SKIP_pagmo=ON

 )

 

 vcpkg_install_cmake()

@@ -36,5 +39,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 

 # Handle copyright

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dartsim RENAME copyright)

-

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json
index 0029e6c3c..5f4c00b18 100644
--- a/ports/dartsim/vcpkg.json
+++ b/ports/dartsim/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dartsim",
-  "version-string": "6.9.4",
+  "version": "6.9.4",
+  "port-version": 1,
   "description": "Dynamic Animation and Robotics Toolkit",
   "homepage": "https://dartsim.github.io/",
   "dependencies": [
diff --git a/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch b/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch
new file mode 100644
index 000000000..f41945c28
--- /dev/null
+++ b/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch
@@ -0,0 +1,25 @@
+diff --git a/include/rtc/utils.hpp b/include/rtc/utils.hpp
+index f1a82acb..e882042c 100644
+--- a/include/rtc/utils.hpp
++++ b/include/rtc/utils.hpp
+@@ -25,6 +25,7 @@
+ #include <functional>
+ #include <memory>
+ #include <mutex>
++#include <utility>
+ 
+ namespace rtc {
+ 
+@@ -34,11 +35,10 @@ template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+ // weak_ptr bind helper
+ template <typename F, typename T, typename... Args> auto weak_bind(F &&f, T *t, Args &&..._args) {
+ 	return [bound = std::bind(f, t, _args...), weak_this = t->weak_from_this()](auto &&...args) {
+-		using result_type = typename decltype(bound)::result_type;
+ 		if (auto shared_this = weak_this.lock())
+ 			return bound(args...);
+ 		else
+-			return static_cast<result_type>(false);
++			return static_cast<decltype(bound(args...))>(false);
+ 	};
+ }
+ 
diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake
index 8b1a6c3a9..563224524 100644
--- a/ports/libdatachannel/portfile.cmake
+++ b/ports/libdatachannel/portfile.cmake
@@ -1,11 +1,12 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO paullouisageneau/libdatachannel

-    REF v0.12.0

-    SHA512 878d0461255620c21597a6b7132ac0c9d1bcba19e32809cdd007039041eacc1f30a73b1c11c43b8b57a82ca1efeae2090822e6c5e13bd98f5afa086ec147e6e7

+    REF 655175d21e58281031c940a94042d5d1fd46efb3 # v 0.12.2

+    SHA512 e1e228bf720ef57130fbb9cc33310cebbdbd16c001455cd56e8746b6ee41bac56da5e5a90235e0a826b52711dc3c95b9d9f56d9e406999f9fd384aee2892578d

     HEAD_REF master

     PATCHES

         fix-for-vcpkg.patch

+        CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch # submitted upstream as https://github.com/paullouisageneau/libdatachannel/pull/413

 )

 

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json
index 6dddc4dc7..7ba32db68 100644
--- a/ports/libdatachannel/vcpkg.json
+++ b/ports/libdatachannel/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libdatachannel",
-  "version-semver": "0.12.0",
+  "version-semver": "0.12.2",
   "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
   "homepage": "https://github.com/paullouisageneau/libdatachannel",
   "dependencies": [
diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake
index 01c6f83a5..f54897107 100644
--- a/ports/libhv/portfile.cmake
+++ b/ports/libhv/portfile.cmake
@@ -14,7 +14,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    DISABLE_PARALLEL
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_EXAMPLES=OFF
         -DBUILD_UNITTEST=OFF
diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json
index c6e1a50f7..d16fbeccf 100644
--- a/ports/libhv/vcpkg.json
+++ b/ports/libhv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libhv",
   "version": "1.0.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Libhv is a C/C++ network library similar to libevent/libuv.",
   "homepage": "https://github.com/ithewei/libhv",
   "supports": "!(arm | uwp)"
diff --git a/ports/libudis86/CONTROL b/ports/libudis86/CONTROL
deleted file mode 100644
index 8e67b89cc..000000000
--- a/ports/libudis86/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: libudis86
-Version: 2018-01-28-56ff6c87
-Homepage: https://github.com/vmt/udis86
-Description: Disassembler Library for x86 and x86-64 
diff --git a/ports/libudis86/portfile.cmake b/ports/libudis86/portfile.cmake
index a1ae6e539..42d99d38a 100644
--- a/ports/libudis86/portfile.cmake
+++ b/ports/libudis86/portfile.cmake
@@ -11,8 +11,8 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_find_acquire_program(PYTHON2)
 
 vcpkg_execute_required_process(
-    COMMAND ${PYTHON2} ${SOURCE_PATH}/scripts/ud_itab.py  ${SOURCE_PATH}/docs/x86/optable.xml ${SOURCE_PATH}/libudis86/
-    WORKING_DIRECTORY SOURCE_PATH
+    COMMAND "${PYTHON2}" "${SOURCE_PATH}/scripts/ud_itab.py" "${SOURCE_PATH}/docs/x86/optable.xml" "${SOURCE_PATH}/libudis86/"
+    WORKING_DIRECTORY "${SOURCE_PATH}"
     LOGNAME python-${TARGET_TRIPLET}-generate-sources
 )
 
@@ -20,12 +20,12 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS_DEBUG
-    -DDISABLE_INSTALL_HEADERS=ON
-    -DDISABLE_INSTALL_TOOLS=ON
+        -DDISABLE_INSTALL_HEADERS=ON
+        -DDISABLE_INSTALL_TOOLS=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libudis86)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libudis86 RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libudis86/vcpkg.json b/ports/libudis86/vcpkg.json
new file mode 100644
index 000000000..a687a4104
--- /dev/null
+++ b/ports/libudis86/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "libudis86",
+  "version-string": "2018-01-28-56ff6c87",
+  "port-version": 1,
+  "description": "Disassembler Library for x86 and x86-64",
+  "homepage": "https://github.com/vmt/udis86"
+}
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index e888d7fc4..2f3f3680d 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -99,14 +99,23 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     )
 
     # note: pdb file names are hardcoded in the lib file, cannot rename
+    set(LIBVPX_OUTPUT_PREFIX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}")
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb")
+            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        else()
+            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        endif()
     endif()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb")
+            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        else()
+            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        endif()
     endif()
 
     if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
@@ -130,13 +139,13 @@ else()
 
     set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug")
     set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}")
-	
+
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         set(OPTIONS "${OPTIONS} --disable-static --enable-shared")
     else()
         set(OPTIONS "${OPTIONS} --enable-static --disable-shared")
     endif()
-    
+
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
         set(LIBVPX_TARGET_ARCH "x86")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json
index ce3de0341..f0991561c 100644
--- a/ports/libvpx/vcpkg.json
+++ b/ports/libvpx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libvpx",
   "version-semver": "1.9.0",
-  "port-version": 8,
+  "port-version": 9,
   "description": "The reference software implementation for the video coding formats VP8 and VP9.",
   "homepage": "https://github.com/webmproject/libvpx"
 }
diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake
index 18011257e..4746fcda4 100644
--- a/ports/tensorflow-common/tensorflow-common.cmake
+++ b/ports/tensorflow-common/tensorflow-common.cmake
@@ -45,7 +45,7 @@ set(ENV{PYTHON_LIB_PATH} "${PYTHON_LIB_PATH}")
 vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import numpy" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-numpy-${TARGET_TRIPLET})
 
 # tensorflow has long file names, which will not work on windows
-set(ENV{TEST_TMPDIR} ${BUILDTREES_DIR}/.bzl)
+set(ENV{TEST_TMPDIR} "${CURRENT_BUILDTREES_DIR}/.bzl")
 
 set(ENV{USE_DEFAULT_PYTHON_LIB_PATH} 1)
 set(ENV{TF_NEED_KAFKA} 0)
@@ -439,4 +439,4 @@ else()
 	endif()
 endif()
 
-message(STATUS "You may want to delete ${CURRENT_BUILDTREES_DIR} and ${BUILDTREES_DIR}/.bzl to free diskspace.")
+message(STATUS "You may want to delete ${CURRENT_BUILDTREES_DIR} to free diskspace.")
diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json
index 7477461b3..447d665b5 100644
--- a/ports/tensorflow-common/vcpkg.json
+++ b/ports/tensorflow-common/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tensorflow-common",
   "version-semver": "2.4.1",
+  "port-version": 1,
   "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
   "homepage": "https://github.com/tensorflow/tensorflow"
 }
diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch
index cbd62f602..c681fa336 100644
--- a/ports/upb/fix-uwp.patch
+++ b/ports/upb/fix-uwp.patch
@@ -7,7 +7,7 @@ index a6b432f..003615e 100644
  endif()
  
 +if (MSVC)
-+  add_compile_options(/wd4146 -D_CRT_SECURE_NO_WARNINGS)
++  add_compile_options(/wd4146 /wd4703 -D_CRT_SECURE_NO_WARNINGS)
 +endif()
 +
  enable_testing()
diff --git a/ports/upb/vcpkg.json b/ports/upb/vcpkg.json
index 3213d796f..058833064 100644
--- a/ports/upb/vcpkg.json
+++ b/ports/upb/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "upb",
   "version-date": "2020-12-19",
+  "port-version": 1,
   "description": "μpb (often written 'upb') is a small protobuf implementation written in C.",
   "homepage": "https://github.com/protocolbuffers/upb/"
 }