diff --git a/src/msbuild.cmd b/src/msbuild.cmd
index 5736846da..2e1821f0a 100644
--- a/src/msbuild.cmd
+++ b/src/msbuild.cmd
@@ -1,2 +1,18 @@
+@echo off
+
+if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat" goto vs2017
+if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" goto vs2019
+
+echo Error: VsDevCmd.bat not found!
+goto:eof
+
+:vs2017
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat"
+goto run
+
+:vs2019
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"
+goto run
+
+:run
 msbuild.exe %*