incorporate changes from microsoft:master

.gitattributes

@@ -1 +1,5 @@
 * -text
+ports/** -linguist-detectable
+
+# Declare files that will always have LF line endings on checkout.
+scripts/ci.baseline.txt text eol=lf

.gitignore

@@ -289,47 +289,25 @@ __pycache__/
 /packages/
 /scripts/buildsystems/tmp/
 /toolsrc/build.rel/
-/toolsrc/msbuild.x86.debug/
-/toolsrc/msbuild.x86.release/
-/toolsrc/msbuild.x64.debug/
-/toolsrc/msbuild.x64.release/
+/toolsrc/windows-bootstrap/msbuild.x86.debug/
+/toolsrc/windows-bootstrap/msbuild.x86.release/
+/toolsrc/windows-bootstrap/msbuild.x64.debug/
+/toolsrc/windows-bootstrap/msbuild.x64.release/
+#ignore custom triplets
 /triplets/*
 #add vcpkg-designed triplets back in
-!triplets/community/arm64-mingw-dynamic.cmake
-!triplets/community/arm64-mingw-static.cmake
-!triplets/community/arm64-uwp.cmake
-!triplets/community/arm64-windows-static.cmake
-!triplets/community/arm-mingw-dynamic.cmake
-!triplets/community/arm-mingw-static.cmake
-!triplets/community/arm-windows.cmake
-!triplets/community/x64-mingw-dynamic.cmake
-!triplets/community/x64-mingw-static.cmake
-!triplets/community/x64-windows-static-md.cmake
-!triplets/community/x86-mingw-dynamic.cmake
-!triplets/community/x86-mingw-static.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/community/arm64-osx.cmake
-!triplets/arm-uwp.cmake
-!triplets/x64-uwp.cmake
-!triplets/x64-windows.cmake
-!triplets/x64-windows-static.cmake
-!triplets/x86-windows.cmake
-!triplets/arm64-windows.cmake
-!triplets/x64-linux.cmake
-!triplets/x64-osx.cmake
-#ignore custom triplets
+!/triplets/arm-uwp.cmake
+!/triplets/arm64-windows.cmake
+!/triplets/x64-linux.cmake
+!/triplets/x64-osx.cmake
+!/triplets/x64-uwp.cmake
+!/triplets/x64-windows-static.cmake
+!/triplets/x64-windows.cmake
+!/triplets/x86-windows.cmake
+
+!/triplets/community
+!/triplets/community/**
+
 *.exe
 *.zip
 

README.md

@@ -324,7 +324,7 @@ you may use a simple `vcpkg install --feature-flags=manifests`
 For more information, check out the [manifest][getting-started:manifest-spec]
 specification.
 
-[getting-started:using-a-package]: docs/examples/intalling-and-using-packages.md
+[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
 [getting-started:integration]: docs/users/integration.md
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools

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

@@ -47,8 +47,8 @@ Total elapsed time: 12.04 s
 
 The package sqlite3:x86-windows provides CMake targets:
 
-    find_package(sqlite3 CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE sqlite3)
+    find_package(unofficial-sqlite3 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3))
 
 ```
 
@@ -118,11 +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 CONFIG REQUIRED)
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
 
 add_executable(main main.cpp)
 
-target_link_libraries(main PRIVATE sqlite3)
+target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3)
 ```
 ```cpp
 // main.cpp

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

@@ -55,8 +55,8 @@ Total elapsed time: 44.82 s
 
 The package sqlite3:x64-linux-dynamic provides CMake targets:
 
-    find_package(sqlite3 CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE sqlite3)
+    find_package(unofficial-sqlite3 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3)
 ```
 
 Overlay triplets enables your custom triplet files when using `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, and `vcpkg remove`.
@@ -115,8 +115,8 @@ Total elapsed time: 44.82 s
 
 The package sqlite3:x64-linux provides CMake targets:
 
-    find_package(sqlite3 CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE sqlite3)
+    find_package(unofficial-sqlite3 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3)
 ```
 
 Note that the default triplet is masked by your custom triplet:

docs/maintainers/maintainer-guide.md

@@ -208,6 +208,34 @@ Note that if a library generates CMake integration files (`foo-config.cmake`), r
 
 Finally, DLL files on Windows should never be renamed post-build because it breaks the generated LIBs.
 
+## Code format
+
+### Vcpkg internal code
+
+We require the c/c++ code inside vcpkg to follow the clang-format, if you change them. Please perform the following steps after modification:
+
+- Use Visual Studio:
+1. Configure your [clang-format tools](https://devblogs.microsoft.com/cppblog/clangformat-support-in-visual-studio-2017-15-7-preview-1/).
+2. Open the modified file.
+3. Use shortcut keys Ctrl+K, Ctrl+D to format the current file.
+
+- Use tools:
+1. Install [llvm clang-format](https://releases.llvm.org/download.html#10.0.0)
+2. Run command:
+```cmd
+> LLVM_PATH/bin/clang-format.exe -style=file -i changed_file.cpp
+```
+
+### Manifest
+
+We require that the manifest file needs to be formatted, perform the following steps to solve this issue:
+
+1. Format all changed manifest files.
+```cmd
+> vcpkg x-format-manifest --all
+```
+2. Commit changes to your branch.
+
 ## Useful implementation notes
 
 ### Portfiles are run in Script Mode

docs/maintainers/vcpkg_check_linkage.md

@@ -28,7 +28,7 @@ This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail,
 
 ## Examples
 
-* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake)
+* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake)
 
 ## Source
-[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)
+[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)

docs/users/config-environment.md

@@ -38,11 +38,19 @@ Example: `D:\2017`
 
 This environment variable can be set to a triplet name which will be used for unqualified triplet references in command lines.
 
+#### VCPKG_OVERLAY_PORTS
+
+This environment variable allows users to override ports with alternate versions according to the
+[ports overlay](../specifications/ports-overlay.md) specification. List paths to overlays using 
+the platform dependent PATH seperator (Windows `;` | others `:`) 
+
+Example (Windows): `C:\custom-ports\boost;C:\custom-ports\sqlite3`
+
 #### VCPKG_FORCE_SYSTEM_BINARIES
 
 This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries.
 
-### VCPKG_KEEP_ENV_VARS
+#### VCPKG_KEEP_ENV_VARS
 
 This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to
 the build environment.

ports/3fd/vcpkg.json

@@ -16,7 +16,7 @@
       "name": "poco",
       "platform": "windows"
     },
-    "sqlite3",
-    "rapidxml"
+    "rapidxml",
+    "sqlite3"
   ]
 }

ports/abseil/fix-cmake-threads-dependency.patch

@@ -0,0 +1,13 @@
+diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in
+index 60847fa77..6d23f63d3 100644
+--- a/CMake/abslConfig.cmake.in
++++ b/CMake/abslConfig.cmake.in
+@@ -1,6 +1,7 @@
+ # absl CMake configuration file.
+
+-include(FindThreads)
++include(CMakeFindDependencyMacro)
++find_dependency(Threads)
+
+ @PACKAGE_INIT@
+

ports/abseil/portfile.cmake

@@ -7,9 +7,12 @@ set(ABSEIL_PATCHES
 
     # This patch is an upstream commit, the related PR: https://github.com/abseil/abseil-cpp/pull/637
     fix-MSVCbuildfail.patch
-    
+
     # Remove this patch in next update, see https://github.com/google/cctz/pull/145
     fix-arm-build.patch
+
+    # This patch is an upstream commit: https://github.com/abseil/abseil-cpp/commit/68494aae959dfbbf781cdf03a988d2f5fc7e4802
+    fix-cmake-threads-dependency.patch
 )
 
 if("cxx17" IN_LIST FEATURES)

ports/abseil/vcpkg.json

@@ -1,14 +1,14 @@
 {
   "name": "abseil",
   "version-string": "2020-03-03",
-  "port-version": 7,
-  "homepage": "https://github.com/abseil/abseil-cpp",
+  "port-version": 8,
   "description": [
     "an open-source collection designed to augment the C++ standard library.",
     "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."
   ],
+  "homepage": "https://github.com/abseil/abseil-cpp",
   "features": [
     {
       "name": "cxx17",

ports/akali/CONTROL

@@ -1,4 +1,5 @@
 Source: akali
 Version: 1.41
+Port-Version: 1
 Description: C++ Common Library.
-Homepage: https://github.com/winsoft666/akali
+Homepage: https://github.com/winsoft666/akali

ports/alembic/CONTROL

@@ -1,5 +1,5 @@
 Source: alembic
-Version: 1.7.12-1
+Version: 1.7.13
 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/