Update Windows Fleet for December 2023 Patch Tuesday

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"

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")

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",

scripts/azure-pipelines/azure-pipelines.yml

@@ -4,7 +4,7 @@
 variables:
   android-pool: 'PrAnd-1ES-Pool'
   linux-pool: 'PrLin-1ES-Pool'
-  windows-pool: 'PrWin-2023-10-11'
+  windows-pool: 'PrWin-2023-12-12'
   osx-pool: 'PrOsx-2023-09-11'
   linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-12-05'
 

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" + `

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.

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

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",

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.4.0/PowerShell-7.4.0-win-x64.msi'
 InstallMSI -Url $PwshUrl -Name 'PowerShell Core'

versions/baseline.json

@@ -2718,7 +2718,7 @@
     },
     "folly": {
       "baseline": "2023.10.02.00",
-      "port-version": 0
+      "port-version": 1
     },
     "font-chef": {
       "baseline": "1.1.0",

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",