diff --git a/build.sh b/build.sh
index 84d56f95b..08b535a8e 100755
--- a/build.sh
+++ b/build.sh
@@ -88,13 +88,14 @@ CleanFolder()
 
 BuildWithMSBuild()
 {
-    installationPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -property installationPath`
-    installationPath=${installationPath/C:\\/\/c\/}
-    installationPath=${installationPath//\\/\/}
-    msBuild="$installationPath/MSBuild/$msBuildVersion/Bin"
-    echo $msBuild
+    msBuildPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -find MSBuild\\\\\*\*\\\\Bin\\\\MSBuild.exe`
+    msBuildPath=${msBuildPath/C:\\/\/c\/}
+    msBuildPath=${msBuildPath//\\/\/}
+    msBuildDir=$(dirname "$msBuildPath")
 
-    export PATH=$msBuild:$PATH
+    echo $msBuildDir
+
+    export PATH=$msBuildDir:$PATH
     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
diff --git a/docker/tests/run-all.sh b/docker/tests/run-all.sh
index 70c079e34..3b65f85c9 100644
--- a/docker/tests/run-all.sh
+++ b/docker/tests/run-all.sh
@@ -21,10 +21,10 @@ done
 # excess goes to the swap and will slow down the entire system
 
 # Preferred versions
-MONO_VERSIONS="6.0 5.20 5.18"
+MONO_VERSIONS="6.8 6.6 6.4 6.0 5.20 5.18"
 
 # Future versions
-MONO_VERSIONS="$MONO_VERSIONS 6.4=preview-xenial"
+MONO_VERSIONS="$MONO_VERSIONS 6.10=preview-xenial"
 
 # Supported versions 
 MONO_VERSIONS="$MONO_VERSIONS 5.16 5.14 5.12 5.10 5.8 5.4"
diff --git a/tools/vswhere/vswhere.exe b/tools/vswhere/vswhere.exe
index e1b511803..582e82868 100644
Binary files a/tools/vswhere/vswhere.exe and b/tools/vswhere/vswhere.exe differ