Fix #5

Author: MikeAlhayek

lib/constants.js

@@ -8,6 +8,7 @@ module.exports = {
   PLUGIN_NAME: "gulp-msbuild",
 
   MSBUILD_VERSIONS: {
+<<<<<<< HEAD
     1.0: "v1.0.3705",
     1.1: "v1.1.4322",
     2.0: "v2.0.50727",
@@ -16,6 +17,17 @@ module.exports = {
     12.0: "12.0",
     14.0: "14.0",
     15.0: "15.0"
+=======
+    1.0: 'v1.0.3705',
+    1.1: 'v1.1.4322',
+    2.0: 'v2.0.50727',
+    3.5: 'v3.5',
+    4.0: 'v4.0.30319',
+    12.0: '12.0',
+    14.0: '14.0',
+    15.0: '15.0',
+    16.0: '16.0'
+>>>>>>> 8dd0787... Fix #5 for VisualStudio 2019 MBBuild 16
   },
 
   DEFAULTS: {

lib/msbuild-finder.js

@@ -35,26 +35,36 @@ function msBuildFromWhere(pathRoot) {
     }
   }
   const installKeyword = "installationPath";
+  const installationVersionKeyword = "installationVersion";
   if (cmdOutput.length > 0) {
+    let installationPath = "";
+    let instalationVersion = 15.0;
+
     const results = cmdOutput.split(/\r?\n/);
     for (let cmdLineIndex = 0; cmdLineIndex < results.length; cmdLineIndex++) {
       const cmdLine = results[cmdLineIndex];
       if (cmdLine.startsWith(installKeyword)) {
-        const match = cmdLine.replace(installKeyword + ": ", "");
-        return match;
+        installationPath = cmdLine.replace(installKeyword + ": ", "");
+      }
+
+      if (cmdLine.startsWith(installationVersionKeyword)) {
+        let versionParts = cmdLine.replace(installationVersionKeyword + ": ", "").split(".");
+        if(versionParts.length > 0){
+          instalationVersion = parseFloat(versionParts[0]);
+        }
       }
     }
+
+    return [installationPath, instalationVersion];
   }
-  return "";
+
+  return [];
 }
 
 module.exports.msBuildFromWhere = msBuildFromWhere;
 
 function detectMsBuild15Dir (pathRoot) {
-  const wherePath = msBuildFromWhere(pathRoot) || "";
-  if (wherePath.length > 0) {
-    return wherePath;
-  }
+
   const vs2017Path = path.join(pathRoot, "Microsoft Visual Studio", "2017");
   const possibleFolders = [ "BuildTools", "Enterprise", "Professional", "Community" ];
 
@@ -132,6 +142,13 @@ function addDetectedMsBuildVersionsToConstantsLookup(executables) {
 }
 
 function autoDetectVersion (pathRoot) {
+  
+  // Try to detect using fromWhere
+  const wherePath = msBuildFromWhere(pathRoot) || "";
+  if (wherePath.length > 0) {
+    return wherePath;
+  }
+
   // Try to detect MSBuild 15.0.
   const msbuild15OrLaterDir = detectMsBuild15Dir(pathRoot);
   if (msbuild15OrLaterDir) {
@@ -186,53 +203,42 @@ module.exports.find = function (options) {
     return "xbuild";
   }
 
-  let msbuildRoot;
   const is64Bit = options.architecture === "x64";
 
   // On 64-bit systems msbuild is always under the x86 directory. If this
   // doesn"t exist we are on a 32-bit system. See also:
   // https://blogs.msdn.microsoft.com/visualstudio/2013/07/24/msbuild-is-now-part-of-visual-studio/
-  let pathRoot;
+  let pathRoot = process.env["ProgramFiles"] || "C:/Program Files";
   if (is64Bit) {
     pathRoot = process.env["ProgramFiles(x86)"] || "C:/Program Files (x86)";
-  } else {
-    pathRoot = process.env["ProgramFiles"] || "C:/Program Files";
   }
 
-  let major;
-  // auto-detection also registers higher msbuild versions which from 2019+
-  let shouldProbe = options.toolsVersion === "auto";
-  if (options.toolsVersion !== "auto") {
-    major = parseInt(("" + options.toolsVersion).split(".")[0]);
-    if (!isNaN(major) && major > 15) {
-      shouldProbe = true;
-    }
-  }
-  const auto = shouldProbe ? autoDetectVersion(pathRoot) : null;
-  if (options.toolsVersion === "auto") {
-    // var result = autoDetectVersion(pathRoot);
-    msbuildRoot = auto[0]
-    options.toolsVersion = auto[1];
+  let msbuildRoot = pathRoot;
+  let toolsVersion = parseFloat(options.toolsVersion);
+  
+  if (options.toolsVersion === "auto" || isNaN(toolsVersion)) {
+    // if the toolsVersion is 'auto' or any other non-parsable string
+    // we'll auto delect the version
+    const auto = autoDetectVersion(pathRoot);
+    msbuildRoot = auto[0];
+    toolsVersion = parseFloat(auto[1]);
+    options.toolsVersion = toolsVersion;
   } else {
     const msbuildDir = detectMsBuild15Dir(pathRoot);
-    if (options.toolsVersion >= 15.0) {
-      if (msbuildDir) {
+    if (msbuildDir && toolsVersion >= 15.0) {
         msbuildRoot = msbuildDir;
-      } else {
-        msbuildRoot = pathRoot;
-      }
-    } else {
-      msbuildRoot = pathRoot;
     }
   }
 
-  const version = constants.MSBUILD_VERSIONS[options.toolsVersion];
+  const version = constants.MSBUILD_VERSIONS[toolsVersion];
   if (!version) {
-    throw new PluginError(constants.PLUGIN_NAME, "No MSBuild Version was supplied!");
+    throw new PluginError(constants.PLUGIN_NAME, "No or invalid MSBuild version was supplied! Please set or check the value of the 'toolsVersion' property.");
   }
 
-  major = parseInt(version.split(".")[0]);
-  if (major > 15) {
+  let major = parseInt(version.split(".")[0]);
+  if(major >= 16) {
+    return path.join(msbuildRoot, "MSBuild", "Current", "Bin", "MSBuild.exe");
+  } else if (major > 15 && major < 16) {
     let x64_dir = is64Bit ? "amd64" : "";
     const msbuildHome = path.join(msbuildRoot, "MSBuild");
     const msbuildExe = findMSBuildExeUnder(msbuildHome)
@@ -251,8 +257,8 @@ module.exports.find = function (options) {
   } else if (major >= 12 && major <= 15) {
     let x64_dir = is64Bit ? "amd64" : "";
     return path.join(msbuildRoot, "MSBuild", version, "Bin", x64_dir, "MSBuild.exe");
-  } else {
-    const framework = is64Bit ? "Framework64" : "Framework";
-    return path.join(options.windir, "Microsoft.Net", framework, version, "MSBuild.exe");
   }
+
+  const framework = is64Bit ? "Framework64" : "Framework";
+  return path.join(options.windir, "Microsoft.Net", framework, version, "MSBuild.exe");
 };

package.json

@@ -64,4 +64,4 @@
     "npm": ">=1.2.10"
   },
   "license": "MIT"
-}
+}