diff --git a/appveyor.yml b/appveyor.yml
index 585147f58..e6086f98f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,4 +54,6 @@ only_commits:
     - setup/
     - frontend/
     - appveyor.yml
-    - build-appveyor.cake
+    - build.sh
+    - test.sh
+    - appveyor-package.sh
diff --git a/build.sh b/build.sh
index 843cc773b..5b26dedb1 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-msBuild='/c/Program Files (x86)/MSBuild/14.0/Bin'
+msBuildVersion='15.0'
 outputFolder='./_output'
 outputFolderLinux='./_output_linux'
 outputFolderMacOS='./_output_macos'
@@ -19,6 +19,8 @@ artifactsFolderMacOS=$artifactsFolder/macos
 artifactsFolderMacOSApp=$artifactsFolder/macos-app
 
 nuget='tools/nuget/nuget.exe';
+vswhere='tools/vswhere/vswhere.exe';
+
 CheckExitCode()
 {
     "$@"
@@ -74,8 +76,14 @@ AddJsonNet()
 
 BuildWithMSBuild()
 {
+    installationPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -property installationPath`
+    installationPath=${installationPath/C:\\/\/c\/}
+    installationPath=${installationPath//\\/\/}
+    msBuild="$installationPath/MSBuild/$msBuildVersion/Bin"
+    echo $msBuild
+
     export PATH=$msBuild:$PATH
-    CheckExitCode MSBuild.exe $slnFile //t:Clean //m
+    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Clean //m
     $nuget restore $slnFile
     CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
 }
@@ -83,9 +91,9 @@ BuildWithMSBuild()
 BuildWithXbuild()
 {
     export MONO_IOMAP=case
-    CheckExitCode xbuild /t:Clean $slnFile
+    CheckExitCode msbuild /t:Clean $slnFile
     mono $nuget restore $slnFile
-    CheckExitCode xbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
+    CheckExitCode msbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
 }
 
 LintUI()
diff --git a/tools/nuget/nuget.exe b/tools/nuget/nuget.exe
index 9f8781de0..0cc40884a 100644
Binary files a/tools/nuget/nuget.exe and b/tools/nuget/nuget.exe differ
diff --git a/tools/vswhere/vswhere.exe b/tools/vswhere/vswhere.exe
new file mode 100644
index 000000000..e1b511803
Binary files /dev/null and b/tools/vswhere/vswhere.exe differ