microsoft · ras0219-msft · Feb 3, 2020 · Oct 7, 2019 · Oct 9, 2019 · Oct 9, 2019
diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md
@@ -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,28 +96,55 @@ 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
 Comma separated list of optional port features to install by default.
 
 This field is optional.
 
+##### Example:
 ```no-highlight
 Default-Features: dynamodb, s3, kinesis
 ```
 
+#### Supports
+Expression that evalutates 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` == `""` || `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"`
+
+This field is optional and defaults to true.
+
+##### 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.

diff --git 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
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
@@ -2,6 +2,7 @@ Source: ace
 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

diff --git 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
diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake
@@ -12,7 +12,8 @@ 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

diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.214
+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

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_buildpath_length_warning(37)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF e8a7e7263e900983921e95363026efaa494622ab # 1.7.214
+    REF e8a7e7263e900983921e95363026efaa494622ab # 1.7.214
     SHA512 dc4e003ffaebf21410d8d360f8a4602dda99d3ee0c0ab7fb61c97fe8b5f0b38438ed5315fb85d3a435cd5a99724e43c5cf569a7cb365ed8137caeac32c619a86
     HEAD_REF master
 )
@@ -14,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

diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
@@ -4,3 +4,4 @@ Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), bo
 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
diff --git 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
diff --git 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
diff --git a/ports/c-ares/CONTROL b/ports/c-ares/CONTROL
@@ -2,3 +2,4 @@ Source: c-ares
 Version: 2019-5-2-1
 Homepage: https://github.com/c-ares/c-ares
 Description: A C library for asynchronous DNS requests
+Supports: !uwp
diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL
@@ -3,3 +3,4 @@ Version: 0.8.1-3
 Build-Depends: lmdb, gflags, glog, eigen3, protobuf
 Homepage: https://github.com/caffe2/caffe2
 Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
+Supports: !x86
diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL
@@ -3,3 +3,4 @@ Version: 0.7.0-3
 Description: Data interchange format and capability-based RPC system
 Homepage: https://capnproto.org/
 Build-Depends: zlib
+Supports: !uwp
diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL
@@ -1,3 +1,4 @@
 Source: civetweb
 Version: 2019-07-05
 Description: Easy to use, powerful, C/C++ embeddable web server.
+Supports: !uwp
diff --git a/ports/coroutine/CONTROL b/ports/coroutine/CONTROL
@@ -2,3 +2,4 @@ Source: coroutine
 Version: 2020-01-13
 Build-Depends: ms-gsl
 Description: C++ coroutine helper/example library
+Supports: !x86
diff --git a/ports/cpp-netlib/CONTROL b/ports/cpp-netlib/CONTROL
@@ -3,3 +3,4 @@ Version: 0.13.0-3
 Homepage: https://cpp-netlib.org/
 Build-Depends: boost
 Description: A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library
+Supports: !uwp
diff --git a/ports/cppfs/CONTROL b/ports/cppfs/CONTROL
@@ -1,6 +1,7 @@
 Source: cppfs
 Version: 1.2.0-1
 Description: Cross-platform C++ file system library supporting multiple backends
+Supports: !uwp
 
 Feature: ssh
 Description: SSH backend for cppfs

diff --git a/ports/cppitertools/CONTROL b/ports/cppitertools/CONTROL
@@ -1,4 +1,4 @@
 Source: cppitertools
-Version: 2019-04-14-2
+Version: 2019-04-14-3
 Description: Range-based for loop add-ons inspired by the Python builtins and itertools library
 Build-Depends: boost-optional
diff --git a/ports/cppitertools/portfile.cmake b/ports/cppitertools/portfile.cmake
@@ -1,7 +1,3 @@
-# header-only library
-
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ryanhaining/cppitertools
@@ -13,8 +9,8 @@ vcpkg_from_github(
 file(GLOB INCLUDE_FILES ${SOURCE_PATH}/*.hpp)
 file(GLOB INCLUDE_INTERNAL_FILES ${SOURCE_PATH}/internal/*.hpp)
 
-file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${INCLUDE_INTERNAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/internal)
+file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cppitertools)
+file(COPY ${INCLUDE_INTERNAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cppitertools/internal)
 
 # Handle copyright
 configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL
@@ -2,3 +2,4 @@ Source: cudnn
 Version: 7.6
 Description: NVIDIA's cuDNN deep neural network acceleration library
 Build-Depends: cuda
+Supports: (windows|linux)&x64
diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL
@@ -2,6 +2,7 @@ Source: darknet
 Version: 0.2.5.1-1
 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
 Build-Depends: pthreads (windows), stb
+Supports: !(arm|uwp)
 
 Feature: cuda
 Build-Depends: cuda

diff --git a/ports/dirent/portfile.cmake b/ports/dirent/portfile.cmake
@@ -3,7 +3,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
     return()
 endif()
 
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tronkko/dirent
@@ -14,3 +13,5 @@ vcpkg_from_github(
 file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dirent RENAME copyright)
 vcpkg_copy_pdbs()
+
+set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
diff --git a/ports/dlfcn-win32/portfile.cmake b/ports/dlfcn-win32/portfile.cmake
@@ -1,4 +1,3 @@
-include(vcpkg_common_functions)
 set(SOURCE_VERSION 1.1.1)
 
 vcpkg_from_github(
@@ -27,3 +26,5 @@ vcpkg_copy_pdbs()
 
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+
+set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL
@@ -3,6 +3,7 @@ Version: 2019-08-12-1
 Homepage: https://github.com/dmlc/dmlc-core
 Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
 Default-Features: openmp
+Supports: !uwp
 
 Feature: openmp
 Description: Build with openmp
diff --git a/ports/dpdk/CONTROL b/ports/dpdk/CONTROL
@@ -1,4 +1,4 @@
 Source: dpdk
 Version: 19.02
 Description: A set of libraries and drivers for fast packet processing
-
+Supports: linux
diff --git a/ports/easyhook/CONTROL b/ports/easyhook/CONTROL
@@ -1,4 +1,5 @@
 Source: easyhook
 Version: 2.7.6789.0
 Homepage: https://github.com/EasyHook/EasyHook
-Description: This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.
+Description: This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.
+Supports: windows
diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL
@@ -2,3 +2,4 @@ Source: ebml
 Version: 1.3.9
 Homepage: https://github.com/Matroska-Org/libebml
 Description: a C++ libary to parse EBML files
+Supports: !uwp
diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL
@@ -2,3 +2,4 @@ Source: expat
 Version: 2.2.7
 Homepage: https://github.com/libexpat/libexpat
 Description: XML parser library written in C
+Supports: !uwp
diff --git a/ports/field3d/CONTROL b/ports/field3d/CONTROL
@@ -3,3 +3,4 @@ Version: 1.7.2
 Homepage: https://github.com/imageworks/Field3D
 Description: An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.
 Build-Depends: hdf5, boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format
+Supports: !(windows|arm|uwp)
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
@@ -4,6 +4,7 @@ Homepage: https://github.com/facebook/folly
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr
 Default-Features: zlib
+Supports: x64
 
 Feature: zlib
 Build-Depends: zlib

diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL
@@ -2,3 +2,4 @@ Source: forge
 Version: 1.0.4-2
 Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
 Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
+Supports: x64
diff --git a/ports/getopt-win32/CONTROL b/ports/getopt-win32/CONTROL
@@ -2,3 +2,4 @@ Source: getopt-win32
 Version: 0.1
 Description: An implementation of getopt.
 Homepage: https://github.com/libimobiledevice-win32
+Supports: windows
diff --git a/ports/getopt-win32/portfile.cmake b/ports/getopt-win32/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 if(VCPKG_CMAKE_SYSTEM_NAME)
     message(FATAL_ERROR "getopt-win32 only supports building on Windows Desktop")
 endif()
@@ -22,3 +20,5 @@ vcpkg_install_msbuild(
 
 # Copy header
 file(COPY ${SOURCE_PATH}/getopt.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
+
+set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
diff --git a/ports/getopt/CONTROL b/ports/getopt/CONTROL
@@ -2,3 +2,4 @@ Source: getopt
 Version: 0
 Description: The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.
 Build-Depends: getopt-win32 (windows)
+Supports: !uwp