From a2a261d0ad8e4eab91e0ca19e05d4c01a9b89a53 Mon Sep 17 00:00:00 2001
From: Pavel Dubsky <pavel.dubsky@qt.io>
Date: Tue, 22 Jul 2025 20:37:21 +0200
Subject: [PATCH] Prevent Enter-VsDevShell from changing current working
 directory

Pick-to: 6.8 6.5
Change-Id: I6de981c06326a6d70bc200af74164a1021f8c138
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 814bfb1923f68e844d41906ea8d24ce24f1ca15d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f91eb1e821647dc41bd33413625491077df64c0d)
---
 coin/provisioning/common/windows/helpers.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index ad01c499..1fb394fb 100644
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -358,7 +358,7 @@ function EnterVSDevShell {
     Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch -VsInstallPath='$VSPath')"
     try {
         Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
-        Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo"
+        Enter-VsDevShell -SkipAutomaticLocation -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo"
     } catch {
         Write-Host "Failed to enter VisualStudio DevShell"
         return $false