Merge pull request #1756 from microsoft/master

Merge from microsoft-master
Jimmy-Hu · Sep 12, 2024 · 47ab95c · 47ab95c
2 parents 0e2758b + 9f11f2d
commit 47ab95c
Show file tree

Hide file tree

Showing 35 changed files with 94 additions and 281,391 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -9,6 +9,7 @@
 - [ ] The "supports" clause reflects platforms that may be fixed by this new version.
 - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.
 - [ ] Any patches that are no longer applied are deleted from the port's directory.
+- [ ] When updating the upstream version, the `"port-version"` is reset (removed from `vcpkg.json`).
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
 - [ ] Only one version is added to each modified port's versions file.
 

diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-30-2
-    SHA512 cfba1998d4f666156e751c4cab1e504441b368efbf344e22de30f8b983670a88d045d3ca82f197b95522a2026262274f93bc3061210781ce30c35c71a386ce6e
+    REF asio-1-31-0
+    SHA512 505c3f4e4043cd73be1a28ab611d7f61046d6b60f80c08aaceea892a76ce7f51056d39516d7b4e836611a9974c227de52c0434122af0ea8539ceb57363a82b62
     HEAD_REF master
 )
 

diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "asio",
-  "version": "1.30.2",
+  "version": "1.31.0",
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
   "homepage": "https://github.com/chriskohlhoff/asio",
   "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/",

diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO beached/utf_range
     REF "v${VERSION}"
-    SHA512 67c009f207d7a25918e78072fedcd399367ebe4f5433bbc8203ad37680e8598a54a08a35953a91dfd1b417c448875b39a3975b1edec48018c6fef29cb36a486c
+    SHA512 91ce2a335f5305f481d2bd7fd5954ae4f0ea66f32244cf3a0111ec4185080d90a9850dedbd38c077a66c46d99ca2045620702cf1e06683b6105651efbc6b5300
     HEAD_REF master
 )
 

diff --git a/ports/daw-utf-range/vcpkg.json b/ports/daw-utf-range/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "daw-utf-range",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.",
   "homepage": "https://github.com/beached/header_libraries",
   "license": "BSL-1.0",

diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/fbthrift
     REF "v${VERSION}"
-    SHA512 8ad405815257d670d143c83ae06591f1c97f05c0a07100d8b2e1e8a3ed4b8665659a01fc9f0eed53e57d32515d048308431151b7d00c2fc33c4be8e808ddb1bb
+    SHA512 10ee7740d8bbedc06f0156b563cd12ab2e650c22323692b90b8da90a09cede276a0b061328dccff32c4fe08b5bc8fa39a5f08afe1bd5128734c31076efcf8c8c
     HEAD_REF main
     PATCHES 
         fix-glog.patch
@@ -34,8 +34,10 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/folly_dynamic/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/patch/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/detail/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/tool"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/runtime/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test"

diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fbthrift",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
   "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
   "homepage": "https://github.com/facebook/fbthrift",
   "license": "Apache-2.0",

diff --git a/ports/fizz/fix-build.patch b/ports/fizz/fix-build.patch
@@ -1,20 +1,17 @@
 diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index 32f310cd..f8a19b58 100644
+index c60177c..f9432ec 100644
 --- a/fizz/CMakeLists.txt
 +++ b/fizz/CMakeLists.txt
-@@ -50,53 +50,32 @@ find_package(folly CONFIG REQUIRED)
+@@ -50,7 +50,7 @@ find_package(folly CONFIG REQUIRED)
  find_package(fmt CONFIG REQUIRED)
 
  find_package(OpenSSL REQUIRED)
 -find_package(Glog REQUIRED)
--find_package(DoubleConversion REQUIRED)
 +find_package(glog CONFIG REQUIRED)
-+find_package(double-conversion CONFIG REQUIRED)
  find_package(Threads REQUIRED)
--find_package(Zstd REQUIRED)
+ find_package(Zstd REQUIRED)
  if (UNIX AND NOT APPLE)
-   find_package(Librt)
- endif()
+@@ -59,43 +59,23 @@ endif()
 
  include(CheckAtomic)
 
@@ -66,7 +63,7 @@ index 32f310cd..f8a19b58 100644
 
  find_package(liboqs CONFIG)
  if (liboqs_FOUND)
-@@ -277,30 +256,25 @@ target_include_directories(
+@@ -193,28 +173,24 @@ target_include_directories(
      $<BUILD_INTERFACE:${FIZZ_BASE_DIR}>
      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
      $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
@@ -77,7 +74,6 @@ index 32f310cd..f8a19b58 100644
    PRIVATE
 -    ${GLOG_INCLUDE_DIRS}
      ${FIZZ_INCLUDE_DIRECTORIES}
--    ${DOUBLE_CONVERSION_INCLUDE_DIR}
  )
 
 
@@ -99,13 +95,11 @@ index 32f310cd..f8a19b58 100644
 +    glog::glog
 +    gflags::gflags
      ${FIZZ_LINK_LIBRARIES}
--    ${DOUBLE_CONVERSION_LIBRARY}
 +    libevent::core
-+    double-conversion::double-conversion
      ${CMAKE_DL_LIBS}
      ${LIBRT_LIBRARIES})
 
-@@ -361,8 +335,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+@@ -279,8 +255,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
  SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 
  if(BUILD_TESTS)
@@ -115,7 +109,7 @@ index 32f310cd..f8a19b58 100644
  endif()
 
  add_library(fizz_test_support
-@@ -398,14 +371,12 @@ macro(add_gtest test_source test_name)
+@@ -317,14 +292,12 @@ macro(add_gtest test_source test_name)
    add_executable(${test_name} ${test_source} test/CMakeTestMain.cpp)
 
    set_property(TARGET ${test_name} PROPERTY ENABLE_EXPORTS true)
@@ -133,10 +127,10 @@ index 32f310cd..f8a19b58 100644
    if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
      # GMOCK_MOCK_METHOD() will complain otherwise
 diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
-index bace1609..51251ea2 100644
+index 9d07110..a47bb99 100644
 --- a/fizz/cmake/fizz-config.cmake.in
 +++ b/fizz/cmake/fizz-config.cmake.in
-@@ -29,9 +29,18 @@ set(FIZZ_LIBRARIES fizz::fizz)
+@@ -31,9 +31,18 @@ set(FIZZ_LIBRARIES fizz::fizz)
 
  include(CMakeFindDependencyMacro)
 

diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
     REF "v${VERSION}"
-    SHA512 68efc3709a72eff2e2a8528a1c57e3980319a812730de9ce88c70b33a19abf8f28fbb8ef4c10264fe8232fca48a0ce24e40d66a0fce0b9f234d5625daf0dbf55
+    SHA512 ab9ce79c5f7dd2358a95e6842aa8e5c5410e7608f1aecfd2a19902a14fcc207a99207a7c3637d58f7ba07217a33db4c7abdd2f20de9e300390cb54c927f091af
     HEAD_REF main
     PATCHES
         fix-build.patch

diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fizz",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
   "description": "a TLS 1.3 implementation by Facebook",
   "homepage": "https://github.com/facebookincubator/fizz",
   "license": "BSD-3-Clause",

diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
     REF "v${VERSION}"
-    SHA512 0d27bc460de66c7bf975c33fa7bbd572324b0aa49427a53cd04610ccdcb72874abb10778de256fb136164133d90589b6b1bffa2aa8aa9dc4046ac97473064591
+    SHA512 78797f1383fb45cdb26977f19945d84fdf5056ba2156c47e0176fa7e3d5d0e7c7b61f1efbf98b09a45cad8826d931fcfdb26641f2d0065c6b6a601e9c8cc03f7
     HEAD_REF main
     PATCHES
         disable-non-underscore-posix-names.patch

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "folly",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",

diff --git a/ports/msquic/portfile.cmake b/ports/msquic/portfile.cmake
@@ -65,12 +65,14 @@ vcpkg_cmake_configure(
         -DQUIC_USE_SYSTEM_LIBCRYPTO=OFF
         -DQUIC_BUILD_PERF=OFF
         -DQUIC_BUILD_TEST=OFF
+        -DCMAKE_DEBUG_POSTFIX=d
         "-DQUIC_STATIC_LINK_CRT=${STATIC_CRT}"
         "-DQUIC_STATIC_LINK_PARTIAL_CRT=${STATIC_CRT}"
         "-DQUIC_UWP_BUILD=${VCPKG_TARGET_IS_UWP}"
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 vcpkg_install_copyright(FILE_LIST "${QUIC_SOURCE_PATH}/LICENSE")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"

diff --git a/ports/msquic/vcpkg.json b/ports/msquic/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "msquic",
   "version": "2.3.6",
+  "port-version": 1,
   "description": "Cross-platform, C implementation of the IETF QUIC protocol",
   "homepage": "https://github.com/microsoft/msquic",
   "license": "MIT",

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/mvfst
     REF "v${VERSION}"
-    SHA512 288ebb0419910b668cdbd493512516e4e9c34770fc009442d2658651f5bc584bf9c968304b59ed82067746d8eff225bc6bd2f61fa1fd42e8cf052e0d6df51130
+    SHA512 9622d7a59c2d6c8fd6c5c7da48cdaa437905bfedb9035d12f8e9281f5d853048faf84588d4d11db4d8215f3c9f2f4344e707f39eda09fe561fcf827789efa33a
     HEAD_REF main
 )
 

diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mvfst",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
   "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
   "homepage": "https://github.com/facebook/mvfst",
   "license": "MIT",

diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nanomsg/nng
     REF "v${VERSION}"
-    SHA512 9e97d961da7b24070deb78d0ed0c7bd5b7889d7e4d0934aedcfb512313cc7e8586316391ddc2fe20a0be9695fb1b7fb09760b9246dd1ab1e61a927e807fb10ef
+    SHA512 a47f9a0c93a1f12abbe3199e8c3fd8c78c04bea5b049e80d2f03280bc5e58cfdb09ff92a392b71cdf5ec3f859237e12436936d576e5f81ae0937792373168884
     HEAD_REF master
 )
 

diff --git a/ports/nng/vcpkg.json b/ports/nng/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nng",
-  "version-semver": "1.7.3",
+  "version-semver": "1.8.0",
   "description": "nanomsg-next-gen, lightweight messaging library",
   "homepage": "https://nng.nanomsg.org",
   "license": "MIT",

diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/proxygen
     REF "v${VERSION}"
-    SHA512 598e4e170398c6a95ef4ab4f8826b716b74177f59f047d85427a53d2e51608c92d8130876c50cd51110f35a6fb4ad8b2969ee0ce64e94bcac808cec3ae0fc88f
+    SHA512 b4160ece2d4c674cf4ca6a2ec97d0cfdbd3acf79fbdf7ef0e9fb05cf7605a26a19fe0d9235d83492223cfb36d5c6d05474b9e3fb06978041db5bd0eadaa01ca3
     HEAD_REF main
     PATCHES
         remove-register.patch

diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "proxygen",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
   "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
   "homepage": "https://github.com/facebook/proxygen",
   "license": "BSD-3-Clause",

diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/wangle
     REF "v${VERSION}"
-    SHA512 5dbe55570144feade8e731b7a8c7c3d72bcc017545362efd69a9c96918f970a729bcc9893088e028d4d412a24f45c076dd62e53b5b6d6da06c22716ea216c2fe
+    SHA512 d63c1e128ada851cce874a6d37b480a0c1fff0a1f22fbe268b27168ef117100814b481b0dc4e7ef9208025c37dc73f4b9fe5d61bc2c261ec992362c3436a4efa
     HEAD_REF main
     PATCHES
         fix-config-cmake.patch

diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wangle",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
   "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.",
   "homepage": "https://github.com/facebook/wangle",
   "license": "Apache-2.0",

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -529,10 +529,6 @@ libcaer:x64-android=fail
 libcanberra:arm-neon-android=fail
 libcanberra:arm64-android=fail
 libcanberra:x64-android=fail
-# needs android-24
-libconfuse:arm-neon-android=fail
-libconfuse:arm64-android=fail
-libconfuse:x64-android=fail
 libcoro:x64-osx=fail
 libcoro:arm64-osx=fail
 libcpplocate:arm-neon-android=fail
@@ -830,7 +826,6 @@ omplapp:arm64-osx=skip
 omplapp:x64-osx=skip
 omplapp:x64-linux=skip
 # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
-onednn:x64-android=fail
 # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
 opencc:x64-android=fail
 opencv2:arm-neon-android=fail