From af8d046787840099d68b694a0c0d699062d7219f Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Fri, 17 Oct 2025 14:34:38 +0800
Subject: [PATCH 1/5] Update CMakePresets version to 3.26

---
 src/coreclr/CMakePresets.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/CMakePresets.json b/src/coreclr/CMakePresets.json
index fe959dfca79832..111627061f141d 100644
--- a/src/coreclr/CMakePresets.json
+++ b/src/coreclr/CMakePresets.json
@@ -1,8 +1,8 @@
 {
-  "version": 2,
+  "version": 6,
   "cmakeMinimumRequired": {
     "major": 3,
-    "minor": 20
+    "minor": 26
   },
   "configurePresets": [
     {

From ada0394266ac585a2cd4d901514f6a5986d3e269 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Fri, 17 Oct 2025 14:37:09 +0800
Subject: [PATCH 2/5] Use installDir

---
 src/coreclr/CMakePresets.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/coreclr/CMakePresets.json b/src/coreclr/CMakePresets.json
index 111627061f141d..ecf4e367435fff 100644
--- a/src/coreclr/CMakePresets.json
+++ b/src/coreclr/CMakePresets.json
@@ -10,9 +10,7 @@
       "hidden": true,
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/../../artifacts/obj/coreclr/${presetName}",
-      "cacheVariables": {
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/../../artifacts/bin/coreclr/${presetName}"
-      }
+      "installDir": "${sourceDir}/../../artifacts/bin/coreclr/${presetName}"
     },
     {
       "name": "windows-base",

From 9f54d11cba1fa7b731675c6c83953aa3369d1143 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Fri, 17 Oct 2025 15:03:25 +0800
Subject: [PATCH 3/5] Use condition on hostSystemName

---
 src/coreclr/CMakePresets.json | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/coreclr/CMakePresets.json b/src/coreclr/CMakePresets.json
index ecf4e367435fff..81c9432c6eb0dc 100644
--- a/src/coreclr/CMakePresets.json
+++ b/src/coreclr/CMakePresets.json
@@ -20,12 +20,10 @@
         "CLR_CMAKE_TARGET_OS": "windows",
         "CLI_CMAKE_FALLBACK_OS": "win10"
       },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "hostOS": [
-            "Windows"
-          ]
-        }
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
     },
     {
@@ -35,12 +33,10 @@
       "cacheVariables": {
         "CLR_CMAKE_TARGET_OS": "darwin"
       },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "hostOS": [
-            "macOS"
-          ]
-        }
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
       }
     },
     {
@@ -50,12 +46,10 @@
       "cacheVariables": {
         "CLR_CMAKE_TARGET_OS": "linux"
       },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "hostOS": [
-            "Linux"
-          ]
-        }
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
       }
     },
     {

From 04fe377566a79c371c2f2ccfaf52e359acaad8fd Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Fri, 17 Oct 2025 15:20:49 +0800
Subject: [PATCH 4/5] Remove unnecessary CLI_CMAKE_FALLBACK_OS

---
 src/coreclr/CMakePresets.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/coreclr/CMakePresets.json b/src/coreclr/CMakePresets.json
index 81c9432c6eb0dc..ee3c5acf29612f 100644
--- a/src/coreclr/CMakePresets.json
+++ b/src/coreclr/CMakePresets.json
@@ -17,8 +17,7 @@
       "hidden": true,
       "inherits": "base",
       "cacheVariables": {
-        "CLR_CMAKE_TARGET_OS": "windows",
-        "CLI_CMAKE_FALLBACK_OS": "win10"
+        "CLR_CMAKE_TARGET_OS": "windows"
       },
       "condition": {
         "type": "equals",

From 4fc1d4cb683e92f361fa18aa97621cae8e75d99d Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Fri, 17 Oct 2025 15:39:15 +0800
Subject: [PATCH 5/5] CLR_CMAKE_TARGET_OS is unnecessary now

---
 src/coreclr/CMakePresets.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/coreclr/CMakePresets.json b/src/coreclr/CMakePresets.json
index ee3c5acf29612f..7627c127678d3f 100644
--- a/src/coreclr/CMakePresets.json
+++ b/src/coreclr/CMakePresets.json
@@ -16,9 +16,6 @@
       "name": "windows-base",
       "hidden": true,
       "inherits": "base",
-      "cacheVariables": {
-        "CLR_CMAKE_TARGET_OS": "windows"
-      },
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
@@ -29,9 +26,6 @@
       "name": "osx-base",
       "hidden": true,
       "inherits": "base",
-      "cacheVariables": {
-        "CLR_CMAKE_TARGET_OS": "darwin"
-      },
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
@@ -42,9 +36,6 @@
       "name": "linux-base",
       "hidden": true,
       "inherits": "base",
-      "cacheVariables": {
-        "CLR_CMAKE_TARGET_OS": "linux"
-      },
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",