Merge remote-tracking branch 'origin/master' into HEAD

2024-12-29 20:23:41 +08:00 · 2020-02-04 15:50:10 -08:00 · 2020-02-04 15:50:10 -08:00 · 6f66ad14fe
commit 6f66ad14fe
parent d502f061bb d808514c9d
822 changed files with 7939 additions and 4805 deletions
--- a/.gitignore
+++ b/.gitignore
@ -294,15 +294,19 @@ __pycache__/
 #ignore custom triplets
 /triplets/*
 #add vcpkg-designed triplets back in
+!triplets/community/arm64-mingw.cmake
+!triplets/community/arm64-uwp.cmake
+!triplets/community/arm-mingw.cmake
+!triplets/community/arm-windows.cmake
+!triplets/community/x64-mingw.cmake
+!triplets/community/x86-mingw.cmake
+!triplets/community/x86-uwp.cmake
+!triplets/community/x86-windows-static.cmake
 !triplets/arm-uwp.cmake
-!triplets/arm-windows.cmake
 !triplets/x64-uwp.cmake
 !triplets/x64-windows.cmake
 !triplets/x64-windows-static.cmake
-!triplets/x86-uwp.cmake
 !triplets/x86-windows.cmake
-!triplets/x86-windows-static.cmake
-!triplets/arm64-uwp.cmake
 !triplets/arm64-windows.cmake
 !triplets/x64-linux.cmake
 !triplets/x64-osx.cmake
--- a/docs/maintainers/control-files.md
+++ b/docs/maintainers/control-files.md
@ -8,7 +8,7 @@ Field names are case-sensitive and start the line without leading whitespace.  P

 ## Source Paragraph

-The first paragraph in a `CONTROL` file is the Source paragraph.  It must have a `Source`, `Version`, and `Description` field.  It can optionally have a `Build-Depends` and `Default-Features` field.
+The first paragraph in a `CONTROL` file is the Source paragraph.  It must have a `Source`, `Version`, and `Description` field. The full set of fields is documented below.

 ### Examples:
 ```no-highlight
@ -58,7 +58,7 @@ For example, given:

 Then if you update the source version today, you should give it version `2019-06-01`. If you need to make a change which doesn't adjust the source version, you should give it version `2019-02-14-2`.

-Example:
+##### Examples:
 ```no-highlight
 Version: 1.0.5-2
 ```
@ -71,7 +71,7 @@ A description of the library.

 By convention the first line of the description is a summary of the library.  An optional detailed description follows.  The detailed description can be multiple lines, all starting with whitespace.

-Example:
+##### Examples:
 ```no-highlight
 Description: C++ header-only JSON library
 ```
@ -96,17 +96,13 @@ Vcpkg does not distinguish between build-only dependencies and runtime dependenc

 *For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*

-Example:
-```no-highlight
-Build-Depends: zlib, libpng, libjpeg-turbo, tiff
-```
-If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax.
+If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax. If the port does not require any features from the dependency, this should be specifed as `portname[core]`.

-Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name.  There must be a space between the name of the port and the filter. __This will change in a future version to not depend on the triplet name.__
+Dependencies can be filtered based on the target triplet to support differing requirements. These filters use the same syntax as the Supports field below and are surrounded in parentheses following the portname and feature list.

-Example:
+##### Example:
 ```no-highlight
-Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx)
+Build-Depends: rapidjson, curl[core,openssl] (!windows), curl[core,winssl] (windows)
 ```

 #### Default-Features
@ -114,10 +110,46 @@ Comma separated list of optional port features to install by default.

 This field is optional.

+##### Example:
 ```no-highlight
 Default-Features: dynamodb, s3, kinesis
 ```

+<a name="Supports"></a>
+#### Supports
+Expression that evaluates to true when the port is expected to build successfully for a triplet.
+
+Currently, this field is only used in the CI testing to skip ports. In the future, this mechanism is intended to warn users in advance that a given install tree is not expected to succeed. Therefore, this field should be used optimistically; in cases where a port is expected to succeed 10% of the time, it should still be marked "supported".
+
+The grammar for the supports expression uses standard operators:
+- `!expr` - negation
+- `expr|expr` - or (`||` is also supported)
+- `expr&expr` - and (`&&` is also supported)
+- `(expr)` - grouping/precedence
+
+The predefined expressions are computed from standard triplet settings:
+- `x64` - `VCPKG_TARGET_ARCHITECTURE` == `"x64"`
+- `x86` - `VCPKG_TARGET_ARCHITECTURE` == `"x86"`
+- `arm` - `VCPKG_TARGET_ARCHITECTURE` == `"arm"` or `VCPKG_TARGET_ARCHITECTURE` == `"arm64"`
+- `arm64` - `VCPKG_TARGET_ARCHITECTURE` == `"arm64"`
+- `windows` - `VCPKG_CMAKE_SYSTEM_NAME` == `""` or `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"`
+- `uwp` - `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"`
+- `linux` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Linux"`
+- `osx` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Darwin"`
+- `android` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Android"`
+- `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"`
+
+These predefined expressions can be overridden in the triplet file via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option.
+
+This field is optional and defaults to true.
+
+> Implementers' Note: these terms are computed from the triplet via the `vcpkg_get_dep_info` mechanism.
+
+##### Example:
+```no-highlight
+Supports: !(uwp|arm)
+```
+
 ## Feature Paragraphs

 Multiple optional features can be specified in the `CONTROL` files.  It must have a `Feature` and `Description` field.  It can optionally have a `Build-Depends` field.  It must be separated from other paragraphs by one or more empty lines.
--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@ -2,12 +2,29 @@

 Triplet is a standard term used in cross compiling as a way to completely capture the target environment (cpu, os, compiler, runtime, etc) in a single convenient name.

-In Vcpkg, we use triplets to describe self-consistent builds of library sets. This means every library will be built using the same target cpu, OS, and compiler toolchain, but also CRT linkage and preferred library type.
+In Vcpkg, we use triplets to describe an imaginary "target configuration set" for every library. Within a triplet, libraries are generally built with the same configuration, but it is not a requirement. For example, you could have one triplet that builds `openssl` statically and `zlib` dynamically, one that builds them both statically, and one that builds them both dynamically (all for the same target OS and architecture). A single build will consume files from a single triplet.

 We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily add your own by creating a new file in the `triplets\` directory. The new triplet will immediately be available for use in commands, such as `vcpkg install boost:x86-windows-custom`.

 To change the triplet used by your project, such as to enable static linking, see our [Integration Document](integration.md#triplet-selection).

+## Community triplets
+
+Triplets contained in the `triplets\community` folder are not tested by continuous integration, but are commonly requested by the community.
+
+Because we do not have continuous coverage, port updates may break compatibility with community triplets. Because of this, community involvement is paramount!
+
+We will gladly accept and review contributions that aim to solve issues with these triplets.
+
+### Usage
+
+Community Triplets are enabled by default, when using a community triplet a message like the following one will be printed during a package install:
+
+```no-highlight
+-- Using community triplet x86-uwp. This triplet configuration is not guaranteed to succeed.
+-- [COMMUNITY] Loading triplet configuration from: D:\src\viromer\vcpkg\triplets\community\x86-uwp.cmake
+```
+
 ## Variables
 ### VCPKG_TARGET_ARCHITECTURE
 Specifies the target machine architecture.
@ -58,8 +75,29 @@ This option also has forms for configuration-specific and C flags:
 - `VCPKG_C_FLAGS_DEBUG`
 - `VCPKG_C_FLAGS_RELEASE`

+<a name="VCPKG_DEP_INFO_OVERRIDE_VARS"></a>
+### VCPKG_DEP_INFO_OVERRIDE_VARS
+Replaces the default computed list of triplet "Supports" terms.
+
+This option (if set) will override the default set of terms used for qualified dependency resolution and "Supports" field evaluation.
+
+See the [`Supports`](../maintainers/control-files.md#Supports) control file field documentation for more details.
+
+> Implementers' Note: this list is extracted via the `vcpkg_get_dep_info` mechanism.
+
 ## Windows Variables

+### VCPKG_ENV_PASSTHROUGH
+Instructs vcpkg to allow additional environment variables into the build process.
+
+On Windows, vcpkg builds packages in a special clean environment that is isolated from the current command prompt to ensure build reliability and consistency.
+
+This triplet option can be set to a list of additional environment variables that will be added to the clean environment.
+
+See also the `vcpkg env` command for how you can inspect the precise environment that will be used.
+
+> Implementers' Note: this list is extracted via the `vcpkg_get_tags` mechanism.
+
 <a name="VCPKG_VISUAL_STUDIO_PATH"></a>
 ### VCPKG_VISUAL_STUDIO_PATH
 Specifies the Visual Studio installation to use.
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@ -5,3 +5,4 @@ Description: an open-source collection designed to augment the C++ standard libr
  Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
  In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
  Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
+Supports: !uwp
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@ -1,7 +1,8 @@
 Source: ace
-Version: 6.5.7
+Version: 6.5.7-1
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
 Description: The ADAPTIVE Communication Environment
+Supports: !uwp

 Feature: wchar
 Description: Enable extra wide char functions in ACE
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@ -1,11 +1,21 @@
-include(vcpkg_common_functions)
-
-# Don't change to vcpkg_from_github! This points to a release and not an archive
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.zip"
-    FILENAME ACE-src-6.5.7.zip
-    SHA512 6ce6954941521b34ae8913dfe053d0f066632c55adf4091dae6bc180c79963d6f4ddfec7796cd6d9fc8ff59037ee162d20b017c4c296828913498bdbac2fc8a7
-)
+# Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter"
+# when invoking `prj_install.pl`.
+# So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it.
+if(VCPKG_TARGET_IS_WINDOWS)
+  # Don't change to vcpkg_from_github! This points to a release and not an archive
+  vcpkg_download_distfile(ARCHIVE
+      URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.zip"
+      FILENAME ACE-src-6.5.7.zip
+      SHA512 6ce6954941521b34ae8913dfe053d0f066632c55adf4091dae6bc180c79963d6f4ddfec7796cd6d9fc8ff59037ee162d20b017c4c296828913498bdbac2fc8a7
+  )
+else(VCPKG_TARGET_IS_WINDOWS)
+  # VCPKG_TARGET_IS_LINUX
+  vcpkg_download_distfile(ARCHIVE
+      URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.tar.gz"
+      FILENAME ACE-src-6.5.7.tar.gz
+      SHA512 0116e269e2d49ba8afccc7abfc7492e5a6a286dcbdcfe850a21f86b4facb5fef2848985d803233f4b1fbb03457e592375ab24c62e7bbaab5c28cc240ccedbacb
+  )
+endif()

 vcpkg_extract_source_archive_ex(
    OUT_SOURCE_PATH SOURCE_PATH
@ -57,7 +67,7 @@ endif()

 # Add ace/config.h file
 # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+if(VCPKG_TARGET_IS_WINDOWS)
  set(LIB_RELEASE_SUFFIX .lib)
  set(LIB_DEBUG_SUFFIX d.lib)
  if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
@ -70,7 +80,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
  file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
 endif()

-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(VCPKG_TARGET_IS_LINUX)
  set(DLL_DECORATOR)
  set(LIB_RELEASE_SUFFIX .a)
  set(LIB_DEBUG_SUFFIX .a)
@ -81,102 +91,157 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
 endif()

 # Invoke mwc.pl to generate the necessary solution and project files
-vcpkg_execute_required_process(
+vcpkg_execute_build_process(
    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG}
    WORKING_DIRECTORY ${ACE_ROOT}
    LOGNAME mwc-${TARGET_TRIPLET}
 )

-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+if(VCPKG_TARGET_IS_WINDOWS)
  vcpkg_build_msbuild(
    PROJECT_PATH ${ACE_SOURCE_PATH}/ace.sln
    PLATFORM ${MSBUILD_PLATFORM}
    USE_VCPKG_INTEGRATION
  )
-endif()

-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  # ACE itself does not define an install target, so it is not clear which
+  # headers are public and which not. For the moment we install everything
+  # that is in the source path and ends in .h, .inl
+  function(install_ace_headers_subdirectory ORIGINAL_PATH RELATIVE_PATH)
+  file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl)
+  file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH})
+  endfunction()
+
+  # We manually install header found in the ace directory because in that case
+  # we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file
+  file(GLOB HEADER_FILES ${ACE_SOURCE_PATH}/*.h ${ACE_SOURCE_PATH}/*.inl ${ACE_SOURCE_PATH}/*.cpp)
+  file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/)
+
+  # Install headers in subdirectory
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression/rle")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "ETCL")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "QoS")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Monitor_Control")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/arpa")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/net")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/netinet")
+  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/sys")
+  if("ssl" IN_LIST FEATURES)
+      install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "SSL")
+  endif()
+
+  # Install the libraries
+  function(install_ace_library ORIGINAL_PATH ACE_LIBRARY)
+  set(LIB_PATH ${ORIGINAL_PATH}/lib/)
+  if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+      # Install the DLL files
+      file(INSTALL
+          ${LIB_PATH}/${ACE_LIBRARY}d.dll
+          DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+      )
+      file(INSTALL
+          ${LIB_PATH}/${ACE_LIBRARY}.dll
+          DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+      )
+  endif()
+
+  # Install the lib files
+  file(INSTALL
+      ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX}
+      DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+  )
+
+  file(INSTALL
+      ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX}
+      DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+  )
+  endfunction()
+
+  install_ace_library(${ACE_ROOT} "ACE")
+  install_ace_library(${ACE_ROOT} "ACE_Compression")
+  install_ace_library(${ACE_ROOT} "ACE_ETCL")
+  install_ace_library(${ACE_ROOT} "ACE_ETCL_Parser")
+  install_ace_library(${ACE_ROOT} "ACE_Monitor_Control")
+  if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    install_ace_library(${ACE_ROOT} "ACE_QoS")
+  endif()
+  install_ace_library(${ACE_ROOT} "ACE_RLECompression")
+  if("ssl" IN_LIST FEATURES)
+      install_ace_library(${ACE_ROOT} "ACE_SSL")
+  endif()
+
+  vcpkg_copy_pdbs()
+
+  # Handle copyright
+  file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)
+else(VCPKG_TARGET_IS_WINDOWS)
+  # VCPKG_TARGTE_IS_LINUX
  FIND_PROGRAM(MAKE make)
  IF (NOT MAKE)
    MESSAGE(FATAL_ERROR "MAKE not found")
  ENDIF ()
-  vcpkg_execute_required_process(
-    COMMAND make
+
+  list(APPEND _pkg_components ACE_ETCL_Parser ACE_ETCL ACE)
+  if("ssl" IN_LIST FEATURES)
+    list(APPEND _ace_makefile_macros "ssl=1")
+    set(ENV{SSL_ROOT} ${CURRENT_INSTALLED_DIR})
+    list(APPEND _pkg_components ACE_SSL)
+  endif()
+  set(ENV{INSTALL_PREFIX} ${CURRENT_PACKAGES_DIR})
+  # Set `PWD` environment variable since ACE's `install` make target calculates install dir using this env.
+  set(_prev_env $ENV{PWD})
+  set(ENV{PWD} ${ACE_ROOT}/ace)
+
+  message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+  vcpkg_execute_build_process(
+    COMMAND make ${_ace_makefile_macros} "debug=1" "-j${VCPKG_CONCURRENCY}"
    WORKING_DIRECTORY ${ACE_ROOT}/ace
-    LOGNAME make-${TARGET_TRIPLET}
+    LOGNAME make-${TARGET_TRIPLET}-dbg
  )
-endif()
+  message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
+  message(STATUS "Packaging ${TARGET_TRIPLET}-dbg")
+  vcpkg_execute_build_process(
+    COMMAND make ${_ace_makefile_macros} install
+    WORKING_DIRECTORY ${ACE_ROOT}/ace
+    LOGNAME install-${TARGET_TRIPLET}-dbg
+  )
+  file(COPY ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
+  # TODO: check if we really need to remove those directories
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share)
+  foreach(_pkg_comp ${_pkg_components})
+    file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_pkg_comp}.pc _content)
+    string(REPLACE "libdir=${CURRENT_PACKAGES_DIR}/lib" "libdir=${CURRENT_PACKAGES_DIR}/debug/lib" _content ${_content})
+    file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_pkg_comp}.pc ${_content})
+  endforeach()
+  message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")

-# ACE itself does not define an install target, so it is not clear which
-# headers are public and which not. For the moment we install everything
-# that is in the source path and ends in .h, .inl
-function(install_ace_headers_subdirectory ORIGINAL_PATH RELATIVE_PATH)
-    file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl)
-    file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH})
-endfunction()
+  vcpkg_execute_build_process(
+    COMMAND make ${_ace_makefile_macros} realclean
+    WORKING_DIRECTORY ${ACE_ROOT}/ace
+    LOGNAME realclean-${TARGET_TRIPLET}-dbg
+  )

-# We manually install header found in the ace directory because in that case
-# we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file
-file(GLOB HEADER_FILES ${ACE_SOURCE_PATH}/*.h ${ACE_SOURCE_PATH}/*.inl ${ACE_SOURCE_PATH}/*.cpp)
-file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/)
+  message(STATUS "Building ${TARGET_TRIPLET}-rel")
+  vcpkg_execute_build_process(
+    COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}"
+    WORKING_DIRECTORY ${ACE_ROOT}/ace
+    LOGNAME make-${TARGET_TRIPLET}-rel
+  )
+  message(STATUS "Building ${TARGET_TRIPLET}-rel done")
+  message(STATUS "Packaging ${TARGET_TRIPLET}-rel")
+  vcpkg_execute_build_process(
+    COMMAND make ${_ace_makefile_macros} install
+    WORKING_DIRECTORY ${ACE_ROOT}/ace
+    LOGNAME install-${TARGET_TRIPLET}-rel
+  )
+  message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
+  # Restore `PWD` environment variable
+  set($ENV{PWD} _prev_env)

-# Install headers in subdirectory
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression/rle")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "ETCL")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "QoS")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Monitor_Control")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/arpa")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/net")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/netinet")
-install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/sys")
-if("ssl" IN_LIST FEATURES)
-    install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "SSL")
-endif()
-
-# Install the libraries
-function(install_ace_library ORIGINAL_PATH ACE_LIBRARY)
-    set(LIB_PATH ${ORIGINAL_PATH}/lib/)
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        # Install the DLL files
-        file(INSTALL
-            ${LIB_PATH}/${ACE_LIBRARY}d.dll
-            DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-        )
-        file(INSTALL
-            ${LIB_PATH}/${ACE_LIBRARY}.dll
-            DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-        )
-    endif()
-
-    # Install the lib files
-    file(INSTALL
-        ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX}
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
-
-    file(INSTALL
-        ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX}
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    )
-endfunction()
-
-install_ace_library(${ACE_ROOT} "ACE")
-install_ace_library(${ACE_ROOT} "ACE_Compression")
-install_ace_library(${ACE_ROOT} "ACE_ETCL")
-install_ace_library(${ACE_ROOT} "ACE_ETCL_Parser")
-install_ace_library(${ACE_ROOT} "ACE_Monitor_Control")
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-  install_ace_library(${ACE_ROOT} "ACE_QoS")
-endif()
-install_ace_library(${ACE_ROOT} "ACE_RLECompression")
-if("ssl" IN_LIST FEATURES)
-    install_ace_library(${ACE_ROOT} "ACE_SSL")
-endif()
-
-# Handle copyright
-file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)
-
-vcpkg_copy_pdbs()
+  # Handle copyright
+  file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)
+endif()
--- a/ports/activemq-cpp/CONTROL
+++ b/ports/activemq-cpp/CONTROL
@ -2,3 +2,4 @@ Source: activemq-cpp
 Version: 3.9.5-1
 Build-Depends: apr
 Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.
+Supports: !uwp
--- a/ports/akali/CONTROL
+++ b/ports/akali/CONTROL
@ -1,4 +1,4 @@
 Source: akali
-Version: 1.39
+Version: 1.41
 Description: C++ Common Library.
 Homepage: https://github.com/winsoft666/akali
--- a/ports/akali/portfile.cmake
+++ b/ports/akali/portfile.cmake
@ -1,20 +1,24 @@
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO winsoft666/akali
-    REF 07d855dd2da7cddb374646465799734e48e0adb2
-    SHA512 4298bc97c5b99494f517e46a86a30dcd61e9d4cfdfa5dbb4c17957c8e866de8ed5b41b2f9a17261f96fc3c7b25fbac2003af4ad8ca675d3f59ce6176e1112220
+    REF aa0ee3b82cef325ca582fce30bf3bf177ed81e9b
+    SHA512 0d523191219b19bcf2becb2c9e78b32b50fbbd5a052dd5330e315a6310c0d5c322639434f710a37c6d98e23510506d294b52978f8487227d4461d29d4a6bb502
    HEAD_REF master
 )

+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC)
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
-	PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
+    PREFER_NINJA
    OPTIONS
+        -DAKALI_STATIC:BOOL=${AKALI_STATIC}
        -DBUILD_TESTS:BOOL=OFF
 )

-vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
-
 vcpkg_install_cmake()

 if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali)
@ -23,6 +27,14 @@ elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali)
    vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali)
 endif()

+file(READ ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h AKALI_EXPORT_H)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}")
+else()
+    string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}")
+endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h "${AKALI_EXPORT_H}")
+
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
--- a/ports/alac/CONTROL
+++ b/ports/alac/CONTROL
@ -2,3 +2,4 @@ Source: alac
 Version:  2017-11-03-c38887c5-1
 Homepage: https://github.com/macosforge/alac
 Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.
+Supports: !uwp
--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@ -1,5 +1,5 @@
 Source: alembic
-Version: 1.7.11-6
+Version: 1.7.12
 Build-Depends: ilmbase, hdf5
 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
 Homepage: https://alembic.io/
--- a/ports/alembic/portfile.cmake
+++ b/ports/alembic/portfile.cmake
@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_buildpath_length_warning(37)

 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
@ -7,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO alembic/alembic
-    REF 1.7.11
-    SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
+    REF 1.7.12
+    SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
    HEAD_REF master
    PATCHES
        fix-C1083.patch
--- a/ports/aliyun-oss-c-sdk/CONTROL
+++ b/ports/aliyun-oss-c-sdk/CONTROL
@ -2,3 +2,4 @@ Source: aliyun-oss-c-sdk
 Version: 3.7.1-1
 Description: Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.
 Build-Depends: curl, apr-util
+Supports: !uwp
--- a/ports/ampl-mp/CONTROL
+++ b/ports/ampl-mp/CONTROL
@ -1,3 +1,4 @@
 Source: ampl-mp
 Version: 2019-03-21-1
 Description: An open-source library for mathematical programming
+Supports: !uwp
--- a/ports/angle/001-fix-uwp.patch
+++ b/ports/angle/001-fix-uwp.patch
@ -1,262 +1,77 @@
-diff --git a/src/libANGLE/renderer/d3d/RendererD3D.cpp b/src/libANGLE/renderer/d3d/RendererD3D.cpp
-index fa46476..ad56164 100644
--- a/src/libANGLE/renderer/d3d/RendererD3D.cpp
-+++ b/src/libANGLE/renderer/d3d/RendererD3D.cpp
-@@ -240,7 +240,6 @@ GLenum DefaultGLErrorCode(HRESULT hr)
- {
-     switch (hr)
-     {
-        case D3DERR_OUTOFVIDEOMEMORY:
-         case E_OUTOFMEMORY:
-             return GL_OUT_OF_MEMORY;
-         default:
-diff --git a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
-index 62f263b..b8efe15 100644
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
-+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
-@@ -14,6 +14,7 @@
- 
- #include "common/tls.h"
- #include "common/utilities.h"
-+#include "common/debug.h"
- #include "libANGLE/Buffer.h"
- #include "libANGLE/Context.h"
- #include "libANGLE/Display.h"
-@@ -1142,9 +1143,11 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
- 
-     // Compositor Native Window capabilies require WinVer >= 1803
-     if (CompositorNativeWindow11::IsSupportedWinRelease())
-    {
-        outExtensions->windowsUIComposition = true;
-    }
-+    #ifdef ANGLE_ENABLE_WINDOWS_STORE
-+	outExtensions->windowsUIComposition = NativeWindow11WinRT::IsSupportedWin10Release();
-+    #else
-+    outExtensions->windowsUIComposition = CompositorNativeWindow11::IsSupportedWinRelease();
-+    #endif
- }
- 
- angle::Result Renderer11::flush(Context11 *context11)
-@@ -1218,16 +1221,23 @@ NativeWindowD3D *Renderer11::createNativeWindow(EGLNativeWindowType window,
-                                                 const egl::Config *config,
-                                                 const egl::AttributeMap &attribs) const
- {
-    auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
-
-+#ifdef ANGLE_ENABLE_WINDOWS_STORE
-+	auto useWinUiComp = window != nullptr && !NativeWindow11WinRT::IsValidNativeWindow(window);
-+#else
-+	auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
-+#endif
-     if (useWinUiComp)
-     {
-        return new CompositorNativeWindow11(window, config->alphaSize > 0);
-+#ifdef ANGLE_ENABLE_WINDOWS_STORE
-+	return new NativeWindow11WinRT(window, config->alphaSize > 0);
-+#else
-+	return new CompositorNativeWindow11(window, config->alphaSize > 0);
-+#endif
-     }
-     else
-     {
- #ifdef ANGLE_ENABLE_WINDOWS_STORE
-        UNUSED_VARIABLE(attribs);
-+        ANGLE_UNUSED_VARIABLE(attribs);
-         return new NativeWindow11WinRT(window, config->alphaSize > 0);
- #else
-         return new NativeWindow11Win32(
-diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
-index cb2f279..d76905c 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
-+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
-@@ -145,6 +145,7 @@ HRESULT CoreWindowNativeWindow::createSwapChain(ID3D11Device *device,
-                                                 unsigned int width,
-                                                 unsigned int height,
-                                                 bool containsAlpha,
-+                                                unsigned int samples,
-                                                 IDXGISwapChain1 **swapChain)
- {
-     if (device == nullptr || factory == nullptr || swapChain == nullptr || width == 0 ||
-@@ -158,6 +159,7 @@ HRESULT CoreWindowNativeWindow::createSwapChain(ID3D11Device *device,
-     swapChainDesc.Height                = height;
-     swapChainDesc.Format                = format;
-     swapChainDesc.Stereo                = FALSE;
-+    swapChainDesc.SampleDesc.Count = samples;
-     swapChainDesc.SampleDesc.Count      = 1;
-     swapChainDesc.SampleDesc.Quality    = 0;
-     swapChainDesc.BufferUsage =
-@@ -213,11 +215,9 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
- 
- static float GetLogicalDpi()
- {
-    ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> displayProperties;
-
-    if (SUCCEEDED(GetActivationFactory(
-            HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
-            displayProperties.GetAddressOf())))
-+    ComPtr<ABI::Windows::Graphics::Display::IDisplayInformation> displayProperties;
-+    if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(), 
-+    displayProperties.GetAddressOf())))
-     {
-         float dpi = 96.0f;
-         if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi)))
-diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
-index ae57cfb..dd77b42 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
-+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
-@@ -36,6 +36,7 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
-                             unsigned int width,
-                             unsigned int height,
-                             bool containsAlpha,
-+                            unsigned int samples,
-                             IDXGISwapChain1 **swapChain) override;
- 
-   protected:
-@@ -49,7 +50,7 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
-     ComPtr<IMap<HSTRING, IInspectable *>> mPropertyMap;
- };
- 
-[uuid(7F924F66 - EBAE - 40E5 - A10B - B8F35E245190)] class CoreWindowSizeChangedHandler
-+[uuid(7F924F66-EBAE-40E5-A10B-B8F35E245190)] class CoreWindowSizeChangedHandler
-     : public Microsoft::WRL::RuntimeClass<
-           Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
-           IWindowSizeChangedEventHandler>
-diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
-index 708e8a2..9bfa4c4 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
-+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
-@@ -53,6 +53,7 @@ class InspectableNativeWindow
-                                     unsigned int width,
-                                     unsigned int height,
-                                     bool containsAlpha,
-+                                    unsigned int samples,
-                                     IDXGISwapChain1 **swapChain)                   = 0;
- 
-     bool getClientRect(RECT *rect)
-diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
-index 8972ca2..caf2a7e 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
-+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
-@@ -13,6 +13,8 @@
- #include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
- #include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
- 
-+#include <windows.foundation.metadata.h>
-+
- using namespace Microsoft::WRL;
- using namespace Microsoft::WRL::Wrappers;
- 
-@@ -88,6 +90,7 @@ HRESULT NativeWindow11WinRT::createSwapChain(ID3D11Device *device,
-                                              DXGI_FORMAT format,
-                                              UINT width,
-                                              UINT height,
-+                                             UINT samples,
-                                              IDXGISwapChain **swapChain)
- {
-     if (mImpl)
-@@ -95,7 +98,7 @@ HRESULT NativeWindow11WinRT::createSwapChain(ID3D11Device *device,
-         IDXGIFactory2 *factory2     = d3d11::DynamicCastComObject<IDXGIFactory2>(factory);
-         IDXGISwapChain1 *swapChain1 = nullptr;
-         HRESULT result =
-            mImpl->createSwapChain(device, factory2, format, width, height, mHasAlpha, &swapChain1);
-+            mImpl->createSwapChain(device, factory2, format, width, height, mHasAlpha, samples, &swapChain1);
-         SafeRelease(factory2);
-         *swapChain = static_cast<IDXGISwapChain *>(swapChain1);
-         return result;
-@@ -118,5 +121,44 @@ bool NativeWindow11WinRT::IsValidNativeWindow(EGLNativeWindowType window)
-     // Anything else will be rejected as an invalid IInspectable.
-     return IsCoreWindow(window) || IsSwapChainPanel(window) || IsEGLConfiguredPropertySet(window);
- }
-+bool NativeWindow11WinRT::IsSupportedWin10Release()
-+{
-+	HSTRING className, contractName;
-+	HSTRING_HEADER classNameHeader, contractNameHeader;
-+	boolean isSupported = false;
-+
-+	const wchar_t *str = static_cast<const wchar_t *>(RuntimeClass_Windows_Foundation_Metadata_ApiInformation);
-+	unsigned int length;
-+	SizeTToUInt32(::wcslen(str), &length);
-+	HRESULT hr = WindowsCreateStringReference(RuntimeClass_Windows_Foundation_Metadata_ApiInformation, length, &classNameHeader, &className);
-+
-+	if (FAILED(hr))
-+	{
-+		return isSupported;
-+	}
-+
-+	Microsoft::WRL::ComPtr<ABI::Windows::Foundation::Metadata::IApiInformationStatics> api;
-+
-+	hr = RoGetActivationFactory(className, __uuidof(ABI::Windows::Foundation::Metadata::IApiInformationStatics), &api);
-+
-+	if (FAILED(hr))
-+	{
-+		return isSupported;
-+	}
-+
-+	str = static_cast<const wchar_t *>(L"Windows.Foundation.UniversalApiContract");
-+	SizeTToUInt32(::wcslen(str), &length);
-+	hr = WindowsCreateStringReference(L"Windows.Foundation.UniversalApiContract", length, &contractNameHeader,
-+	&contractName);
-+
-+	if (FAILED(hr))
-+	{
-+		return isSupported;
-+	}
-+
-+	api->IsApiContractPresentByMajor(contractName, 6, &isSupported);
-+
-+	return isSupported;
-+}
- 
- }  // namespace rx
-diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
-index eac5b21..b9ee344 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
-+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
-@@ -34,11 +34,14 @@ class NativeWindow11WinRT : public NativeWindow11
-                             DXGI_FORMAT format,
-                             UINT width,
-                             UINT height,
-+                            UINT samples,
-                             IDXGISwapChain **swapChain) override;
- 
-     void commitChange() override;
- 
-     static bool IsValidNativeWindow(EGLNativeWindowType window);
-+    static bool IsSupportedWin10Release();
-+
- 
-   private:
-     bool mHasAlpha;
-diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
-index af0beb6..20fd632 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
-+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
-@@ -246,6 +246,7 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
-                                                     DXGI_FORMAT format,
-                                                     unsigned int width,
-                                                     unsigned int height,
-+                                                    unsigned int samples,
-                                                     bool containsAlpha,
-                                                     IDXGISwapChain1 **swapChain)
- {
-diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
-index 09642ee..fc69bf4 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
-+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
-@@ -27,6 +27,7 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow,
-                             DXGI_FORMAT format,
-                             unsigned int width,
-                             unsigned int height,
-+                            unsigned int samples,
-                             bool containsAlpha,
-                             IDXGISwapChain1 **swapChain) override;
- 
-@@ -43,7 +44,7 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow,
-     ComPtr<IDXGISwapChain1> mSwapChain;
- };
- 
-[uuid(8ACBD974 - 8187 - 4508 - AD80 - AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
-+[uuid(8ACBD974-8187-4508-AD80-AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
-     : public Microsoft::WRL::RuntimeClass<
-           Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
-           ABI::Windows::UI::Xaml::ISizeChangedEventHandler>
+diff --git a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+index 0c9698450..3e37ad0ab 100644
+--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+@@ -2364,6 +2364,11 @@ void InitializeFeatures(const Renderer11DeviceCaps &deviceCaps,
+     bool isIvyBridge               = false;
+     bool isAMD                     = IsAMD(adapterDesc.VendorId);
+     bool isFeatureLevel9_3         = (deviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
+#if defined(ANGLE_ENABLE_WINDOWS_UWP)
+    bool isWin10                   = true;
+#else
+    bool isWin10                   = IsWindows10OrGreater();
+#endif
+     IntelDriverVersion capsVersion = IntelDriverVersion(0);
+     if (isIntel)
+     {
+@@ -2448,7 +2453,7 @@ void InitializeFeatures(const Renderer11DeviceCaps &deviceCaps,
+     // Don't translate uniform block to StructuredBuffer on Windows 7 and earlier. This is targeted
+     // to work around a bug that fails to allocate ShaderResourceView for StructuredBuffer.
+     ANGLE_FEATURE_CONDITION(features, dontTranslateUniformBlockToStructuredBuffer,
+-                            !IsWindows10OrGreater());
+                            !isWin10);
+ 
+     // Call platform hooks for testing overrides.
+     auto *platform = ANGLEPlatformCurrent();
+diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
+index 7d3f078d6..fac057dd6 100644
+--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
+@@ -213,16 +213,20 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
+ 
+ static float GetLogicalDpi()
+ {
+-    ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> displayProperties;
+    ComPtr<ABI::Windows::Graphics::Display::IDisplayInformationStatics> displayInformationStatics;
+    ComPtr<ABI::Windows::Graphics::Display::IDisplayInformation> displayInformation;
+ 
+     if (SUCCEEDED(GetActivationFactory(
+-            HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
+-            displayProperties.GetAddressOf())))
+            HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
+            displayInformationStatics.GetAddressOf())))
+     {
+         float dpi = 96.0f;
+-        if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi)))
+        if (SUCCEEDED(displayInformationStatics->GetForCurrentView(&displayInformation)))
+         {
+-            return dpi;
+            if (SUCCEEDED(displayInformation->get_LogicalDpi(&dpi)))
+            {
+                return dpi;
+            }
+         }
+     }
+ 
+diff --git a/src/libGLESv2/global_state.cpp b/src/libGLESv2/global_state.cpp
+index 8c2c61f53..7725106a4 100644
+--- a/src/libGLESv2/global_state.cpp
+++ b/src/libGLESv2/global_state.cpp
+@@ -214,7 +214,7 @@ namespace
+ {
+ // The following WaitForDebugger code is based on SwiftShader. See:
+ // https://cs.chromium.org/chromium/src/third_party/swiftshader/src/Vulkan/main.cpp
+-#    if defined(ANGLE_ENABLE_ASSERTS)
+#    if defined(ANGLE_ENABLE_ASSERTS) && !defined(ANGLE_ENABLE_WINDOWS_UWP)
+ INT_PTR CALLBACK DebuggerWaitDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+ {
+     RECT rect;
+@@ -259,7 +259,7 @@ void WaitForDebugger(HINSTANCE instance)
+ }
+ #    else
+ void WaitForDebugger(HINSTANCE instance) {}
+-#    endif  // defined(ANGLE_ENABLE_ASSERTS)
+#    endif  // defined(ANGLE_ENABLE_ASSERTS) && !defined(ANGLE_ENABLE_WINDOWS_UWP)
+ }  // namespace
+ 
+ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID)
--- a/ports/angle/002-fix-builder-error.patch
+++ b/ports/angle/002-fix-builder-error.patch
@ -1,30 +1,28 @@
 diff --git a/src/gpu_info_util/SystemInfo_win.cpp b/src/gpu_info_util/SystemInfo_win.cpp
-index 878f0f5..2255982 100644
+index f4bb137f2..86495013b 100644
 --- a/src/gpu_info_util/SystemInfo_win.cpp
 +++ b/src/gpu_info_util/SystemInfo_win.cpp
-@@ -4,6 +4,12 @@
- // found in the LICENSE file.
- //
+@@ -6,11 +6,6 @@
 
-+// Windows.h needs to be included first
-+#include <windows.h>
-+
-+#include <d3d10.h>
-+#include <dxgi.h>
-+
 // SystemInfo_win.cpp: implementation of the Windows-specific parts of SystemInfo.h
 
- #include "gpu_info_util/SystemInfo_internal.h"
-@@ -11,12 +17,6 @@
- #include "common/debug.h"
- #include "common/string_utils.h"
+-#include "gpu_info_util/SystemInfo_internal.h"
+-
+-#include "common/debug.h"
+-#include "common/string_utils.h"
+-
+ // Windows.h needs to be included first
+ #include <windows.h>
 
-// Windows.h needs to be included first
-#include <windows.h>
-
-#include <d3d10.h>
-#include <dxgi.h>
-
+@@ -19,6 +14,11 @@
 #include <array>
 #include <sstream>
 
+#include "gpu_info_util/SystemInfo_internal.h"
+
+#include "common/debug.h"
+#include "common/string_utils.h"
+
+ namespace angle
+ {
+ 
--- a/ports/angle/CMakeLists.txt
+++ b/ports/angle/CMakeLists.txt
@ -27,6 +27,11 @@ endif()
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
 set(CMAKE_STATIC_LIBRARY_PREFIX "")

+if (WINDOWS_STORE)
+    set(WINRT_DEFINES -DANGLE_ENABLE_WINDOWS_STORE)
+else()
+    set(WINRT_DEFINES)
+endif()
 add_definitions(
    -D_CRT_SECURE_NO_DEPRECATE
    -D_SCL_SECURE_NO_WARNINGS
@ -35,6 +40,7 @@ add_definitions(
    -DNOMINMAX
    -DANGLE_STANDALONE_BUILD
    -DANGLE_ENABLE_DEBUG_ANNOTATIONS
+    ${WINRT_DEFINES}
 )

 configure_file(commit.h include/id/commit.h COPYONLY)
@ -42,8 +48,10 @@ include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)

 ##########
 # angle::common
-if(WIN32)
-    set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix")
+if(WINDOWS_DESKTOP)
+    set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix|_winuwp")
+elseif(WINDOWS_STORE)
+    set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix|_win[^u]")
 elseif(LINUX)
    set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac")
 elseif(APPLE)
@ -87,6 +95,7 @@ file(GLOB TRANSLATOR_SOURCES
    "src/compiler/translator/tree_util/*.cpp"
    "src/third_party/compiler/ArrayBoundsClamper.cpp"
 )
+list(FILTER TRANSLATOR_SOURCES EXCLUDE REGEX "_unittest")
 add_library(angle_translator STATIC ${TRANSLATOR_SOURCES})
 target_compile_definitions(angle_translator PUBLIC
    -DANGLE_ENABLE_ESSL
@ -249,7 +258,7 @@ file(GLOB LIBANGLE_SOURCES

    ${LIBANGLE_SOURCES_PLATFORM}
 )
-list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest")
+list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest|glslang_wrapper|capture|FrameCapture\.cpp")

 if(LINUX OR APPLE)
    set(LIBANGLE_RENDERER_PLATFORM
@ -317,6 +326,8 @@ list(APPEND LIBGLESV2_SOURCES
  "src/libGLESv2/entry_points_gles_3_0_autogen.h"
  "src/libGLESv2/entry_points_gles_3_1_autogen.cpp"
  "src/libGLESv2/entry_points_gles_3_1_autogen.h"
+  "src/libGLESv2/entry_points_gles_3_2_autogen.cpp"
+  "src/libGLESv2/entry_points_gles_3_2_autogen.h"
  "src/libGLESv2/entry_points_gles_ext_autogen.cpp"
  "src/libGLESv2/entry_points_gles_ext_autogen.h"
  "src/libGLESv2/global_state.cpp"
@ -370,7 +381,9 @@ if(NOT DISABLE_INSTALL_HEADERS)
    install(
        DIRECTORY include/
        DESTINATION include
-        FILES_MATCHING PATTERN "*.h"
+        FILES_MATCHING
+        PATTERN "*.h"
+        PATTERN "*.inc"
        PATTERN "GLSLANG" EXCLUDE
        PATTERN "EGL" EXCLUDE
        PATTERN "KHR" EXCLUDE
--- a/ports/angle/CONTROL
+++ b/ports/angle/CONTROL
@ -1,5 +1,5 @@
 Source: angle
-Version: 2019-07-19-4
+Version: 2019-12-31
 Homepage: https://github.com/google/angle
 Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
  The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
--- a/ports/angle/portfile.cmake
+++ b/ports/angle/portfile.cmake
@ -10,6 +10,8 @@ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
    set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)
 else()
    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()
@ -17,9 +19,9 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/angle
-    REF 8f08fed925c54835c4faee4d7dd61d6ed2964ffd
-    SHA512 037ebe356371924088563180c4a37a31eaffa41ca21c42554391672c28e62fabc19d787516b88baa192b771e05c370c5a6cfec0863b70e08d65216f41d89923f
-    PATCHES 
+    REF 1fdf6ca5141d8e349e875eab6e51d93d929a7f0e
+    SHA512 2553307f3d10b5c32166b9ed610b4b15310dccba00c644cd35026de86d87ea2e221c2e528f33b02f01c1ded2f08150e429de1fa300b73d655f8944f6f5047a82
+    PATCHES
        001-fix-uwp.patch
        002-fix-builder-error.patch
 )
--- a/ports/anyrpc/CONTROL
+++ b/ports/anyrpc/CONTROL
@ -1,4 +1,4 @@
 Source: anyrpc
-Version: 2017-12-01-1
+Version: 2020-01-13-1
 Homepage: https://github.com/sgieseking/anyrpc
 Description: A multiprotocol remote procedure call system for C++.
--- a/ports/anyrpc/arm_endian_detection.patch
+++ b/ports/anyrpc/arm_endian_detection.patch
@ -1,16 +0,0 @@
-diff --git a/include/anyrpc/api.h b/include/anyrpc/api.h
-index a67fa32..e7d74ad 100644
--- a/include/anyrpc/api.h
-+++ b/include/anyrpc/api.h
-@@ -158,9 +158,9 @@ typedef int socklen_t;
- #  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
- #    define ANYRPC_ENDIAN ANYRPC_BIGENDIAN
- // Detect with architecture macros
-#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
-+#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__) || defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__)
- #    define ANYRPC_ENDIAN ANYRPC_BIGENDIAN
-#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
-+#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) || defined(__ARMEL__) || defined(__THUMBEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(_M_ARM)
- #    define ANYRPC_ENDIAN ANYRPC_LITTLEENDIAN
- #  elif defined(ANYRPC_DOXYGEN_RUNNING)
- #    define ANYRPC_ENDIAN
--- a/ports/anyrpc/portfile.cmake
+++ b/ports/anyrpc/portfile.cmake
@ -1,12 +1,9 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO sgieseking/anyrpc
-    REF bfd50aa6dd620066ed308258599127cd46be818b
-    SHA512 604e92a2a2936fb95e74e05dd1ac578e67e2877357443d83f8fac319ab244a27d1fac2ebd8bcd9ac8108e7a198752776974027b8f020643bb039b5f84406049b
+    REF b288617d0ae1d6e227bcda7d3db7db5329fa2322
+    SHA512 d50ef96ad13f06991e65e9912225b64c1f244bf89b67e4afcddbb18e08a885ec773aea88e1334d6deb73bb3824e916695b3b187b9023368aec3ba21a53dd2830
    HEAD_REF master
-    PATCHES "arm_endian_detection.patch"
 )

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED)
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@ -2,6 +2,7 @@ Source: apr
 Version: 1.6.5-3
 Homepage: https://apr.apache.org/
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
+Supports: !uwp

 Feature: private-headers
 Description: Install non-standard files required for building Apache httpd
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@ -3,3 +3,4 @@ Version: 0.15.1
 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
 Homepage: https://github.com/apache/arrow
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
+Supports: x64
--- a/ports/asiosdk/CONTROL
+++ b/ports/asiosdk/CONTROL
@ -0,0 +1,4 @@
+Source: asiosdk
+Version: 2.3.3
+Homepage: https://www.steinberg.net/en/company/developers.html
+Description: ASIO is a low latency audio API from Steinberg.
--- a/ports/asiosdk/Findasiosdk.cmake
+++ b/ports/asiosdk/Findasiosdk.cmake
@ -0,0 +1,37 @@
+if(WIN32)
+else(WIN32)
+  message(FATAL_ERROR "Findasiosdk.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" )
+endif(WIN32)
+
+find_path(
+  ASIOSDK_ROOT_DIR
+  asiosdk
+)
+
+if (NOT "${ASIOSDK_ROOT_DIR}" STREQUAL "")
+  set(ASIOSDK_ROOT_DIR
+	${ASIOSDK_ROOT_DIR}/asiosdk
+  )
+endif()
+
+find_path(ASIOSDK_INCLUDE_DIR
+  asio.h
+  PATHS
+  ${ASIOSDK_ROOT_DIR}/common 
+)  
+
+
+if (NOT "${ASIOSDK_ROOT_DIR}" STREQUAL "")
+	set (ASIOSDK_INCLUDE_DIR
+		${ASIOSDK_ROOT_DIR}/common
+		${ASIOSDK_ROOT_DIR}/host
+		${ASIOSDK_ROOT_DIR}/hostpc
+	)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ASIOSDK DEFAULT_MSG ASIOSDK_ROOT_DIR ASIOSDK_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(
+    ASIOSDK_ROOT_DIR ASIOSDK_INCLUDE_DIR
+)
--- a/ports/asiosdk/portfile.cmake
+++ b/ports/asiosdk/portfile.cmake
@ -0,0 +1,32 @@
+vcpkg_fail_port_install(MESSAGE "asiosdk currently only supports Windows platforms" ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "uwp")
+
+set(VERSION 2.3.3)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip"
+    FILENAME "asiosdk_2.3.3_2019-06-14.zip"
+	SHA512 65d6f2fa4f0e23939fcdf46ff3b04760089c0f14e2ac3e37e63cbf6733f3acc93ab930ea9e3f1eb60483d4654f7ba4699ed506531074c4f55e763ad92736c231
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${VERSION}
+)
+
+file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio)
+file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common)
+file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver)
+file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host)
+file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
+file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
+file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
+file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Licensing Agreement.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
+file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
--- a/ports/asiosdk/usage
+++ b/ports/asiosdk/usage
@ -0,0 +1,4 @@
+The package asiosdk provides CMake integration:
+
+    find_package(asiosdk REQUIRED)
+    target_include_directories(<my_target> PRIVATE ${ASIOSDK_INCLUDE_DIRS})
--- a/ports/asiosdk/vcpkg-cmake-wrapper.cmake
+++ b/ports/asiosdk/vcpkg-cmake-wrapper.cmake
@ -0,0 +1,8 @@
+set(ASIOSDK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+if(NOT ASIOSDK_INCLUDE_DIR)
+  _find_package(${ARGS})
+endif()
+
+set(CMAKE_MODULE_PATH ${ASIOSDK_PREV_MODULE_PATH})
--- a/ports/asmjit/CONTROL
+++ b/ports/asmjit/CONTROL
@ -1,4 +1,4 @@
 Source: asmjit
-Version: 2019-07-11
+Version: 2020-01-20
 Homepage: https://github.com/asmjit/asmjit
 Description: Complete x86/x64 JIT and Remote Assembler for C++
--- a/ports/asmjit/portfile.cmake
+++ b/ports/asmjit/portfile.cmake
@ -1,14 +1,11 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO asmjit/asmjit
-  REF 761130b1d8f32b5d3d612d285664fcfef5258149
-  SHA512 a86fd58ba0c8bc81ec575e86a9acdf4a11f2acc9c2facd2a0a8512cffa9ee6fc0bd877a1f33fb52f8f510eff1de654b45cd4f5f5a18c5252ecae22a92db6e93e
+  REF 7e164e3edeefb76d8a2da4fbe84957ece0d07a13
+  SHA512 19d0a7f7a7cb4e6bd6c03f2e29ab012edf67ba4ba92789fd81e71a4937f1271a5124fa9c02d40d202bad7785b9e5ae21a3a72048cdeb8781c1b927c9717669c8
  HEAD_REF master
 )

-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
  vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
@ -22,19 +19,14 @@ else()
  )
 endif()

-
-
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()

-
-
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/asmjit RENAME copyright)
--- a/ports/avro-c/CONTROL
+++ b/ports/avro-c/CONTROL
@ -1,5 +1,5 @@
 Source: avro-c
-Version: 1.8.2-3
+Version: 1.8.2-4
 Homepage: https://github.com/apache/avro
 Description: Apache Avro is a data serialization system
-Build-Depends: jansson, liblzma, zlib
+Build-Depends: jansson, liblzma, zlib, snappy
--- a/ports/avro-c/portfile.cmake
+++ b/ports/avro-c/portfile.cmake
@ -12,13 +12,13 @@ vcpkg_from_github(
        avro.patch
        avro-pr-217.patch
        fix-build-error.patch # Since jansson updated, use jansson::jansson instead of the macro ${JANSSON_LIBRARIES}
+        snappy.patch # https://github.com/apache/avro/pull/793
 )

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}/lang/c
    PREFER_NINJA
    OPTIONS
-        -DCMAKE_DISABLE_FIND_PACKAGE_Snappy=ON
 )

 vcpkg_install_cmake()
--- a/ports/avro-c/snappy.patch
+++ b/ports/avro-c/snappy.patch
@ -0,0 +1,56 @@
+diff -ru b/c/src/codec.c a/lang/c/src/codec.c
+--- b/lang/c/src/codec.c	2020-01-23 16:18:15.119970300 +0200
+++ a/lang/c/src/codec.c	2020-01-23 19:31:41.679834300 +0200
+@@ -21,6 +21,9 @@
+ #  if defined(__APPLE__)
+ #    include <libkern/OSByteOrder.h>
+ #    define __bswap_32 OSSwapInt32
+#  elif defined(_WIN32)
+#    include <stdlib.h>
+#    define __bswap_32 _byteswap_ulong
+ #  else
+ #    include <byteswap.h>
+ #  endif
+@@ -115,14 +118,14 @@
+ 		return 1;
+ 	}
+ 
+-        if (snappy_compress(data, len, c->block_data, &outlen) != SNAPPY_OK)
+        if (snappy_compress((const char *)data, len, (char*)c->block_data, &outlen) != SNAPPY_OK)
+         {
+                 avro_set_error("Error compressing block with Snappy");
+ 		return 1;
+ 	}
+ 
+-        crc = __bswap_32(crc32(0, data, len));
+-        memcpy(c->block_data+outlen, &crc, 4);
+        crc = __bswap_32(crc32(0, (const Bytef *)data, len));
+        memcpy((char*)c->block_data+outlen, &crc, 4);
+         c->used_size = outlen+4;
+ 
+ 	return 0;
+@@ -133,7 +136,7 @@
+         uint32_t crc;
+         size_t outlen;
+ 
+-        if (snappy_uncompressed_length(data, len-4, &outlen) != SNAPPY_OK) {
+        if (snappy_uncompressed_length((const char*)data, len-4, &outlen) != SNAPPY_OK) {
+ 		avro_set_error("Uncompressed length error in snappy");
+ 		return 1;
+         }
+@@ -152,13 +155,13 @@
+ 		return 1;
+ 	}
+ 
+-        if (snappy_uncompress(data, len-4, c->block_data, &outlen) != SNAPPY_OK)
+        if (snappy_uncompress((const char*)data, len-4, (char*)c->block_data, &outlen) != SNAPPY_OK)
+         {
+                 avro_set_error("Error uncompressing block with Snappy");
+ 		return 1;
+ 	}
+ 
+-        crc = __bswap_32(crc32(0, c->block_data, outlen));
+        crc = __bswap_32(crc32(0, (const Bytef *)c->block_data, outlen));
+         if (memcmp(&crc, (char*)data+len-4, 4))
+         {
+                 avro_set_error("CRC32 check failure uncompressing block with Snappy");
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@ -1,3 +1,4 @@
 Source: aws-c-common
-Version: 0.4.1
+Version: 0.4.15
+Homepage: https://github.com/awslabs/aws-c-common
 Description: AWS common library for C
--- a/ports/aws-c-common/disable-error-4068.patch
+++ b/ports/aws-c-common/disable-error-4068.patch
@ -1,15 +1,15 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 263d34e..8c699b7 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,6 +122,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
-     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
- endif()
- 
-+if (WIN32)
-+    add_compile_options(/wd4068)
-+endif()
-+
- aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
- target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
- 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79c66c3..f6639d7 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -127,6 +127,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+     #this only gets applied to aws-c-common (not its consumers).
+     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
+ endif()
+ 
+if (WIN32)
+    add_compile_options(/wd4068)
+endif()
+ 
+ aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+ target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
--- a/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@ -1,20 +1,20 @@
-diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
-index 0f597d7..1359b8b 100644
--- a/cmake/AwsCFlags.cmake
-+++ b/cmake/AwsCFlags.cmake
-@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
-         # /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
-         # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
-         list(APPEND AWS_C_FLAGS /volatile:iso)
-        
-        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
-        if(STATIC_CRT)
-            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
-        else()
-            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
-        endif()
-        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
-        list(APPEND AWS_C_FLAGS "${_FLAGS}")
- 
-     else()
-         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
+index 42d146e..813f56d 100644
+--- a/cmake/AwsCFlags.cmake
+++ b/cmake/AwsCFlags.cmake
+@@ -39,15 +39,6 @@ function(aws_set_common_properties target)
+         # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
+         list(APPEND AWS_C_FLAGS /volatile:iso)
+ 
+-        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
+-        if(STATIC_CRT)
+-            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        else()
+-            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        endif()
+-        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
+-        list(APPEND AWS_C_FLAGS "${_FLAGS}")
+-
+     else()
+         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+ 
--- a/ports/aws-c-common/fix-cmake-target-path.patch
+++ b/ports/aws-c-common/fix-cmake-target-path.patch
@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 433b6c5..41874a0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -209,7 +209,7 @@ else()
+ endif()
+ 
+ install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
+     NAMESPACE AWS::
+     COMPONENT Development)
+ 
+diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
+index c322b52..6e5daa0 100644
+--- a/cmake/aws-c-common-config.cmake
+++ b/cmake/aws-c-common-config.cmake
+@@ -1,9 +1,5 @@
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ 
+-if (BUILD_SHARED_LIBS)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-else()
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+ 
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@ -1,14 +1,13 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-c-common
-    REF b2e7ca47449571beaca4a507c65ac3ee39d8eefc
-    SHA512 c9dc394bf3ef8eb33d36b81bae5a2002a8fccc7d876ad9c631da818aae7d06846615791c2311e8baa6efa7fcd9d565effabfec6f01767ca0099c6fa64d58e2fa
+    REF e3e7ccd35a85f9cd38c67cb1988251f1543b6632 # v0.4.15
+    SHA512 f8be12628bb7503921bf64956697ad60ba1dc10099482515be7157a1f75b14fad716eadcf69af1d77a5f1bbdaf298a7913e678dd143c5b409dd37ce3bf57f023
    HEAD_REF master
    PATCHES
        disable-error-4068.patch # This patch fixes dependency port compilation failure
        disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
+        fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
 )

 vcpkg_configure_cmake(
@ -29,9 +28,7 @@ file(REMOVE_RECURSE

 vcpkg_copy_pdbs()

-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-common RENAME copyright)
+file(REMOVE_RECURSE	${CURRENT_PACKAGES_DIR}/debug/share)

-file(REMOVE_RECURSE
-	${CURRENT_PACKAGES_DIR}/debug/share
-)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/aws-c-event-stream/CONTROL
+++ b/ports/aws-c-event-stream/CONTROL
@ -1,4 +1,4 @@
 Source: aws-c-event-stream
-Version: 0.1.1
+Version: 0.1.4
 Description: C99 implementation of the vnd.amazon.event-stream content-type.
 Build-Depends: aws-c-common, aws-checksums
--- a/ports/aws-c-event-stream/fix-cmake-target-path.patch
+++ b/ports/aws-c-event-stream/fix-cmake-target-path.patch
@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a765be0..4ade373 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -101,7 +101,7 @@ else()
+ endif()
+ 
+ install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+     NAMESPACE AWS::
+     COMPONENT Development)
+ 
+diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake
+index 7bd3cfc..cb817e4 100644
+--- a/cmake/aws-c-event-stream-config.cmake
+++ b/cmake/aws-c-event-stream-config.cmake
+@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
+ find_dependency(aws-c-common)
+ find_dependency(aws-checksums)
+ 
+-if (BUILD_SHARED_LIBS)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-else()
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+ 
--- a/ports/aws-c-event-stream/portfile.cmake
+++ b/ports/aws-c-event-stream/portfile.cmake
@ -1,11 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-c-event-stream
-    REF v0.1.1
-    SHA512 974311cdface59bb5a95c7c249ad31cf694ebefd5c7b25f280f6817c6dc8d9ab1fdc8f75030099efe573be41a93676f199fda797d2a7bb41533f7e15f05de120
+    REF 32713d30b479690d199b3f02163a832b09b309a5 #v0.1.4
+    SHA512 c1f776b708cd4a68afbcc60e046dcfa3f7c1d378e7bf49ba7f93b3db3a248218316e5037254709320cd50efd6486996aa09678f41499fcea810adea16463ff4b
    HEAD_REF master
+    PATCHES fix-cmake-target-path.patch
 )

 vcpkg_configure_cmake(
@ -27,9 +26,7 @@ file(REMOVE_RECURSE

 vcpkg_copy_pdbs()

-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-event-stream RENAME copyright)
+file(REMOVE_RECURSE	${CURRENT_PACKAGES_DIR}/debug/share)

-file(REMOVE_RECURSE
-	${CURRENT_PACKAGES_DIR}/debug/share
-)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/aws-checksums/CONTROL
+++ b/ports/aws-checksums/CONTROL
@ -1,3 +1,3 @@
 Source: aws-checksums
-Version: 0.1.3
+Version: 0.1.5
 Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.
--- a/ports/aws-checksums/fix-cmake-target-path.patch
+++ b/ports/aws-checksums/fix-cmake-target-path.patch
@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2ae2229..c4d0c2d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -138,7 +138,7 @@ else()
+ endif()
+ 
+ install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+     NAMESPACE AWS::)
+ 
+ configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
+diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake
+index f0785bf..1b9b2d2 100644
+--- a/cmake/aws-checksums-config.cmake
+++ b/cmake/aws-checksums-config.cmake
+@@ -1,6 +1 @@
+-if (BUILD_SHARED_LIBS)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-else()
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-endif()
+-
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
--- a/ports/aws-checksums/portfile.cmake
+++ b/ports/aws-checksums/portfile.cmake
@ -1,11 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-checksums
-    REF v0.1.3
-    SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4
+    REF 519d6d9093819b6cf89ffff589a27ef8f83d0f65 # v0.1.5
+    SHA512 3079786d106b98ba3b8c254c26ec4d9accf5fba5bcc13aed30ffa897e17ea7d701e6b6e903b37534e32e1cf0cac3e9a6ff46e1340ed7c530c2fc6262b245e05c
    HEAD_REF master
+    PATCHES fix-cmake-target-path.patch
 )

 if (VCPKG_CRT_LINKAGE STREQUAL static)
@ -32,9 +31,7 @@ file(REMOVE_RECURSE

 vcpkg_copy_pdbs()

-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-checksums RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

-file(REMOVE_RECURSE
-	${CURRENT_PACKAGES_DIR}/debug/share
-)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/aws-lambda-cpp/CONTROL
+++ b/ports/aws-lambda-cpp/CONTROL
@ -1,4 +1,4 @@
 Source: aws-lambda-cpp
-Version: 0.1.0-2
+Version: 0.2.4
 Build-Depends: curl
 Description: C++ Runtime for AWS Lambda.
--- a/ports/aws-lambda-cpp/portfile.cmake
+++ b/ports/aws-lambda-cpp/portfile.cmake
@ -1,15 +1,10 @@
-include(vcpkg_common_functions)
-
-vcpkg_fail_port_install(MESSAGE "aws-lambda-cpp currently only supports Linux and Mac platforms" ON_TARGET "Windows")
-#if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-#    message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
-#endif()
+vcpkg_fail_port_install(ON_TARGET "Windows" "OSX")

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-lambda-cpp
-    REF v0.1.0
-    SHA512 78b1ad1dcd88176a954c03b38cbb962c77488da6c75acb37a8b64cde147c030b02c6e51f0a974edb042e59c3c969d110d181ad097ef76f43255500b272a94454
+    REF 681652d9410bb4adb66e5afa9e8a3662a5f7b606 # v0.2.4
+    SHA512 c29ea2b8fb8b99a5d0a49f601406e14682e5133deeb871a750baa792becc91f22dac00c0ee3d8c056871a1f5035cdcd1a3bba3d9464dfa84e1ec00a270a9abd6
    HEAD_REF master
 )

@ -25,5 +20,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_copy_pdbs()

 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-lambda-cpp RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.142-1
+Version: 1.7.214-1
 Homepage: https://github.com/aws/aws-sdk-cpp
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
@ -51,7 +51,7 @@ Description: C++ SDK for the AWS autoscaling service
 Feature: autoscaling-plans
 Description: C++ SDK for the AWS autoscaling-plans service

-Feature: AWSMigrationHub
+Feature: awsmigrationhub
 Description: C++ SDK for the AWS AWSMigrationHub service

 Feature: awstransfer
--- a/ports/aws-sdk-cpp/compute_build_only.cmake
+++ b/ports/aws-sdk-cpp/compute_build_only.cmake
@ -44,7 +44,7 @@ endif()
 if("autoscaling-plans" IN_LIST FEATURES)
  list(APPEND BUILD_ONLY autoscaling-plans)
 endif()
-if("AWSMigrationHub" IN_LIST FEATURES)
+if("awsmigrationhub" IN_LIST FEATURES)
  list(APPEND BUILD_ONLY AWSMigrationHub)
 endif()
 if("awstransfer" IN_LIST FEATURES)
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@ -1,12 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_buildpath_length_warning(37)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO aws/aws-sdk-cpp
-    REF d3ee022fea02e8e7e02f3cdd77904dc4c39ab79a
-    SHA512 6f146830f15864bb3770ad50a6ebcbc478235e9c2c59aa044353bbfc297bf26437e07b77b970974cc294782809aaa837a3407cbc846426b04e97447cd7f9e3cf
+    REF e8a7e7263e900983921e95363026efaa494622ab # 1.7.214
+    SHA512 dc4e003ffaebf21410d8d360f8a4602dda99d3ee0c0ab7fb61c97fe8b5f0b38438ed5315fb85d3a435cd5a99724e43c5cf569a7cb365ed8137caeac32c619a86
    HEAD_REF master
 )

@ -16,14 +14,11 @@ set(BUILD_ONLY core)

 include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)

-if(CMAKE_HOST_WIN32)
-    string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
-else()
-    string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
-endif()
+string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
    PREFER_NINJA
    OPTIONS
        -DENABLE_UNITY_BUILD=ON
@ -83,4 +78,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 endif()

 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 2019-10-07.2-1
+Version: 2020-01-22-1
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c

--- a/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch
+++ b/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch
@ -0,0 +1,248 @@
+diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake
+index e85defa..7f450ab 100644
+--- a/configs/azure_c_shared_utilityFunctions.cmake
+++ b/configs/azure_c_shared_utilityFunctions.cmake
+@@ -2,11 +2,11 @@
+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.
+ 
+ function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib)
+-    if(${arg_prefix} STREQUAL "debug")
+    if(arg_prefix STREQUAL "debug")
+         target_link_libraries(${whatIsBuilding} debug ${lib})
+-    elseif(${arg_prefix} STREQUAL "optimized")
+    elseif(arg_prefix STREQUAL "optimized")
+         target_link_libraries(${whatIsBuilding} optimized ${lib})
+-    elseif(${arg_prefix} STREQUAL "general")
+    elseif(arg_prefix STREQUAL "general")
+         target_link_libraries(${whatIsBuilding} general ${lib})
+     else()
+         target_link_libraries(${whatIsBuilding} ${lib})
+@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
+@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             set(skip_to_next TRUE)
+             #also unset all the other states
+ 
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding)
+ 
+     if(${run_valgrind})
+         find_program(VALGRIND_FOUND NAMES valgrind)
+-        if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+        if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
+             message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
+         else()
+             add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind                 --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
+@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
+@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
+ 
+     if(${run_valgrind})
+         find_program(VALGRIND_FOUND NAMES valgrind)
+-        if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+        if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
+             message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
+         else()
+             add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind                 --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
+@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
+             (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
+         )
+             if (${use_cppunittest})
+-                if(${compileAsWhat} STREQUAL "C99")
+                if(compileAsWhat STREQUAL "C99")
+                     compileTargetAsC99(${whatIsBuilding}_dll)
+                     compileTargetAsC99(${whatIsBuilding}_testsonly_lib)
+                 endif()
+-                if(${compileAsWhat} STREQUAL "C11")
+                if(compileAsWhat STREQUAL "C11")
+                     compileTargetAsC11(${whatIsBuilding}_dll)
+                     compileTargetAsC11(${whatIsBuilding}_testsonly_lib)
+                 endif()
+             endif()
+-            if(${compileAsWhat} STREQUAL "C99")
+            if(compileAsWhat STREQUAL "C99")
+                 compileTargetAsC99(${whatIsBuilding}_exe)
+             endif()
+-            if(${compileAsWhat} STREQUAL "C11")
+            if(compileAsWhat STREQUAL "C11")
+                 compileTargetAsC11(${whatIsBuilding}_exe)
+             endif()
+         else()
+             if(
+                 (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests})
+             )
+-                if(${compileAsWhat} STREQUAL "C99")
+                if(compileAsWhat STREQUAL "C99")
+                     compileTargetAsC99(${whatIsBuilding}_exe)
+                 endif()
+-                if(${compileAsWhat} STREQUAL "C11")
+                if(compileAsWhat STREQUAL "C11")
+                     compileTargetAsC11(${whatIsBuilding}_exe)
+                 endif()
+             else()
+@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
+             (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR
+             (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
+         )
+-            if(${compileAsWhat} STREQUAL "C99")
+            if(compileAsWhat STREQUAL "C99")
+                 compileTargetAsC99(${whatIsBuilding}_exe)
+             endif()
+-            if(${compileAsWhat} STREQUAL "C11")
+            if(compileAsWhat STREQUAL "C11")
+                 compileTargetAsC11(${whatIsBuilding}_exe)
+             endif()
+         endif()
+@@ -641,8 +641,8 @@ function(set_platform_files c_shared_dir)
+             set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE)
+         endif()
+         if(use_etw)
+-            if(${use_etw} OR (${use_etw} STREQUAL "ON_WITH_CONSOLE"))
+-                if (${use_etw} STREQUAL "ON_WITH_CONSOLE")
+            if(use_etw OR (use_etw STREQUAL "ON_WITH_CONSOLE"))
+                if (use_etw STREQUAL "ON_WITH_CONSOLE")
+                     set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)
+                     set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)
+                     set(LOGGING_RC_FILE ${c_shared_dir}/res/etwlogger.rc CACHE INTERNAL "")
--- a/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch
+++ b/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch
@ -0,0 +1,256 @@
+diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake
+index 6c2f415..e6133af 100644
+--- a/configs/azure_c_shared_utilityFunctions.cmake
+++ b/configs/azure_c_shared_utilityFunctions.cmake
+@@ -2,11 +2,11 @@
+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.
+ 
+ function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib)
+-    if(${arg_prefix} STREQUAL "debug")
+    if(arg_prefix STREQUAL "debug")
+         target_link_libraries(${whatIsBuilding} debug ${lib})
+-    elseif(${arg_prefix} STREQUAL "optimized")
+    elseif(arg_prefix STREQUAL "optimized")
+         target_link_libraries(${whatIsBuilding} optimized ${lib})
+-    elseif(${arg_prefix} STREQUAL "general")
+    elseif(arg_prefix STREQUAL "general")
+         target_link_libraries(${whatIsBuilding} general ${lib})
+     else()
+         target_link_libraries(${whatIsBuilding} ${lib})
+@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
+@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             set(skip_to_next TRUE)
+             #also unset all the other states
+ 
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding)
+ 
+     if(${run_valgrind})
+         find_program(VALGRIND_FOUND NAMES valgrind)
+-        if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+        if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
+             message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
+         else()
+             add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind                 --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
+@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
+@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
+     set(ARG_PREFIX "none")
+     foreach(f ${ARGN})
+         set(skip_to_next FALSE)
+-        if(${f} STREQUAL "ADDITIONAL_LIBS")
+        if(f STREQUAL "ADDITIONAL_LIBS")
+             SET(PARSING_ADDITIONAL_LIBS ON)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
+             set(ARG_PREFIX "none")
+             #also unset all the other states
+             set(skip_to_next TRUE)
+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+             SET(PARSING_ADDITIONAL_LIBS OFF)
+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
+             set(skip_to_next TRUE)
+@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
+ 
+         if(NOT skip_to_next)
+             if(PARSING_ADDITIONAL_LIBS)
+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
+                     SET(ARG_PREFIX ${f})
+                 else()
+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
+@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
+ 
+     if(${run_valgrind})
+         find_program(VALGRIND_FOUND NAMES valgrind)
+-        if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+        if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
+             message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
+         else()
+             add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind                 --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
+@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
+             (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
+         )
+             if (${use_cppunittest})
+-                if(${compileAsWhat} STREQUAL "C99")
+                if(compileAsWhat STREQUAL "C99")
+                     compileTargetAsC99(${whatIsBuilding}_dll)
+                     compileTargetAsC99(${whatIsBuilding}_testsonly_lib)
+                 endif()
+-                if(${compileAsWhat} STREQUAL "C11")
+                if(compileAsWhat STREQUAL "C11")
+                     compileTargetAsC11(${whatIsBuilding}_dll)
+                     compileTargetAsC11(${whatIsBuilding}_testsonly_lib)
+                 endif()
+             endif()
+-            if(${compileAsWhat} STREQUAL "C99")
+            if(compileAsWhat STREQUAL "C99")
+                 compileTargetAsC99(${whatIsBuilding}_exe)
+             endif()
+-            if(${compileAsWhat} STREQUAL "C11")
+            if(compileAsWhat STREQUAL "C11")
+                 compileTargetAsC11(${whatIsBuilding}_exe)
+             endif()
+         else()
+             if(
+                 (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests})
+             )
+-                if(${compileAsWhat} STREQUAL "C99")
+                if(compileAsWhat STREQUAL "C99")
+                     compileTargetAsC99(${whatIsBuilding}_exe)
+                 endif()
+-                if(${compileAsWhat} STREQUAL "C11")
+                if(compileAsWhat STREQUAL "C11")
+                     compileTargetAsC11(${whatIsBuilding}_exe)
+                 endif()
+             else()
+@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
+             (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR
+             (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
+         )
+-            if(${compileAsWhat} STREQUAL "C99")
+            if(compileAsWhat STREQUAL "C99")
+                 compileTargetAsC99(${whatIsBuilding}_exe)
+             endif()
+-            if(${compileAsWhat} STREQUAL "C11")
+            if(compileAsWhat STREQUAL "C11")
+                 compileTargetAsC11(${whatIsBuilding}_exe)
+             endif()
+         endif()
+@@ -641,15 +641,15 @@ function(set_platform_files c_shared_dir)
+             set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE)
+         endif()
+         
+-        if(${use_etw} STREQUAL "OFF")
+        if(use_etw STREQUAL "OFF")
+             set(XLOGGING_C_FILE ${c_shared_dir}/src/xlogging.c PARENT_SCOPE)
+             set(LOGGING_C_FILE ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)
+             set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE)
+-        elseif(${use_etw} STREQUAL "TRACELOGGING")
+        elseif(use_etw STREQUAL "TRACELOGGING")
+             set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)
+             set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c PARENT_SCOPE)
+             set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h PARENT_SCOPE)
+-        elseif(${use_etw} STREQUAL "TRACELOGGING_WITH_CONSOLE")
+        elseif(use_etw STREQUAL "TRACELOGGING_WITH_CONSOLE")
+             set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)
+             set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)
+             set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE)
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@ -9,14 +9,18 @@ if("public-preview" IN_LIST FEATURES)
        REF 42574842914591aadc77701aac72f18cc72319ad
        SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
        HEAD_REF master
+        PATCHES 
+            fix-utilityFunctions-conditions-preview.patch
    )
 else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-c-shared-utility
-        REF 42574842914591aadc77701aac72f18cc72319ad
-        SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
+        REF 48f7a556865731f0e96c47eb5e9537361f24647c
+        SHA512 c20074707e8601e090ee8daac1d96fdfb4f60ac60fd9c824dad81aa4c2f22b04733c82c01c1ae92110c26871b81674e8771d9ed65081f1c0c197a362275a28f1
        HEAD_REF master
+        PATCHES 
+            fix-utilityFunctions-conditions.patch
    )
 endif()

--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-iot-sdk-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 

--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@ -15,8 +15,8 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-iot-sdk-c
-        REF f8d260df190f90c04114ca8ff7d83dd03d4dd80d
-        SHA512 111331293cfbdbdac4a6460d293ec8650bee31940829852c27afc88cc6e742e96f71c996aa275dc5ed1f13e9fe19452d7b2685dde47bb7d6c135ebee58c50d21
+        REF a8a71c2d120c571a2d2ab6149863c2b075e7bea9
+        SHA512 bc9cae705bef7d9c5c33b80c1d564566058ae4e6bcd343d94df9d139d9f71e620da940c5dcf7ccdc16e75388a03ff3393b40fe603201938c7a37d60b938ca874
        HEAD_REF master
        PATCHES improve-external-deps.patch
    )
--- a/ports/azure-kinect-sensor-sdk/CONTROL
+++ b/ports/azure-kinect-sensor-sdk/CONTROL
@ -1,5 +1,5 @@
 Source: azure-kinect-sensor-sdk
-Version: 1.4.0-alpha.0-1
+Version: 1.4.0-alpha.0-2
 Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK
 Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.
 Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv
--- a/ports/azure-kinect-sensor-sdk/fix-components-path.patch
+++ b/ports/azure-kinect-sensor-sdk/fix-components-path.patch
@ -1,26 +0,0 @@
-diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt
-index 4be0697..d30c6de 100644
--- a/src/record/sdk/CMakeLists.txt
-+++ b/src/record/sdk/CMakeLists.txt
-@@ -81,7 +81,7 @@ install(
-             development
-     RUNTIME
-         DESTINATION
-            ${CMAKE_INSTALL_BINDIR}
-+            tools
-         COMPONENT
-             runtime
- )
-diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt
-index 3616f40..a5019cb 100644
--- a/src/sdk/CMakeLists.txt
-+++ b/src/sdk/CMakeLists.txt
-@@ -90,7 +90,7 @@ install(
-             development
-     RUNTIME
-         DESTINATION
-            ${CMAKE_INSTALL_BINDIR}
-+            tools
-         COMPONENT
-             runtime
- )
--- a/ports/azure-kinect-sensor-sdk/portfile.cmake
+++ b/ports/azure-kinect-sensor-sdk/portfile.cmake
@ -7,7 +7,6 @@ vcpkg_from_github(
    PATCHES
        fix-builds.patch
        disable-c4275.patch
-        fix-components-path.patch
 )

 vcpkg_find_acquire_program(PYTHON3)
--- a/ports/azure-macro-utils-c/CONTROL
+++ b/ports/azure-macro-utils-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-macro-utils-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Description: A library of macros for the Azure IoT SDK Suite
 Build-Depends: 

--- a/ports/azure-macro-utils-c/portfile.cmake
+++ b/ports/azure-macro-utils-c/portfile.cmake
@ -14,8 +14,8 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-macro-utils-c
-        REF 7523af934fc4d9423111e358f49b19314ec9c3e3
-        SHA512 b53765096654fff9c5670004e4e107bffa81dd07e63eeac687c9e2b7e5ea2e1f26b6ae025c05c45f5c28152a457922f08c7f8d3303fa4d3b9194c34ba59533d5
+        REF 5926caf4e42e98e730e6d03395788205649a3ada
+        SHA512 97621f276657af976c4022c9600540ecae2287b3b386b9e097d661828a62c120348d354b3f86f3ef4d49f3c54830887662d3910ed5cec4a634949fa389b4ad55
        HEAD_REF master
    )
 endif()
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@ -1,6 +1,7 @@
 Source: azure-storage-cpp
-Version: 7.1.0
-Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
+Version: 7.1.0-1
+Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext (osx)
 Description: Microsoft Azure Storage Client SDK for C++
  A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.
 Homepage: https://blogs.msdn.com/b/windowsazurestorage/
+Supports: !uwp
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@ -1,8 +1,4 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "UWP")

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
@ -19,7 +15,10 @@ vcpkg_configure_cmake(
        -DCMAKE_FIND_FRAMEWORK=LAST
        -DBUILD_TESTS=OFF
        -DBUILD_SAMPLES=OFF
-        -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/include
+    OPTIONS_RELEASE
+        -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/lib
+    OPTIONS_DEBUG
+        -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/debug/lib
 )

 vcpkg_install_cmake()
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-uamqp-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: AMQP library for C

--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@ -14,8 +14,8 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-uamqp-c
-        REF 065ffdeeb47313ddbbc2a8e84ad52ab033e2e8d2
-        SHA512 bade6fae2d5479b7690632dbcc58bda5dd871eb0aa63d6a56cb35e81630121b5148309cd3414e6339c1218ec59fc12ac318b4964d295b579f7a0cacf5593b7ba
+        REF 142cfab9d66c6f81ea0cceb635f31e00cfa51c77
+        SHA512 80f95bc969c2e50124622561b5f939e981a8d317e3e9514e52ce020f0f20a125622bf914f16927edafc7ff3c878fb1d6a28f4f5e66bda52dcc8aa2dc34761f73
        HEAD_REF master
    )
 endif()
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-uhttp-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: Azure HTTP Library written in C

--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@ -14,8 +14,8 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-uhttp-c
-        REF d84a20609a2b5a555920389451fb3c9a2ed3656c
-        SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6
+        REF b67a6bfa0d018a8a23176ee214e46c208fc323c3
+        SHA512 75fafe242324bb2fc72befdd06427350e6f99aec9496fdf38b9660e7965fad89276ee543f36c3ba3360fc99b8301e74e2c1723d17f39e8471beee3e32cacb348
        HEAD_REF master
    )
 endif()
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-umqtt-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: General purpose library for communication over the mqtt protocol

--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@ -14,8 +14,8 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-umqtt-c
-        REF 7557db6de094b67818d3c410dc95a3cf07cd86a6
-        SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40
+        REF 65cdd1013715fb9d208c42f957eb353fbe22bafb
+        SHA512 8cd33dcde966132e2aa0c6d931e75f9bcdc5734d57d8f6bb8a922711b0b63c2f0e58d379fe92371886387dfbb0b8c117b512873363eb76cf22fa985dbf11d52e
        HEAD_REF master
    )
 endif()
--- a/ports/benchmark/CONTROL
+++ b/ports/benchmark/CONTROL
@ -2,3 +2,4 @@ Source: benchmark
 Version: 1.5
 Homepage: https://github.com/google/benchmark
 Description: A library to support the benchmarking of functions, similar to unit-tests.
+Supports: !uwp
--- a/ports/berkeleydb/CONTROL
+++ b/ports/berkeleydb/CONTROL
@ -2,3 +2,4 @@ Source: berkeleydb
 Version: 4.8.30-3
 Homepage: https://download.oracle.com/
 Description: BDB - A high-performance embedded database for key/value data.
+Supports: !uwp
--- a/ports/boost-accumulators/CONTROL
+++ b/ports/boost-accumulators/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-accumulators
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/accumulators
 Description: Boost accumulators module
--- a/ports/boost-accumulators/portfile.cmake
+++ b/ports/boost-accumulators/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/accumulators
-    REF boost-1.71.0
-    SHA512 72cc55074f40475b6506802ce9be0291439db30f2bbb1c826952fa258b00d3f097ac7dd6c6b1c03d721633d720ac16c213272076af7ca9d205e5544fc459c93c
+    REF boost-1.72.0
+    SHA512 3e232de2d32bffc5483edf201dd2cfbc8c6584c0be877c8234c2bd21eee118eaf9b96050b26bc8237ba552a2dca3f313ace8264d45ef7e9035732ce1ee74384d
    HEAD_REF master
 )

--- a/ports/boost-algorithm/CONTROL
+++ b/ports/boost-algorithm/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-algorithm
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/algorithm
 Description: Boost algorithm module
--- a/ports/boost-algorithm/portfile.cmake
+++ b/ports/boost-algorithm/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/algorithm
-    REF boost-1.71.0
-    SHA512 2ed7e5d59a3b3de6b316616212cc88d452c8b977643b3b9ffa9256af29fd739f596a833698462624fae83b0b491aa29bdec8792d2aaf3c4ee477308011af075d
+    REF boost-1.72.0
+    SHA512 503fb782faad0e68e58841b098162a32f08a5f125ceb1af46272096daf223056fbf5b3e1011773ad8ef1dc9dfd301feef82ce6ce870fe4741ee838ca5f5bc6f7
    HEAD_REF master
 )

--- a/ports/boost-align/CONTROL
+++ b/ports/boost-align/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-align
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/align
 Description: Boost align module
--- a/ports/boost-align/portfile.cmake
+++ b/ports/boost-align/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/align
-    REF boost-1.71.0
-    SHA512 0a30c994a162efa253b5cda7fb03a1bc179c1918eac9690c50396862aff40eaada051ba28dede663454184bc51b095ed3fa45040a66b338a9945cc19729a2a63
+    REF boost-1.72.0
+    SHA512 5044b1faeca09ed88aa529092805d359c3e82ddf1be8e227a020acf8d21a4c1a670381bbd7024271e86407da2702c6f9705d76dfd889cecdf301ccea5e0aaa09
    HEAD_REF master
 )

--- a/ports/boost-any/CONTROL
+++ b/ports/boost-any/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-any
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/any
 Description: Boost any module
--- a/ports/boost-any/portfile.cmake
+++ b/ports/boost-any/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/any
-    REF boost-1.71.0
-    SHA512 b197602abf2cf2d0efb796c019c60562fbeceda70ce8083272566740c5d2b4fd73e52a567714f2a89034aec7bb56f441fc9c1e083f08f82395fd86e923e86926
+    REF boost-1.72.0
+    SHA512 5b1f35356f1ec8f48ddf534a13fc99a0da5579c0ff7d08b444888d18961b2f16fbf0f12ed099c9c53653df92cd7ea3a9f98a9fc4bbf865df91deb7085294ca9e
    HEAD_REF master
 )

--- a/ports/boost-array/CONTROL
+++ b/ports/boost-array/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-array
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/array
 Description: Boost array module
--- a/ports/boost-array/portfile.cmake
+++ b/ports/boost-array/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/array
-    REF boost-1.71.0
-    SHA512 6b4fca7c5fb6630daef7580d3f6e693e2c61d139ce50d940cbe250618793500701c0c96aa708dbd846b6b3bf21ef5b5125486143e9a113577023273e199195e0
+    REF boost-1.72.0
+    SHA512 61252106866227256045d438a64a64083068ae258590ce1e16909b46106c73d0492624aaf477f04b1b6f787ded3527786ecc93af79b90b8356a8c1dcd9917908
    HEAD_REF master
 )

--- a/ports/boost-asio/CONTROL
+++ b/ports/boost-asio/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-asio
-Version: 1.71.0-1
+Version: 1.72.0
 Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
 Homepage: https://github.com/boostorg/asio
 Description: Boost asio module
--- a/ports/boost-asio/portfile.cmake
+++ b/ports/boost-asio/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/asio
-    REF boost-1.71.0
-    SHA512 e174e708305caadef89bc0c091bd5bee236315f8c4b5d917db1984de7dbe15fca5296d0ec9ef2668cdd138900582a02c4d056982501b508e55b78f0355f6c98d
+    REF boost-1.72.0
+    SHA512 5d3ae95cf0261fddd037beb6225c51b6a575779f10e8125c7e2f069642f54c0935f6b048187f55c10569874b7d4de488efae058d43d92caf5b8661e13dbcaae5
    HEAD_REF master
    PATCHES windows_alloca_header.patch
 )
--- a/ports/boost-assert/CONTROL
+++ b/ports/boost-assert/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-assert
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-config, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/assert
 Description: Boost assert module
--- a/ports/boost-assert/portfile.cmake
+++ b/ports/boost-assert/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/assert
-    REF boost-1.71.0
-    SHA512 3739a1d666b925c4c7c4bd136af49203538f946265c8e1643e4385afa79600e6cad68163789e1dbc906637f561eb08171276d6be9c705007008734cedb8dd0b5
+    REF boost-1.72.0
+    SHA512 ae83ce78bb247a521f06b3c22835456ebbca05eae89c78c4657010df58e5c923e65e00c772e89e16e2c9ce9eea8f5b5fb2e1700883bb3d5796f4108075634bdc
    HEAD_REF master
 )

--- a/ports/boost-assign/CONTROL
+++ b/ports/boost-assign/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-assign
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-array, boost-config, boost-detail, boost-move, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/assign
 Description: Boost assign module
--- a/ports/boost-assign/portfile.cmake
+++ b/ports/boost-assign/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/assign
-    REF boost-1.71.0
-    SHA512 5875a5244a6f96239a37a196c06a9046c8af57399f37fb4259f268faee35dded2c4185ce2d44d18ccaa0ebfa1b8f6e12190d1873df326cf7068c3e31df28725b
+    REF boost-1.72.0
+    SHA512 71913c0612e3b0a4204b0f23e9c9848a37a7bdc028965c040c4bf65cdb4e884f67d39304ef5b41045643664e1e29da4d56cddac3b1bde5af0f058faa3efa1e18
    HEAD_REF master
 )

--- a/ports/boost-atomic/CONTROL
+++ b/ports/boost-atomic/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-atomic
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/atomic
 Description: Boost atomic module
--- a/ports/boost-atomic/portfile.cmake
+++ b/ports/boost-atomic/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/atomic
-    REF boost-1.71.0
-    SHA512 b9410ddd63cc2d26e8364f70f53a87c5e042c5ba26d4431d1e5c75dd1f2bbcda005f69b7e106afe6c26991701a04c8e94ed4720d3460f43cf3027d3fa33379dc
+    REF boost-1.72.0
+    SHA512 dc8f20520b91d9691318cdb09654294105522c4367e823b4a2c54fbd1ebf818bd59edd92f7cd37634bc09dc341cc0a6664ce8a240dd860674f115be162a6b30f
    HEAD_REF master
 )

--- a/ports/boost-beast/CONTROL
+++ b/ports/boost-beast/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-beast
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-logic, boost-mp11, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/beast
 Description: Boost beast module
--- a/ports/boost-beast/portfile.cmake
+++ b/ports/boost-beast/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/beast
-    REF boost-1.71.0
-    SHA512 85ab272f7093375ac070644a8c76f6919e0ab3e612db8aa1934e22338721645085991434919bebd8618ae3abcbc674fdda7a6fc3a39c3e46408b456512c371cf
+    REF boost-1.72.0
+    SHA512 beffe921767466830089ce20cec4dfb27f6d2b7864fde990a682349d0944037d5fa517f2dfeb5d4c22d3f3410aa3803012fbf4220311367d95a0238d84a2f24c
    HEAD_REF master
 )

--- a/ports/boost-bimap/CONTROL
+++ b/ports/boost-bimap/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-bimap
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-concept-check, boost-config, boost-container-hash, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/bimap
 Description: Boost bimap module
--- a/ports/boost-bimap/portfile.cmake
+++ b/ports/boost-bimap/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/bimap
-    REF boost-1.71.0
-    SHA512 f1af7cca25612e9dd3774ea8d426228263fb2ec3c12df0093978a475eefd640a9d8cc5922f4e209112e9b28c9560d3092a385be4ef9e0751bfec1ec3ffe76ae5
+    REF boost-1.72.0
+    SHA512 150b1abba1d2f17ddd4fc0c52b3e601ce80208437b8df4e4fe44b9a020838617cdb184947d63f8552e6c0d94436b52688dfa7b4c98f847aa954b626df704cf9a
    HEAD_REF master
 )

--- a/ports/boost-bind/CONTROL
+++ b/ports/boost-bind/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-bind
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/bind
 Description: Boost bind module
--- a/ports/boost-bind/portfile.cmake
+++ b/ports/boost-bind/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/bind
-    REF boost-1.71.0
-    SHA512 1b808d5a7203da549cb35867fbf87f20557ee26376bf7cfc21c1476feae9397492f0efd18be27e202a069b2d29a4d256b6dc93efea6cbd9fe74b16631ca18bc4
+    REF boost-1.72.0
+    SHA512 b09942be125de1fb07399414a48d3ea7694fe3eb51691d0dab0278ca973d1d80c31ea98f64f007d483d2953f0162db33e88578596619f284ac0c0cbf60977a3f
    HEAD_REF master
 )

--- a/ports/boost-build/CONTROL
+++ b/ports/boost-build/CONTROL
@ -1,4 +1,4 @@
 Source: boost-build
-Version: 1.70.0-1
+Version: 1.72.0
 Homepage: https://github.com/boostorg/build
 Description: Boost.Build
--- a/ports/boost-build/arm64msvc.patch
+++ b/ports/boost-build/arm64msvc.patch
@ -1,63 +0,0 @@
-diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
-index e6c0b60..62c3a41 100644
--- a/src/tools/msvc.jam
-+++ b/src/tools/msvc.jam
-@@ -466,6 +466,7 @@ rule configure-version-specific ( toolset : version : conditions )
-         toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-i386)  : "/MACHINE:X86" ;
-         toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-ia64)  : "/MACHINE:IA64" ;
-         toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-arm)   : "/MACHINE:ARM" ;
-+        toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-arm64) : "/MACHINE:ARM64" ;
- 
-         # Make sure that manifest will be generated even if there is no
-         # dependencies to put there.
-@@ -1256,7 +1257,7 @@ local rule configure-really ( version ? : options * )
-         local below-8.0 = [ MATCH "^([67]\\.)" : $(version) ] ;
-         local below-11.0 = [ MATCH "^([6789]\\.|10\\.)" : $(version) ] ;
-         
-        local cpu = i386 amd64 ia64 arm ;
-+        local cpu = i386 amd64 ia64 arm arm64 ;
-         if $(below-8.0)
-         {
-             cpu = i386 ;
-@@ -1270,6 +1271,7 @@ local rule configure-really ( version ? : options * )
-         local setup-i386 ;
-         local setup-ia64 ;
-         local setup-arm ;
-+        local setup-arm64 ;
-         local setup-phone-i386 ;
-         local setup-phone-arm ;
- 
-@@ -1327,6 +1329,7 @@ local rule configure-really ( version ? : options * )
-             local default-setup-i386  = vcvars32.bat ;
-             local default-setup-ia64  = vcvarsx86_ia64.bat ;
-             local default-setup-arm   = vcvarsx86_arm.bat ;
-+            local default-setup-arm64 = vcvarsx86_arm64.bat ;
-             local default-setup-phone-i386 = vcvarsphonex86.bat ;
-             local default-setup-phone-arm = vcvarsphonex86_arm.bat ;
- 
-@@ -1338,6 +1341,7 @@ local rule configure-really ( version ? : options * )
-             local default-global-setup-options-i386  = x86 ;
-             local default-global-setup-options-ia64  = x86_ia64 ;
-             local default-global-setup-options-arm   = x86_arm ;
-+            local default-global-setup-options-arm64 = x86_arm64 ;
- 
-             # When using 64-bit Windows, and targeting 64-bit, it is possible to
-             # use a native 64-bit compiler, selected by the "amd64" & "ia64"
-@@ -1418,6 +1422,7 @@ local rule configure-really ( version ? : options * )
-         local default-assembler-i386  = "ml -coff" ;
-         local default-assembler-ia64  = ias ;
-         local default-assembler-ia64  = armasm ;
-+        local default-assembler-arm64 = armasm64 ;
- 
-         assembler = [ feature.get-values <assembler> : $(options) ] ;
- 
-@@ -1932,6 +1937,9 @@ if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
-     <architecture>arm/<address-model>
-     <architecture>arm/<address-model>32 ;
- 
-+.cpu-arch-arm64 =
-+    <architecture>arm/<address-model>
-+    <architecture>arm/<address-model>64 ;
- 
- # Supported CPU types (only Itanium optimization options are supported from
- # VC++ 2005 on). See
--- a/ports/boost-build/portfile.cmake
+++ b/ports/boost-build/portfile.cmake
@ -8,17 +8,14 @@ elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_N
    return()
 endif()

-set(BOOST_VERSION 1.70.0)
+set(BOOST_VERSION 1.72.0)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/build
    REF boost-${BOOST_VERSION}
-    SHA512 be4e410a9656313519e089977a24da8f633db2182985f5d60e07e489f9eac8c887e8cab7e3cbd13f2b747bc3d9dab2899f174be1eaac73cfd7895015fb6b9b58
+    SHA512 744816ba805013a49029373a4d2aa5b5f543275a1cdef2812c2120c868c55bf36a0bb0fb891cd955ad7319e582fd5212bd52ff071703a8654b345c478e810a19
    HEAD_REF master
-	PATCHES
-	    # Add the support of arm64-windows
-        arm64msvc.patch
 )

 vcpkg_download_distfile(ARCHIVE
--- a/ports/boost-callable-traits/CONTROL
+++ b/ports/boost-callable-traits/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-callable-traits
-Version: 1.71.0
+Version: 1.72.0
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/callable_traits
 Description: Boost callable_traits module
--- a/ports/boost-callable-traits/portfile.cmake
+++ b/ports/boost-callable-traits/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/callable_traits
-    REF boost-1.71.0
-    SHA512 91502779b9d0c2a3574e9c824893e344c949e44765616b9b1ab75bcf869143d10f3016d3e001c1f99c96bf7eed1c8014c659b6e8a518f663f08327ed4eef3438
+    REF boost-1.72.0
+    SHA512 ad32e155e0d2d1a0ed88d34bc5772e8756bb6a73335f4c207710ac22efb5fb77b1199b3df128c1f4164e87a7aafaa14c604864047d1a49ede3475eba169eb449
    HEAD_REF master
 )

--- a/Show More
+++ b/Show More