From 9fa9e446ffb23b92b48dc4079302c6387bb5e1d7 Mon Sep 17 00:00:00 2001
From: Griffin Bassman <griffinbassman@gmail.com>
Date: Thu, 18 Jul 2024 15:07:21 -0400
Subject: [PATCH 1/2] fix: macos-11 -> macos-12 (deprecation) (#4698)

---
 .github/workflows/build_macos.yml   | 2 +-
 .github/workflows/python_wheels.yml | 4 ++--
 .github/workflows/vendor_build.yml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index 8a32cd59496..4502623e2ae 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [macos-11]
+        os: [macos-12]
         build_type: [Debug, Release]
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/python_wheels.yml b/.github/workflows/python_wheels.yml
index 2302c48c0a6..21e216412e4 100644
--- a/.github/workflows/python_wheels.yml
+++ b/.github/workflows/python_wheels.yml
@@ -222,7 +222,7 @@ jobs:
             deactivate'
   macos-python-build:
     name: macos.amd64.py${{ matrix.config.version }}.build
-    runs-on: macos-11
+    runs-on: macos-12
     strategy:
       matrix:
         config:
@@ -254,7 +254,7 @@ jobs:
   macos-python-test:
     name: macos.amd64.py${{ matrix.version }}.test
     needs: macos-python-build
-    runs-on: macos-11
+    runs-on: macos-12
     strategy:
       matrix:
         version: [3.6, 3.7, 3.8, 3.9, "3.10"]
diff --git a/.github/workflows/vendor_build.yml b/.github/workflows/vendor_build.yml
index 0d17809b8fe..cec92cd64bb 100644
--- a/.github/workflows/vendor_build.yml
+++ b/.github/workflows/vendor_build.yml
@@ -99,7 +99,7 @@ jobs:
     name: core-cli.${{ matrix.os }}.amd64.${{ matrix.build_type }}.AppleClang.standalone
     strategy:
       matrix:
-        os: [macos-11]
+        os: [macos-12]
         build_type: [Debug, Release]
     steps:
       - uses: actions/checkout@v3

From f1875bfa0f50bae9c9b0de3ced340639f6adfad1 Mon Sep 17 00:00:00 2001
From: Rajan <rajan.chari@yahoo.com>
Date: Thu, 18 Jul 2024 15:34:51 -0400
Subject: [PATCH 2/2] added visual studio 2022 cmake preset (#4656)

Co-authored-by: olgavrou <olgavrou@gmail.com>
Co-authored-by: Jack Gerrits <jackgerrits@users.noreply.github.com>
---
 CMakePresets.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/CMakePresets.json b/CMakePresets.json
index 693b834a4a1..f2c37850241 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -218,6 +218,53 @@
           "value": "On"
         }
       }
+    },
+    {
+      "name": "vs2022-vcpkg-no-sys-deps",
+      "generator": "Visual Studio 17 2022",
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": {
+          "type": "FILEPATH",
+          "value": "${sourceDir}/ext_libs/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        },
+        "BUILD_TESTING": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "RAPIDJSON_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "FMT_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "SPDLOG_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_BOOST_MATH_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_ZLIB_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_GTEST_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_EIGEN_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_STRING_VIEW_LITE_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        }
+      }
     }
   ],
   "buildPresets": [