diff --git a/build_for_benchmarking.ps1 b/build_for_benchmarking.ps1
@@ -0,0 +1,14 @@
+$ErrorActionPreference = "Stop"
+
+$msbuild = &".\find_msbuild.ps1"
+
+&$msbuild                                      `
+    /t:benchmarks;Scripts\benchmark_automation `
+    /m                                         `
+    /property:Configuration=Release            `
+    /property:Platform=x64                     `
+    Principia.sln
+
+if (!$?) {
+  exit 1
+}
diff --git a/debug_x64_and_release_x64.xml → debug_and_release_in_parallel.xml b/debug_x64_and_release_x64.xml → debug_and_release_in_parallel.xml
diff --git a/find_msbuild.ps1 b/find_msbuild.ps1
@@ -0,0 +1,27 @@
+$version = "15.9.3"
+$preview = "1"
+
+$vswhere = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+$names = &$vswhere                        `
+    -prerelease                           `
+    -all                                  `
+    -requires Microsoft.Component.MSBuild `
+    -property installationName
+
+$msbuildpaths = &$vswhere                 `
+    -prerelease                           `
+    -all                                  `
+    -requires Microsoft.Component.MSBuild `
+    -find MSBuild\**\Bin\MSBuild.exe
+
+$i = 0;
+foreach ($name in $names) {
+  if ($name.startswith("VisualStudioPreview/$version-pre.$preview.")) {
+    return $msbuildpaths[$i]
+  }
+  ++$i
+}
+
+write-error(
+    "Could not find Visual Studio version $version preview $preview;" +
+    " found the following versions:`n$([string]::join("`n", $names))")
diff --git a/multi_processor_compilation.props b/multi_processor_compilation.props
diff --git a/rebuild_all_solutions.ps1 b/rebuild_all_solutions.ps1
@@ -1,4 +1,7 @@
-$msbuild = join-path -path (Get-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7")."15.0" -childpath "MSBuild\15.0\Bin\msbuild.exe"
+$ErrorActionPreference = "Stop"
+
+$msbuild = &".\Principia\find_msbuild.ps1"
+
 $dependencies = @(".\Google\glog\google-glog.sln",
                   ".\Google\googletest\googletest\msvc\2017\gtest.sln",
                   ".\Google\googletest\googlemock\msvc\2017\gmock.sln",
@@ -35,7 +38,7 @@ function build_solutions($solutions) {
   foreach ($configuration in "Debug", "Release") {
     foreach ($platform in "x64") {
       foreach ($solution in $solutions) {
-        &$msbuild /t:"Clean;Build" /m /property:VisualStudioVersion=15.0 /property:Configuration=$configuration /property:Platform=$platform $solution
+        &$msbuild /t:"Clean;Build" /m /property:Configuration=$configuration /property:Platform=$platform $solution
         if (!$?) {
           exit 1
         }

diff --git a/rebuild_debug_and_release_in_parallel.ps1 b/rebuild_debug_and_release_in_parallel.ps1
@@ -0,0 +1,12 @@
+$ErrorActionPreference = "Stop"
+
+$msbuild = &".\find_msbuild.ps1"
+
+&$msbuild            `
+    /t:"Clean;Build" `
+    /m               `
+    .\debug_and_release_in_parallel.xml
+
+if (!$?) {
+  exit 1
+}