Skip uninstalling other MSVC versions if they are found (#1402)

huydhn · web-flow · commit 28f8bddc4e81 · 2023-05-11T15:01:46.000-07:00
diff --git a/windows/internal/vs2019_install.ps1 b/windows/internal/vs2019_install.ps1
@@ -27,15 +27,7 @@ if (Test-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswher
             echo "Found correctly versioned existing BuildTools installation in $existingPath"
             exit 0
         }
-        echo "Found existing BuildTools installation in $existingPath"
-        $VS_UNINSTALL_ARGS = @("uninstall", "--installPath", "`"$existingPath`"", "--quiet","--wait")
-        $process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_UNINSTALL_ARGS -NoNewWindow -Wait -PassThru
-        $exitCode = $process.ExitCode
-        if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {
-            echo "Original BuildTools uninstall failed with code $exitCode"
-            exit 1
-        }
-        echo "Original BuildTools uninstalled"
+        echo "Found existing BuildTools installation in $existingPath, keeping it"
     }
 }
 
diff --git a/windows/internal/vs2022_install.ps1 b/windows/internal/vs2022_install.ps1
@@ -27,15 +27,7 @@ if (Test-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswher
             echo "Found correctly versioned existing BuildTools installation in $existingPath"
             exit 0
         }
-        echo "Found existing BuildTools installation in $existingPath"
-        $VS_UNINSTALL_ARGS = @("uninstall", "--installPath", "`"$existingPath`"", "--quiet","--wait")
-        $process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_UNINSTALL_ARGS -NoNewWindow -Wait -PassThru
-        $exitCode = $process.ExitCode
-        if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {
-            echo "Original BuildTools uninstall failed with code $exitCode"
-            exit 1
-        }
-        echo "Original BuildTools uninstalled"
+        echo "Found existing BuildTools installation in $existingPath, keeping it"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,7 @@ if (Test-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswher`
`27`	`27`	`echo "Found correctly versioned existing BuildTools installation in $existingPath"`
`28`	`28`	`exit 0`
`29`	`29`	`}`
`30`		`- echo "Found existing BuildTools installation in $existingPath"`
`31`		- $VS_UNINSTALL_ARGS = @("uninstall", "--installPath", "`"$existingPath`"", "--quiet","--wait")
`32`		`- $process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_UNINSTALL_ARGS -NoNewWindow -Wait -PassThru`
`33`		`- $exitCode = $process.ExitCode`
`34`		`- if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {`
`35`		`- echo "Original BuildTools uninstall failed with code $exitCode"`
`36`		`- exit 1`
`37`		`- }`
`38`		`- echo "Original BuildTools uninstalled"`
	`30`	`+ echo "Found existing BuildTools installation in $existingPath, keeping it"`
`39`	`31`	`}`
`40`	`32`	`}`
`41`	`33`