1 files changed, 29 insertions, 10 deletions
diff --git a/msvc/build-external-btls.bat b/msvc/build-external-btls.bat
index 8b16219faec..d4de955a5a0 100644
--- a/msvc/build-external-btls.bat
+++ b/msvc/build-external-btls.bat
@@ -13,6 +13,7 @@
 :: %7 VS configuration (Debug/Release)
 :: %8 VS target
 :: %9 MsBuild bin path, if used.
+:: %10 Force MSBuild (true/false), if used.
 :: --------------------------------------------------
 
 @echo off
@@ -30,14 +31,24 @@ set PERL_BIN_NAME=perl.exe
 set YASM_BIN_NAME=yasm.exe
 
 set MONO_BTLS_DIR=%~1
-set BTLS_DIR=%~2
-set BTLS_BUILD_DIR=%~3
-set MONO_DIST_DIR=%~4
-set VS_CFLAGS=%~5
-set VS_PLATFORM=%~6
-set VS_CONFIGURATION=%~7
-set VS_TARGET=%~8
-set MSBUILD_BIN_PATH=%~9
+shift
+set BTLS_DIR=%~1
+shift
+set BTLS_BUILD_DIR=%~1
+shift
+set MONO_DIST_DIR=%~1
+shift
+set VS_CFLAGS=%~1
+shift
+set VS_PLATFORM=%~1
+shift
+set VS_CONFIGURATION=%~1
+shift
+set VS_TARGET=%~1
+shift
+set MSBUILD_BIN_PATH=%~1
+shift
+set FORCE_MSBUILD=%~1
 
 :: Setup toolchain.
 :: set GIT=
@@ -82,6 +93,10 @@ if "%VS_TARGET%" == "" (
     set VS_TARGET=Build
 )
 
+if "%FORCE_MSBUILD%" == "" (
+    set FORCE_MSBUILD=false
+)
+
 if not exist "%MONO_BTLS_DIR%" (
     echo Could not find "%MONO_BTLS_DIR%".
     goto ON_ERROR
@@ -326,7 +341,11 @@ if "%CMAKE%" == "" (
 )
 
 if /i "%VS_TARGET%" == "build" (
-    echo Found CMake: %CMAKE%
+    echo Found CMake: "%CMAKE%"
+)
+
+if /i "%FORCE_MSBUILD%" == "true" (
+    goto _SETUP_CMAKE_ENVIRONMENT_VS_GENERATOR
 )
 
 :: Check for optional cmake generate and build tools for full BTLS assembler supported build. NOTE, currently BTLS assembler build
@@ -362,7 +381,7 @@ goto _SETUP_CMAKE_ENVIRONMENT_EXIT
 :_SETUP_CMAKE_ENVIRONMENT_NINJA_GENERATOR
 
 if /i "%VS_TARGET%" == "build" (
-    echo Found Ninja: %NINJA%
+    echo Found Ninja: "%NINJA%"
     echo Using Ninja build generator, enabling full assembler build.
 )