Merge pull request #81 from ngyukman/find

 Resolve MSBuild from vswhere

CHANGELOG.md

@@ -1,5 +1,8 @@
 # gradle-msbuild-plugin changelog
 
+## 2.17
+* support resolving msbuild for version >= 15.0 by vswhere
+
 ## 2.16
 
 ### Fixed

build.gradle

@@ -1,10 +1,11 @@
 plugins {
     id 'nu.studer.plugindev' version '1.0.3'
     id 'com.jfrog.bintray' version '1.2'
-    id 'com.ullink.msbuild' version '2.15'
+    id 'com.ullink.msbuild' version '2.16'
     id 'com.ullink.nuget' version '2.13'
     id 'com.ullink.nunit' version '1.5'
     id 'net.researchgate.release' version '2.3.4'
+    id 'de.undercouch.download' version '3.2.0'
 }
 
 group = 'com.ullink.gradle'
@@ -57,9 +58,22 @@ task generateZip(dependsOn: nunit, type: Zip) {
     archiveName 'ProjectFileParser.zip'
 }
 
+task downloadVsWhere(type: de.undercouch.gradle.tasks.download.Download) {
+    src 'https://github.com/Microsoft/vswhere/releases/download/2.1.4/vswhere.exe'
+    dest "$temporaryDir/vswhere.exe"
+}
+
 jar {
     from(generateZip.outputs.files) {
-        into 'META-INF'
+        into ('META-INF')
+    }
+}
+
+sourceSets {
+    main {
+        resources {
+            srcDirs = [ downloadVsWhere.temporaryDir ]
+        }
     }
 }
 
@@ -87,5 +101,5 @@ plugindev {
     done()
 }
 
-project.tasks.afterReleaseBuild.dependsOn project.tasks.bintrayUpload
-
+processResources.dependsOn downloadVsWhere
+afterReleaseBuild.dependsOn bintrayUpload

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri May 13 11:32:47 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

gradlew

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/groovy/com/ullink/MsbuildResolver.groovy

@@ -1,16 +1,49 @@
 package com.ullink
 
 import static java.lang.Float.parseFloat
+import groovy.io.FileType
+import java.lang.ProcessBuilder
+import java.nio.file.Files
+import org.apache.commons.io.FileUtils
 
 class MsbuildResolver implements IExecutableResolver {
     static final String MSBUILD_TOOLS_PATH = 'MSBuildToolsPath'
     static final String MSBUILD_PREFIX = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\"
     static final String MSBUILD_WOW6432_PREFIX = "SOFTWARE\\Wow6432Node\\Microsoft\\MSBuild\\ToolsVersions\\"
 
-    void setupExecutable(Msbuild msbuild) {
+    // Find msbuild >= 15.0 by vswhere
+    static def findMsbuildByVsWhere(Msbuild msbuild) {
+        File tempDir = Files.createTempDirectory('vswhere').toFile()
+        tempDir.deleteOnExit()
+
+        def vswhereURL = MsbuildResolver.getResource("/vswhere.exe")
+        def vswhereFile = new File(tempDir, 'vwshere.exe')
+        FileUtils.copyURLToFile(vswhereURL, vswhereFile)
+        def vswhere = new ProcessBuilder(vswhereFile.toString())
+        if (msbuild.version) {
+            vswhere.command() << '-version' << msbuild.version
+        } else {
+            vswhere.command() << '-latest'
+        }
+        vswhere.command() << '-products' << '*' << '-requires' << 'Microsoft.Component.MSBuild' << '-property' << 'installationPath'
+
+        def proc = vswhere.start()
+        proc.waitFor()
+        def location = proc.in.text?.trim();
+        if (location) {
+            def msbuildDir = new File(location, 'MSBuild')
+            msbuild.logger.info("Found following MSBuild installation folder: ${msbuildDir}")
+            msbuildDir.eachDirMatch(~/\d+(\.\d+)*/) { dir ->
+                msbuild.msbuildDir = new File(dir, 'Bin')
+                return
+            }
+        }
+    }
+
+    static def findMsbuildFromRegistry(Msbuild msbuild) {
         List<String> availableVersions =
-                getMsBuildVersionsFromRegistry(MSBUILD_WOW6432_PREFIX) +
-                getMsBuildVersionsFromRegistry(MSBUILD_PREFIX)
+            getMsBuildVersionsFromRegistry(MSBUILD_WOW6432_PREFIX) +
+            getMsBuildVersionsFromRegistry(MSBUILD_PREFIX)
         msbuild.logger.debug("Found following MSBuild versions in the registry: ${availableVersions}")
 
         List<String> versionsToCheck
@@ -21,10 +54,21 @@ class MsbuildResolver implements IExecutableResolver {
             versionsToCheck = availableVersions
         }
 
-        if (versionsToCheck.find( { trySetMsbuild(msbuild, it) } ))
+        versionsToCheck.find( { trySetMsbuild(msbuild, it) } )
+    }
+
+    void setupExecutable(Msbuild msbuild) {
+        if (msbuild.msbuildDir == null) {
+            findMsbuildByVsWhere(msbuild)
+        }
+        if (msbuild.msbuildDir == null) {
+            findMsbuildFromRegistry(msbuild)
+        }
+
+        if (msbuild.msbuildDir)
             msbuild.logger.info("Resolved MSBuild to ${msbuild.msbuildDir}")
         else
-            msbuild.logger.warn("Couldn't resolve MSBuild in the system (existing versions: ${availableVersions}).")
+            msbuild.logger.warn("Couldn't resolve MSBuild in the system")
 
         msbuild.executable = 'msbuild.exe'
     }
@@ -42,9 +86,7 @@ class MsbuildResolver implements IExecutableResolver {
         def v = Registry.getValue(Registry.HKEY_LOCAL_MACHINE, key, MSBUILD_TOOLS_PATH)
         if (v != null && new File(v).isDirectory()) {
             msbuild.msbuildDir = v
-            return true
         }
-        false
     }
 }
 

src/main/groovy/com/ullink/XbuildResolver.groovy

@@ -5,15 +5,17 @@ import org.gradle.api.GradleException
 import org.gradle.util.VersionNumber
 
 class XbuildResolver implements IExecutableResolver {
-    
+
     @Override
     ProcessBuilder executeDotNet(File exe) {
         return new ProcessBuilder("mono", exe.toString())
     }
 
     void setupExecutable(Msbuild msbuild) {
         msbuild.executable = 'xbuild.exe'
-        msbuild.msbuildDir = getXBuildDir(msbuild)
+        if (msbuild.msbuildDir == null) {
+            msbuild.msbuildDir = getXBuildDir(msbuild)
+        }
     }
 
     public static String getXBuildDir(Msbuild msbuild) {

src/test/groovy/com/ullink/MsbuildLocateTest.groovy

@@ -0,0 +1,31 @@
+package com.ullink
+
+import org.gradle.api.Project
+import org.gradle.internal.os.OperatingSystem
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.ExpectedException
+
+import static org.junit.Assert.assertNotNull
+
+class MsbuildLocateTest {
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Before
+    public void beforeMethod() {
+        org.junit.Assume.assumeTrue OperatingSystem.current().isWindows()
+    }
+
+    @Test
+    public void testMsBuildCanBeFound() {
+        def resolver = new MsbuildResolver()
+
+        Project p = ProjectBuilder.builder().build()
+        p.apply plugin: MsbuildPlugin
+        resolver.setupExecutable(p.tasks.msbuild)
+        assertNotNull(p.tasks.msbuild.msbuildDir)
+    }
+}