From 44177c4e7c0adcb565c646e44dee3a81da1dc7a0 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Sun, 21 Feb 2021 03:00:44 +0500 Subject: [PATCH] builder: use stable MSVC version instead preview (#8867) --- make.bat | 2 +- vlib/v/builder/msvc.v | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make.bat b/make.bat index f437a04806..647ff839c7 100644 --- a/make.bat +++ b/make.bat @@ -247,7 +247,7 @@ if not exist "%VsWhereDir%\Microsoft Visual Studio\Installer\vswhere.exe" ( goto :tcc_strap ) -for /f "usebackq tokens=*" %%i in (`"%VsWhereDir%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( +for /f "usebackq tokens=*" %%i in (`"%VsWhereDir%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( set InstallDir=%%i ) diff --git a/vlib/v/builder/msvc.v b/vlib/v/builder/msvc.v index b9c16a9f60..5ed4d6661e 100644 --- a/vlib/v/builder/msvc.v +++ b/vlib/v/builder/msvc.v @@ -137,7 +137,7 @@ fn find_vs(vswhere_dir string, host_arch string, target_arch string) ?VsInstalla // VSWhere is guaranteed to be installed at this location now // If its not there then end user needs to update their visual studio // installation! - res := os.exec('"$vswhere_dir\\Microsoft Visual Studio\\Installer\\vswhere.exe" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath') ? + res := os.exec('"$vswhere_dir\\Microsoft Visual Studio\\Installer\\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath') ? res_output := res.output.trim_right('\r\n') // println('res: "$res"') version := os.read_file('$res_output\\VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.default.txt') or {