From 66b4b34d99ab272fcf21f2bd12b616e371c6bb31 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Tue, 6 Feb 2024 15:38:09 -0800
Subject: [PATCH] [boost-modular-build-helper] Support VS2022 17.10 (#36605)

---
 ports/boost-modular-build-helper/CMakeLists.txt | 10 +++++++++-
 ports/boost-modular-build-helper/vcpkg.json     |  2 +-
 scripts/boost/generate-ports.ps1                |  2 +-
 versions/b-/boost-modular-build-helper.json     |  5 +++++
 versions/baseline.json                          |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index 25cac1d27f..272051b82b 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -63,8 +63,16 @@ if(VCPKG_DETECTED_MSVC)
         set(USER_CONFIG_TOOLSET msvc)
         if(VCPKG_DETECTED_MSVC_VERSION LESS "1900")
             math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1910")
+            set(USER_CONFIG_TOOLSET_VERSION "140")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1920")
+            set(USER_CONFIG_TOOLSET_VERSION "141")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1930")
+            set(USER_CONFIG_TOOLSET_VERSION "142")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1950")
+            set(USER_CONFIG_TOOLSET_VERSION "143")
         else()
-            math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50")
+            message(FATAL_ERROR "Unsupported MSVC version: ${VCPKG_DETECTED_MSVC_VERSION}")
         endif()
     endif()
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 059ada2005..216989d949 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -2,7 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-modular-build-helper",
   "version": "1.84.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Internal vcpkg port used to build Boost libraries",
   "license": "MIT",
   "dependencies": [
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 97f8d1ab95..bd8e449afe 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -27,7 +27,7 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
 # Clear this array when moving to a new boost version
 $defaultPortVersion = 0
 $portVersions = @{
-    'boost-modular-build-helper' = 1;
+    'boost-modular-build-helper' = 2;
 }
 
 function Get-PortVersion {
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index e63b0f4762..f1eddf016e 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b3eb3e3fdc08ffe6e8f9e19e761e583790aaf308",
+      "version": "1.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "dc7e88a84383b497c7d9e117a00319fd2b2ded98",
       "version": "1.84.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 54b02d4359..114421aac5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1010,7 +1010,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "boost-move": {
       "baseline": "1.84.0",