From 6e8f8e3a83c0b22c9effb4559dc8d024031b20a9 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Mon, 24 Jan 2022 12:54:09 -0800
Subject: [PATCH] [folly] Remove vcpkg_fail_port_install. (#22745)

* [folly] Remove vcpkg_fail_port_install.

vcpkg.json was missing the uwp skip but otherwise agreed. There is no ci.baseline.txt impact because:

     Error: libevent[core] is only supported on '!uwp'

In support of https://github.com/microsoft/vcpkg/pull/21502

* Give up trying to prove that the support expression is correct and just follow what portfile.cmake says.

* Fix brain fart @JackBoosY found.
---
 ports/folly/portfile.cmake | 6 ------
 ports/folly/vcpkg.json     | 4 ++--
 versions/baseline.json     | 2 +-
 versions/f-/folly.json     | 5 +++++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 0d195a0552..75df96a254 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -1,9 +1,3 @@
-if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm" "arm64")
-else()
-    vcpkg_fail_port_install(ON_ARCH "x86" "arm")
-endif()
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 # Required to run build/generate_escape_tables.py et al.
diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
index 64d892bf55..f78c900488 100644
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "folly",
   "version-string": "2021.06.14.00",
-  "port-version": 3,
+  "port-version": 4,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
-  "supports": "x64 | (arm64 & !windows)",
+  "supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))",
   "dependencies": [
     "boost-chrono",
     "boost-context",
diff --git a/versions/baseline.json b/versions/baseline.json
index 0b95e02d4d..b5b26e270b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2230,7 +2230,7 @@
     },
     "folly": {
       "baseline": "2021.06.14.00",
-      "port-version": 3
+      "port-version": 4
     },
     "font-chef": {
       "baseline": "1.1.0",
diff --git a/versions/f-/folly.json b/versions/f-/folly.json
index 689c82a265..597b5135c4 100644
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c31f74183da180ea71937f3c5b6ac0c8a3619b1b",
+      "version-string": "2021.06.14.00",
+      "port-version": 4
+    },
     {
       "git-tree": "8bba15fddadde6b40f2984f6928aa24a50aa2b47",
       "version-string": "2021.06.14.00",