From b82751cc0061bf49194a24050078dd9ee1d3427f Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Tue, 30 Jun 2026 19:36:12 +0530
Subject: [PATCH] Add support for vs18 builds

---
 include/download-instructions/windows-downloads.php | 4 +++-
 include/download-instructions/windows.ps1           | 1 +
 pre-release-builds.php                              | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/download-instructions/windows-downloads.php b/include/download-instructions/windows-downloads.php
index 77e6445740..8706c1f28e 100644
--- a/include/download-instructions/windows-downloads.php
+++ b/include/download-instructions/windows-downloads.php
@@ -19,7 +19,9 @@
 
 function ws_build_label(string $k, array $entry): string {
 	$tool = 'VS';
-	if (strpos($k, 'vs17') !== false) {
+	if (strpos($k, 'vs18') !== false) {
+		$tool .= '18';
+	} elseif (strpos($k, 'vs17') !== false) {
 		$tool .= '17';
 	} elseif (strpos($k, 'vs16') !== false) {
 		$tool .= '16';
diff --git a/include/download-instructions/windows.ps1 b/include/download-instructions/windows.ps1
index a81aa16939..ad97675f87 100644
--- a/include/download-instructions/windows.ps1
+++ b/include/download-instructions/windows.ps1
@@ -216,6 +216,7 @@ Function Get-VSVersion {
         '7.2' = 'VC15'; '7.3' = 'VC15'; '7.4' = 'vc15'
         '8.0' = 'vs16'; '8.1' = 'vs16'; '8.2' = 'vs16'; '8.3' = 'vs16'
         '8.4' = 'vs17'; '8.5' = 'vs17'
+        '8.6' = 'vs18';
     }
 
     if ($map.ContainsKey($Version)) {
diff --git a/pre-release-builds.php b/pre-release-builds.php
index 83ccd72099..868ed84d50 100644
--- a/pre-release-builds.php
+++ b/pre-release-builds.php
@@ -136,7 +136,9 @@
 
     $buildLabel = static function (string $key, array $entry): string {
       $tool = 'VS';
-      if (strpos($key, 'vs17') !== false) {
+      if (strpos($key, 'vs18') !== false) {
+        $tool .= '18';
+      } elseif (strpos($key, 'vs17') !== false) {
         $tool .= '17';
       } elseif (strpos($key, 'vs16') !== false) {
         $tool .= '16';