microsoft · BillyONeal · Nov 14, 2023 · Nov 14, 2023 · Nov 14, 2023 · Nov 14, 2023
diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake
@@ -2,14 +2,22 @@ if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
+# Workaround https://developercommunity.visualstudio.com/t/Missing-threadsh-in-MSVC-178/10514752
+vcpkg_download_distfile(HAVE_THREADS_PATCH
+    URLS https://github.com/baresip/re/commit/ebdf9d724cfd0a04f194ecfcb678b702ad062be2.patch?full_desc=true
+    FILENAME baresip-libre-ebdf9d724cfd0a04f194ecfcb678b702ad062be2.patch
+    SHA512 2ed0361cef8d599c3369ba9d2b077781484666be2f5fe172301e727d1653060a8980dfe3e4d340d0f09c92470d677200f963442eb90f9efc429c15ccf75ac353
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO baresip/re
     REF "v${VERSION}"
-    SHA512 054227c3cbd41d8801d1d0aed38029adb63d52e33e8becafbdba3e973d55863e40e9be0463b6a2d91b34b3b2aea7d80e9d7ec7adadd5e63ca844e416f4d6c411
+    SHA512 59988a665db0682bb8a4dd8dc720f0ed80f49f5148aa02f175dfa01b051b9637db89b6f7343bc0544eba9adb7f0d69e0755b99ecaf4cf7eb303d90d1625c9e11
     HEAD_REF main
     PATCHES
         fix-static-library-build.patch
+        "${HAVE_THREADS_PATCH}"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBRE_BUILD_SHARED)

diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "baresip-libre",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "Generic library for real-time communications with async IO support",
   "homepage": "https://github.com/baresip/re",
   "license": "BSD-3-Clause",

diff --git a/ports/folly/disable-uninitialized-resize-on-new-stl.patch b/ports/folly/disable-uninitialized-resize-on-new-stl.patch
@@ -0,0 +1,40 @@
+diff --git a/folly/memory/UninitializedMemoryHacks.h b/folly/memory/UninitializedMemoryHacks.h
+index bd31c88..9f640a8 100644
+--- a/folly/memory/UninitializedMemoryHacks.h
++++ b/folly/memory/UninitializedMemoryHacks.h
+@@ -101,6 +101,9 @@ template <
+         typename std::enable_if<std::is_trivially_destructible<T>::value>::type>
+ inline void resizeWithoutInitialization(
+     std::basic_string<T>& s, std::size_t n) {
++#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L
++    s.resize(n);
++#else
+   if (n <= s.size()) {
+     s.resize(n);
+   } else {
+@@ -111,6 +114,7 @@ inline void resizeWithoutInitialization(
+     }
+     detail::unsafeStringSetLargerSize(s, n);
+   }
++#endif // STL workaround
+ }
+
+ /**
+@@ -244,6 +248,8 @@ struct MakeUnsafeStringSetLargerSize {
+ #elif defined(_MSC_VER)
+ // MSVC
+
++#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L
++#else
+ template <typename Tag, typename T, typename A, A Ptr_Eos>
+ struct MakeUnsafeStringSetLargerSize {
+   friend void unsafeStringSetLargerSizeImpl(
+@@ -262,7 +268,7 @@ struct MakeUnsafeStringSetLargerSize {
+       void (std::basic_string<TYPE>::*)(std::size_t),           \
+       &std::basic_string<TYPE>::_Eos>;                          \
+   FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT_IMPL(TYPE)
+-
++#endif // workaround
+ #else
+ #warning \
+     "No implementation for resizeWithoutInitialization of std::basic_string"
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -18,6 +18,7 @@ vcpkg_from_github(
         fix-windows-minmax.patch
         fix-deps.patch
         openssl.patch # from https://github.com/facebook/folly/pull/2016
+        disable-uninitialized-resize-on-new-stl.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "folly",
   "version-string": "2023.10.02.00",
+  "port-version": 1,
   "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/jkqtplotter/force-qt6.patch b/ports/jkqtplotter/force-qt6.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/jkqtplotter_common_qtsettings.cmake b/cmake/jkqtplotter_common_qtsettings.cmake
+index 150b1d0..f391b89 100644
+--- a/cmake/jkqtplotter_common_qtsettings.cmake
++++ b/cmake/jkqtplotter_common_qtsettings.cmake
+@@ -4,7 +4,7 @@ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_AUTORCC ON)
+ set(CMAKE_AUTOUIC ON)
+
+-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Svg Xml OpenGL REQUIRED)
+ if(${QT_VERSION_MAJOR} VERSION_GREATER_EQUAL "6")
+     find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS OpenGLWidgets)
diff --git a/ports/jkqtplotter/portfile.cmake b/ports/jkqtplotter/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
     PATCHES
         fix-cmake.patch
         fix-cmake2.patch
+        force-qt6.patch
 )
 
 vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "add_subdirectory(doc)" "")

diff --git a/ports/jkqtplotter/vcpkg.json b/ports/jkqtplotter/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "jkqtplotter",
   "version-date": "2023-10-24",
+  "port-version": 1,
   "description": "A Qt Plotting Library",
   "license": null,
   "dependencies": [

diff --git a/ports/tinyorm/force-qt6.patch b/ports/tinyorm/force-qt6.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b6f2cd..a485cb0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -366,7 +366,7 @@ tiny_resource_and_manifest(${TinyOrm_target}
+ # Must be before the TinyCommon, to exclude WINVER for the MSYS2 Qt6 builds to avoid:
+ # 'WINVER' macro redefined [-Wmacro-redefined]
+ # Look also to the TinyCommon for conditional WINVER definition
+-find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core Sql)
++find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core Sql)
+ tiny_find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} CONFIG
+     REQUIRED COMPONENTS Core Sql
+ )
diff --git a/ports/tinyorm/portfile.cmake b/ports/tinyorm/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF v0.36.5
     SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183
     HEAD_REF main
+    PATCHES
+        force-qt6.patch
 )
 
 vcpkg_check_features(
@@ -27,7 +29,6 @@ vcpkg_cmake_configure(
         -DTINY_PORT:STRING=${PORT}
         -DTINY_VCPKG:BOOL=ON
         -DVERBOSE_CONFIGURE:BOOL=ON
-        -DWARNINGS_AS_ERRORS=FALSE
         ${FEATURE_OPTIONS}
 )
 

diff --git a/ports/tinyorm/vcpkg.json b/ports/tinyorm/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "tinyorm",
   "version-semver": "0.36.5",
-  "port-version": 1,
+  "port-version": 2,
   "maintainers": "Silver Zachara <[email protected]>",
   "description": "Modern C++ ORM library for Qt framework",
   "homepage": "https://github.com/silverqx/TinyORM",

diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
@@ -4,9 +4,9 @@
 variables:
   android-pool: 'PrAnd-1ES-Pool'
   linux-pool: 'PrLin-1ES-Pool'
-  windows-pool: 'PrWin-2023-10-11'
+  windows-pool: 'PrWin-2023-11-14'
   osx-pool: 'PrOsx-2023-09-11'
-  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-10-11'
+  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-11-14'
 
 parameters:
   - name: vcpkgToolSha

diff --git a/scripts/azure-pipelines/generate-sas-tokens.ps1 b/scripts/azure-pipelines/generate-sas-tokens.ps1
@@ -1,3 +1,7 @@
+Param(
+    [Parameter(Mandatory=$true)]
+    [int]$KeyNumber
+)
 
 function Get-SasToken {
     Param(
@@ -28,13 +32,13 @@ function Get-SasToken {
 
 # Asset Cache:
 # Read, Create, List
-$assetSas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -ContainerName cache -Permission rcl
+$assetSas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -ContainerName cache -Permission rcl
 
 # Binary Cache:
 # Read, Create, List, Write
-$binarySas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -ContainerName cache -Permission rclw
-$binaryEASas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -ContainerName cache -Permission rclw
-$binaryWUS3as = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -ContainerName cache -Permission rclw
+$binarySas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -ContainerName cache -Permission rclw
+$binaryEASas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -ContainerName cache -Permission rclw
+$binaryWUS3as = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -ContainerName cache -Permission rclw
 
 $response = "Asset Cache SAS: Update`n" + `
     "https://dev.azure.com/vcpkg/public/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=6&path=vcpkg-asset-caching-credentials`n" + `

diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md
@@ -30,7 +30,10 @@
          * West US 2, 1 Replica
          * West US 3, 1 Replica
 * [ ] After the last build finishes on the previous pool, delete it in the Azure Devops *Organization* UI and its Resource Group. ( https://dev.azure.com/vcpkg/_settings/agentpools ?)
-* [ ] Run `generate-sas-tokens.ps1` and update the relevant libraries on dev.azure.com/vcpkg and
-      devdiv.visualstudio.com.
+* [ ] Run `generate-sas-tokens.ps1 -KeyNumber N`, where N is whether the month is even
+      (Jan = 1, Feb = 2, Mar = 1, and so on) and update the relevant libraries on
+      dev.azure.com/vcpkg and devdiv.visualstudio.com
+* [ ] After builds using previous SAS tokens complete, run `roll-sas-tokens.ps1 -KeyNumber N` where
+      this N is the other key. (Jan = 2, Feb = 1, Mar = 2, and so on)
 * [ ] Mint a new macOS base box.  (See instructions in `scripts/azure-pipelines/osx/README.md`)
 * [ ] Deploy the new base box to all hosts.
diff --git a/scripts/azure-pipelines/roll-sas-tokens.ps1 b/scripts/azure-pipelines/roll-sas-tokens.ps1
@@ -0,0 +1,15 @@
+
+Param(
+    [Parameter(Mandatory=$true)]
+    [int]$KeyNumber
+)
+
+$keyName = "key$KeyNumber"
+
+# Asset Cache:
+New-AzStorageAccountKey -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -KeyName $keyName
+
+# Binary Cache:
+New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -KeyName $keyName
+New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -KeyName $keyName
+New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -KeyName $keyName
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -71,10 +71,9 @@ if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) {
     $BinarySourceStub = "files,$ArchivesRoot"
 }
 
-$env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads'
-$buildtreesRoot = Join-Path $WorkingRoot 'buildtrees'
+$buildtreesRoot = Join-Path $WorkingRoot 'b'
 $installRoot = Join-Path $WorkingRoot 'installed'
-$packagesRoot = Join-Path $WorkingRoot 'packages'
+$packagesRoot = Join-Path $WorkingRoot 'p'
 
 $commonArgs = @(
     "--x-buildtrees-root=$buildtreesRoot",

diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1
@@ -5,5 +5,5 @@
 
 # REPLACE WITH UTILITY-PREFIX.ps1
 
-$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.8/PowerShell-7.3.8-win-x64.msi'
+$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.9/PowerShell-7.3.9-win-x64.msi'
 InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -244,6 +244,12 @@ cppslippi:x64-android=fail
 cppslippi:x64-linux=fail
 cppslippi:x64-osx=fail
 cppcoro:x64-linux=fail
+# https://developercommunity.visualstudio.com/t/MSVC-1938331290-preview-fails-to-comp/10505565
+cpptrace:arm64-windows=fail
+cpptrace:x64-windows=fail
+cpptrace:x64-windows-static=fail
+cpptrace:x64-windows-static-md=fail
+cpptrace:x86-windows=fail
 cpputest:arm-neon-android=fail
 crashpad:x64-linux=fail
 cserialport:arm-neon-android=fail
@@ -633,6 +639,8 @@ libtcod:arm64-android=fail
 libtcod:x64-android=fail
 libtomcrypt:arm64-windows=fail
 libtomcrypt:arm64-uwp=fail
+# libtorch ICEs MSVC 19.38.33130
+libtorch:x64-windows=fail
 libtorch:x64-osx=fail
 libusb:arm-neon-android=fail
 libusb:arm64-android=fail

diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake
@@ -567,7 +567,6 @@ function(vcpkg_configure_make)
             string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}")
             string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}")
             # Can somebody please check if CMake's compiler flags for UWP are correct?
-            set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"")
             set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}")
         endif()
     endif()

diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake
@@ -58,13 +58,11 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     set(_vcpkg_winmd_flag "")
     if(VCPKG_MSVC_CXX_WINRT_EXTENSIONS)
         file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools)
-        set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}")
-        # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars
-        #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps
+        set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps
     endif()
 
     set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "")
-    set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "")
+    set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${CHARSET_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "")
     set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "")
 
     unset(CHARSET_FLAG)

diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3a72233cd6fd652038cc947586758308deec1dd8",
+      "version": "3.6.2",
+      "port-version": 0
+    },
     {
       "git-tree": "00dc0e14dfa16f98420ac3a15b9b158af7cf87f8",
       "version": "3.6.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -517,7 +517,7 @@
       "port-version": 1
     },
     "baresip-libre": {
-      "baseline": "3.6.0",
+      "baseline": "3.6.2",
       "port-version": 0
     },
     "basisu": {
@@ -2706,7 +2706,7 @@
     },
     "folly": {
       "baseline": "2023.10.02.00",
-      "port-version": 0
+      "port-version": 1
     },
     "font-chef": {
       "baseline": "1.1.0",
@@ -3634,7 +3634,7 @@
     },
     "jkqtplotter": {
       "baseline": "2023-10-24",
-      "port-version": 0
+      "port-version": 1
     },
     "joltphysics": {
       "baseline": "4.0.0",
@@ -8458,7 +8458,7 @@
     },
     "tinyorm": {
       "baseline": "0.36.5",
-      "port-version": 1
+      "port-version": 2
     },
     "tinyply": {
       "baseline": "2.3.4",

diff --git a/versions/f-/folly.json b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d4dff9c56b8324d2e6b7ca2ba6ad0b60845de56",
+      "version-string": "2023.10.02.00",
+      "port-version": 1
+    },
     {
       "git-tree": "a909b9222ac4ded463976431d65b6b24fa486bd3",
       "version-string": "2023.10.02.00",

diff --git a/versions/j-/jkqtplotter.json b/versions/j-/jkqtplotter.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "521f2575d969bbee8de26e4d6ab7ee5a2ed13cd6",
+      "version-date": "2023-10-24",
+      "port-version": 1
+    },
     {
       "git-tree": "87ffb0cb05a71f4338bd068bc14a348770b7d4ff",
       "version-date": "2023-10-24",

diff --git a/versions/t-/tinyorm.json b/versions/t-/tinyorm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "12c91b5f142c2fc260bcab8e2b2cdf8e905e015e",
+      "version-semver": "0.36.5",
+      "port-version": 2
+    },
     {
       "git-tree": "7a9e99fe4b4dca20d2e2a7c3bc9d575e5f1700ba",
       "version-semver": "0.36.5",