diff --git a/build_tools.cmd b/build_tools.cmd
new file mode 100644
index 000000000..7d3180b19
--- /dev/null
+++ b/build_tools.cmd
@@ -0,0 +1,17 @@
+@echo off
+
+set target_platform=%1
+set target_configuration=%2
+set target_version=%3
+
+if "%target_platform%"=="" set target_platform=x64
+if "%target_configuration%"=="" set target_configuration=Release
+if "%target_version%"=="" set target_version=1.2.3.4
+
+call nuget restore cppwinrt.sln
+call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt
+call build_projection %target_platform% %target_configuration%
+call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test
+
+call nuget restore natvis\cppwinrtvisualizer.sln
+call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
diff --git a/nuget/build.cmd b/nuget/build.cmd
deleted file mode 100644
index 597f19856..000000000
--- a/nuget/build.cmd
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-
-setlocal
-set my_dir=%~dp0
-set build_dir=%my_dir%..\build
-
-set configuration=%1
-if "%configuration%" == "" (
-	set configuration=Release
-)
-
-set package_version=%2
-if "%package_version%" == "" (
-	set package_version=2.3.4.5
-)
-
-if not exist "%build_dir%\nuget.exe" (
-	echo Downloading NuGet.exe...
-	curl.exe -L# -o %build_dir%\nuget.exe "https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe"
-)
-
-rem Yes, this must be all on one line.
-%build_dir%\nuget.exe pack Microsoft.Windows.CppWinRT.nuspec -Version %package_version% -Properties cppwinrt_exe=%build_dir%\x86\%configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%build_dir%\x86\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%build_dir%\x64\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%build_dir%\ARM\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%build_dir%\ARM64\%configuration%\cppwinrt_fast_forwarder.lib
-
-endlocal