Merge branch 'master' of https://github.com/microsoft/vcpkg

* 'master' of https://github.com/microsoft/vcpkg: (1418 commits)
  [vcpkg integrate] Clean up vcpkg.target file (microsoft#4608)
  [vcpkg_from_sourceforge] Add retry mirror function (2/2) (microsoft#12018)
  [pcre2] Restore the https://ftp.pcre.org/ mirror in addition to the SourceForge mirrors. (microsoft#12233)
  [xercesc] rename feature from xmlch_wchar to xmlch-wchar (microsoft#12205)
  [safeint] Update to 3.24 (microsoft#12217)
  [vcpkg] Remove the tombstones and 'ignore' baseline concepts. (microsoft#12197)
  [msbuild] Revert the importance to Normal (microsoft#12212)
  [vtk] Added opengl feature. (microsoft#11399)
  [span-lite] Update to 0.7.0 (microsoft#12206)
  [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers (microsoft#12196)
  [azure-iot-sdk-c] Fix feature name and enable to build (microsoft#12209)
  [vcpkg] Improve performance of compiler tracking by suppressing aspects of CMake's compiler detection. (microsoft#12203)
  [vcpkg] Remove all uses of Foo::Foo() noexcept = default; to fix microsoft#9955 (microsoft#12201)
  [sqlite3] update to 3.32.3 to deal with security issues (microsoft#12185)
  [infoware] Bump version to 0.5.4 (microsoft#12167)
  [imgui] Update to 1.77 (microsoft#12155)
  [vcpkg] Update message in bootstrap.ps1 (microsoft#12145)
  [vcpkg] Enable NuGet-based binary caching via mono (microsoft#12170)
  Don't change manifest root when manifest isn't enabled. (microsoft#12191)
  Fix sourceparagraph:BooleanField (microsoft#12192)
  ...

Author: E452003

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+**Describe the pull request**
+
+- What does your PR fix? Fixes #
+
+- Which triplets are supported/not supported? Have you updated the CI baseline?
+
+- Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)?

.gitignore

@@ -13,6 +13,8 @@
 
 toolsrc/out*
 toolsrc/CMakeSettings.json
+# fuzzing
+sync_dir*
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -291,25 +293,45 @@ __pycache__/
 /toolsrc/msbuild.x86.release/
 /toolsrc/msbuild.x64.debug/
 /toolsrc/msbuild.x64.release/
-#ignore custom triplets
 /triplets/*
 #add vcpkg-designed triplets back in
+!triplets/community/arm64-mingw.cmake
+!triplets/community/arm64-uwp.cmake
+!triplets/community/arm64-windows-static.cmake
+!triplets/community/arm-mingw.cmake
+!triplets/community/arm-windows.cmake
+!triplets/community/x64-mingw.cmake
+!triplets/community/x64-windows-static-md.cmake
+!triplets/community/x86-mingw.cmake
+!triplets/community/x86-uwp.cmake
+!triplets/community/x86-windows-static.cmake
+!triplets/community/x86-windows-static-md.cmake
+!triplets/community/x64-osx-dynamic.cmake
+!triplets/community/x64-android.cmake
+!triplets/community/x86-android.cmake
+!triplets/community/arm-android.cmake
+!triplets/community/arm64-android.cmake
+!triplets/community/arm64-ios.cmake
+!triplets/community/arm-ios.cmake
+!triplets/community/x64-ios.cmake
+!triplets/community/x86-ios.cmake
+!triplets/community/wasm32-emscripten.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
+#ignore custom triplets
 *.exe
 *.zip
 
 ############################################################
 # vcpkg - End
 ############################################################
 archives
+.DS_Store
+prefab/
+*.swp

CHANGELOG.md

@@ -6,18 +6,18 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too
 For short description of available commands, run `vcpkg help`.
 
 * Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)
-* Slack: [https://cpplang.now.sh/](https://cpplang.now.sh/), the #vcpkg channel
+* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel
+* Discord: [\#include \<C++\>](https://www.includecpp.org), the #🌏vcpkg channel
 * Docs: [Documentation](docs/index.md)
 
-| Windows (x86, x64, arm, uwp)  | MacOS | Linux |
-| ------------- | ------------- | ------------- |
-| [![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/vcpkg-Windows-master-CI?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=9&branchName=master)  | [![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/vcpkg-osx-master-CI?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=11&branchName=master) | [![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/vcpkg-Linux-master-CI?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=6&branchName=master) |
+[![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master)
 
 ## Quick Start
 Prerequisites:
 - Windows 10, 8.1, 7, Linux, or MacOS
 - Visual Studio 2015 Update 3 or newer (on Windows)
 - Git
+- gcc >= 7 or equivalent clang (on Linux)
 - *Optional:* CMake 3.12.4
 
 To get started:
@@ -78,3 +78,13 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 ## License
 
 Code licensed under the [MIT License](LICENSE.txt).
+
+## Telemetry
+
+vcpkg collects usage data in order to help us improve your experience.
+The data collected by Microsoft is anonymous.
+You can opt-out of telemetry by re-running the bootstrap-vcpkg script with -disableMetrics,
+passing --disable-metrics to vcpkg on the command line,
+or by setting the VCPKG_DISABLE_METRICS environment variable.
+
+Read more about vcpkg telemetry at docs/about/privacy.md

README.md

@@ -1,51 +1,50 @@
+# Vcpkg telemetry and privacy
 
-# Privacy and Vcpkg
+vcpkg collects telemetry data to understand usage issues, such as failing packages, and to guide tool improvements. The collected data is anonymous.
+For more information about how Microsoft protects your privacy, see https://privacy.microsoft.com/en-US/privacystatement#mainenterprisedeveloperproductsmodule
 
-## Do you collect telemetry data? What is it used for?
+## Scope
 
-We do collect telemetry data from usage of "vcpkg.exe". We explicitly ONLY collect information from invocations of the tool itself; we do NOT add any tracking information into the produced libraries. We use this information to understand usage issues, such as failing packages, and to guide tool improvements.
+We explicitly ONLY collect information from invocations of the tool itself; we do NOT add any tracking information into the produced libraries. Telemetry is collected when using any of the `vcpkg` commands.
 
-## What telemetry is collected?
+## How to opt out
 
-We collect the command line used, the time of invocation, and how long execution took. Some commands also add additional calculated information (such as the full set of libraries to install). We generate a completely random UUID on first use and attach it to each event.
-In order to opt-out of data collection, you can re-run the boostrap script with the following flag, for Windows and Linux/OSX, respectively:
+The vcpkg telemetry feature is enabled by default. In order to opt-out of data collection, you can re-run the boostrap script with the following flag, for Windows and Linux/OSX, respectively:
 
 ```PS> .\bootstrap-vcpkg.bat -disableMetrics```
 
 ```~/$ ./bootstrap-vcpkg.sh -disableMetrics```
 
-For more information about how Microsoft protects your privacy, see https://privacy.microsoft.com/en-us/privacy.
-
-Here is an example of an event for the command line `vcpkg install zlib`:
-```json
-[{
-    "ver": 1,
-    "name": "Microsoft.ApplicationInsights.Event",
-    "time": "2016-09-01T00:19:10.949Z",
-    "sampleRate": 100.000000,
-    "seq": "0:0",
-    "iKey": "aaaaaaaa-4393-4dd9-ab8e-97e8fe6d7603",
-    "flags": 0.000000,
-    "tags": {
-        "ai.device.os": "Windows",
-        "ai.device.osVersion": "10.0.14912",
-        "ai.session.id": "aaaaaaaa-7c69-4b83-7d82-8a4198d7e88d",
-        "ai.user.id": "aaaaaaaa-c9ab-4bf5-0847-a3455f539754",
-        "ai.user.accountAcquisitionDate": "2016-08-20T00:38:09.860Z"
-    },
-    "data": {
-        "baseType": "EventData",
-        "baseData": {
-            "ver": 2,
-            "name": "commandline_test7",
-            "properties": { "version":"0.0.30-9b4e44a693459c0a618f370681f837de6dd95a30","cmdline":"install zlib","command":"install","installplan":"zlib:x86-windows" },
-            "measurements": { "elapsed_us":68064.355736 }
-        }
-    }
-}]
+## Disclosure
+
+vcpkg displays text similar to the following when you build vcpkg. This is how Microsoft notifies you about data collection.
+
+```
+Telemetry
+---------
+vcpkg collects usage data in order to help us improve your experience.
+The data collected by Microsoft is anonymous.
+You can opt-out of telemetry by re-running the bootstrap-vcpkg script with -disableMetrics,
+passing --disable-metrics to vcpkg on the command line,
+or by setting the VCPKG_DISABLE_METRICS environment variable.
+
+Read more about vcpkg telemetry at docs/about/privacy.md
 ```
-In the source code (included in `toolsrc\`), you can search for calls to the functions `TrackProperty()` and `TrackMetric()` to see every specific data point we collect.
 
-## Is the data stored on my system?
+## Data Collected
+
+The telemetry feature doesn't collect personal data, such as usernames or email addresses. It doesn't scan your code and doesn't extract project-level data, such as name, repository, or author. The data is sent securely to Microsoft servers and held under restricted access.
+
+Protecting your privacy is important to us. If you suspect the telemetry is collecting sensitive data or the data is being insecurely or inappropriately handled, file an issue in the Microsoft/vcpkg repository or send an email to [email protected] for investigation.
+
+We collect various telemetry events such as the command line used, the time of invocation, and how long execution took. Some commands also add additional calculated information (such as the full set of libraries to install). We generate a completely random UUID on first use and attach it to each event.
+
+You can see the telemetry events any command by appending `--printmetrics` after the vcpkg command line.
+
+In the source code (included in `toolsrc\`), you can search for calls to the functions `track_property()`, `track_feature()`, `track_metric()`, and `track_buildtime()`
+to see every specific data point we collect.
+
+## Avoid inadvertent disclosure information
 
-We store each event document in your temporary files directory. These will be cleaned out whenever you clear your temporary files.
+vcpkg contributors and anyone else running a version of vcpkg that they built themselves should consider the path to their source code. If a crash occurs when using vcpkg, the file path from the build machine is collected as part of the stack trace and isn't hashed.
+Because of this, builds of vcpkg shouldn't be located in directories whose path names expose personal or sensitive information.

docs/about/privacy.md

@@ -118,10 +118,11 @@ Now let's make a simple CMake project with a main file.
 cmake_minimum_required(VERSION 3.0)
 project(test)
 
-find_package(Sqlite3 REQUIRED)
+find_package(sqlite3 CONFIG REQUIRED)
 
 add_executable(main main.cpp)
-target_link_libraries(main sqlite3)
+
+target_link_libraries(main PRIVATE sqlite3)
 ```
 ```cpp
 // main.cpp

docs/examples/installing-and-using-packages.md

@@ -71,7 +71,7 @@ When using the `--overlay-triplets` option, a message like the following lets yo
 
 As you may have noticed, the default triplets for Windows (`x86-windows` and `x64-windows`) install dynamic libraries, while a suffix (`-static`) is needed for static libraries. This is different with Linux and Mac OS where static libraries are built by `x64-linux` and `x64-osx`.
 
-Using `--overlay-ports` it is possible to override the default triplets to accomplish the same behavior on Linux:
+Using `--overlay-triplets` it is possible to override the default triplets to accomplish the same behavior on Linux:
 
 * `x64-linux`: Builds dynamic libraries,
 * `x64-linux-static`: Builds static libraries.
@@ -85,7 +85,7 @@ Using the custom triplet created in the previous example, rename `custom-triplet
 ~/git$ cp vcpkg/triplets/x64-linux.cmake custom-triplets/x64-linux-static.cmake
 ```
 
-### Step 2: Use `--overlay-ports` to override default triplets
+### Step 2: Use `--overlay-triplets` to override default triplets
 
 Use the `--overlay-triplets` option to include the triplets in the `custom-triplets` directory.
 

docs/examples/overlay-triplets-linux-dynamic.md

@@ -10,13 +10,7 @@ Description: Ogg is a multimedia container format, and the native file and strea
 ```
 
 ### Create the portfile
-`portfile.cmake` describes how to build and install the package. First we include `vcpkg_common_functions` to give us utilities for carrying this out:
-
-```no-highlight
-include(vcpkg_common_functions)
-```
-
-Now we download the project from Github with [`vcpkg_from_github`](../maintainers/vcpkg_from_github.md):
+`portfile.cmake` describes how to build and install the package. First we download the project from Github with [`vcpkg_from_github`](../maintainers/vcpkg_from_github.md):
 
 ```no-highlight
 vcpkg_from_github(

docs/examples/packaging-github-repos.md

@@ -140,7 +140,7 @@ Now we can modify `pngpriv.h` to use `abort()` everywhere.
 
 The output of `git diff` is already in patch format, so we just need to save the patch into the `ports/libpng` directory.
 ```no-highlight
-PS buildtrees\libpng\src\libpng-1.6.24> git diff | out-file -enc ascii ..\..\..\..\ports\libpng\use-abort-on-all-platforms.patch
+PS buildtrees\libpng\src\libpng-1.6.24> git diff --ignore-space-at-eol | out-file -enc ascii ..\..\..\..\ports\libpng\use-abort-on-all-platforms.patch
 ```
 
 Finally, we need to apply the patch after extracting the source.

docs/examples/patching.md

@@ -0,0 +1 @@
+build