Merge pull request #680 from ovebastiansen/issue-679-vspreviewbuild

finding msbuild with a pure vs preview installation

build.cake

@@ -105,18 +105,20 @@ Task("Clean")
 Task("Build")
     .Does(() =>
     {
-        // Find MSBuild for Visual Studio 2019 and newer
-        DirectoryPath vsLatest = VSWhereLatest();
-        FilePath msBuildPath = vsLatest?.CombineWithFilePath("./MSBuild/Current/Bin/MSBuild.exe");
-
-        // Find MSBuild for Visual Studio 2017
-        if (msBuildPath != null && !FileExists(msBuildPath))
-            msBuildPath = vsLatest.CombineWithFilePath("./MSBuild/15.0/Bin/MSBuild.exe");
-
-        // Have we found MSBuild yet?
-        if ( !FileExists(msBuildPath) )
+        // Workaround for https://github.com/cake-build/cake/issues/2128
+        // cannot find pure preview installations of visual studio
+        var vsInstallation =
+            VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild" })
+            ?? VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true });
+        if(vsInstallation == null)
+        {
+            throw new Exception($"Failed to find any Visual Studio version");
+        }
+        
+        FilePath msBuildPath = vsInstallation.CombineWithFilePath(@"MSBuild\Current\Bin\MSBuild.exe");
+        if (!FileExists(msBuildPath))
         {
-            throw new Exception($"Failed to find MSBuild: {msBuildPath}");
+            msBuildPath = vsInstallation.CombineWithFilePath(@"MSBuild\15.0\Bin\MSBuild.exe");
         }
 
         Information("Building using MSBuild at " + msBuildPath);