From cb7fbe43eeb84337af2e8ea8556e643b84ae193c Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:07:14 +0100
Subject: [PATCH] no-bug: Update rust deps and VS version (gh-12850)

---
 .github/workflows/windows-release-build.yml | 6 +++---
 .rust-toolchain                             | 2 +-
 build/windows/bootstrap.ps1                 | 2 +-
 build/windows/sign.ps1                      | 4 ++--
 configs/windows/mozconfig                   | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 8db2042ea..a7260a733 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -159,7 +159,7 @@ jobs:
           tar --zstd -xf wine.tar.zst -C ~/win-cross
           rm wine.tar.zst
           echo Setup Visual Studio
-          ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
+          ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2026.yaml ~/win-cross/vs2026
 
       - name: Import
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
@@ -174,7 +174,7 @@ jobs:
         run: |
           set -x
           cd engine/
-          chmod -R +x "$(echo ~)/win-cross/vs2022" || true
+          chmod -R +x "$(echo ~)/win-cross/vs2026" || true
           cd ..
           export SURFER_PLATFORM="win32"
           npm run bootstrap
@@ -185,7 +185,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install dos2unix
           ls ~/win-cross/wine || true
-          ls ~/win-cross/vs2022 || true
+          ls ~/win-cross/vs2026 || true
 
       - name: Setup Rust
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
diff --git a/.rust-toolchain b/.rust-toolchain
index 808a19e59..bfda7af0b 100644
--- a/.rust-toolchain
+++ b/.rust-toolchain
@@ -1 +1 @@
-1.89
\ No newline at end of file
+1.95
\ No newline at end of file
diff --git a/build/windows/bootstrap.ps1 b/build/windows/bootstrap.ps1
index 60ae8d8ea..7a19ffdd5 100644
--- a/build/windows/bootstrap.ps1
+++ b/build/windows/bootstrap.ps1
@@ -9,5 +9,5 @@ rustup target add aarch64-pc-windows-msvc
 rustup target add x86_64-pc-windows-msvc
 
 cd engine
-./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ../win-cross/vs2022
+./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2026.yaml ../win-cross/vs2026
 cd ..
diff --git a/build/windows/sign.ps1 b/build/windows/sign.ps1
index 749c33503..a5966550c 100644
--- a/build/windows/sign.ps1
+++ b/build/windows/sign.ps1
@@ -142,9 +142,9 @@ function SignAndPackage($name) {
     $env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe"
 
     if ($name -eq "arm64") {
-        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT"
+        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT"
     } else {
-        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
+        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
     }
 
     $env:MAR="..\\build\\windows\\mar.exe"
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index ed5175b0c..fd1e5bfb7 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -4,7 +4,7 @@
 
 if test "$ZEN_CROSS_COMPILING"; then
 
-  export WINSYSROOT="$(echo ~)/win-cross/vs2022"
+  export WINSYSROOT="$(echo ~)/win-cross/vs2026"
 
   export WINE="$(echo ~)/win-cross/wine/bin/wine"
   export WINEDEBUG=-all
@@ -16,9 +16,9 @@ if test "$ZEN_CROSS_COMPILING"; then
   CROSS_COMPILE=1
 
   if test "$SURFER_COMPAT" = "aarch64"; then
-    export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/arm64/Microsoft.VC143.CRT"
+    export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.38.33135/arm64/Microsoft.VC143.CRT"
   else
-    export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT"
+    export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT"
   fi
 fi