Index: utils/release/build_llvm_package.bat
===================================================================
--- utils/release/build_llvm_package.bat
+++ utils/release/build_llvm_package.bat
@@ -28,6 +28,7 @@
 set branch=trunk
 set package_version=6.0.0-r%revision%
 set clang_format_vs_version=6.0.0.%revision%
+set clang_tidy_vs_version=%clang_format_vs_version%
 set build_dir=llvm_package_%revision%
 
 echo Branch: %branch%
@@ -52,7 +53,7 @@
 
 
 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
-set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCMAKE_INSTALL_UCRT_LIBRARIES=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "
+set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCMAKE_INSTALL_UCRT_LIBRARIES=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DCLANG_TIDY_VS_VERSION=%clang_tidy_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "
 
 REM TODO: Run all tests, including lld and compiler-rt.
 
@@ -78,14 +79,15 @@
 ninja package || exit /b
 cd ..
 
-REM The plug-in is built separately as it uses a statically linked clang-format.exe.
+REM The plug-ins are built separately as they use statically linked clang-format.exe and clang-tidy.exe.
 mkdir build_vsix
 cd build_vsix
 set CC=..\build32_stage0\bin\clang-cl
 set CXX=..\build32_stage0\bin\clang-cl
-cmake -GNinja %cmake_flags% -DLLVM_USE_CRT_RELEASE=MT -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b
-ninja clang_format_vsix || exit /b
+cmake -GNinja %cmake_flags% -DLLVM_USE_CRT_RELEASE=MT -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DBUILD_CLANG_TIDY_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b
+ninja clang_format_vsix clang_tidy_vsix || exit /b
 copy ..\llvm\tools\clang\tools\clang-format-vs\ClangFormat\bin\Release\ClangFormat.vsix ClangFormat-r%revision%.vsix
+copy ..\llvm\tools\clang\tools\extra\clang-tidy-vs\ClangTidy\bin\Release\ClangTidy.vsix ClangTidy-r%revision%.vsix
 cd ..