Merge pull request #57 from JamesPoli/master

Issue 56, RE: override property for the msbuildversion.
Itiviti · Dec 4, 2017 · e0261b6 · e0261b6
2 parents a90a8e3 + e03256e
commit e0261b6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/main/groovy/com/ullink/NuGetPack.groovy b/src/main/groovy/com/ullink/NuGetPack.groovy
@@ -1,5 +1,6 @@
 package com.ullink
 
+import com.ullink.util.GradleHelper
 import groovy.util.slurpersupport.GPathResult
 import org.apache.commons.io.FilenameUtils
 import org.gradle.api.plugins.BasePlugin
@@ -21,6 +22,7 @@ class NuGetPack extends BaseNuGet {
  def includeEmptyDirectories = true
  def properties = [:]
  def minClientVersion
+ def msBuildVersion
 
  NuGetPack() {
  super('pack')
@@ -63,7 +65,8 @@ class NuGetPack extends BaseNuGet {
  if (!includeEmptyDirectories) args '-ExcludeEmptyDirectories'
  if (!properties.isEmpty()) args '-Properties', properties.collect({ k, v -> "$k=$v" }).join(';')
  if (minClientVersion) args '-MinClientVersion', minClientVersion
-
+ if (!msBuildVersion) msBuildVersion = GradleHelper.getPropertyFromTask(project, 'version', 'msbuild')
+ if (msBuildVersion) args '-MsBuildVersion', msBuildVersion
  super.exec()
  }
 

diff --git a/src/main/groovy/com/ullink/NuGetRestore.groovy b/src/main/groovy/com/ullink/NuGetRestore.groovy
@@ -1,5 +1,8 @@
 package com.ullink
 
+import com.ullink.util.GradleHelper
+import org.gradle.api.UnknownTaskException
+
 class NuGetRestore extends BaseNuGet {
 
  def solutionFile
@@ -12,6 +15,7 @@ class NuGetRestore extends BaseNuGet {
  def packagesDirectory
  def solutionDirectory
  def disableParallelProcessing = false
+ def msBuildVersion
 
  NuGetRestore() {
  super('restore')
@@ -37,6 +41,8 @@ class NuGetRestore extends BaseNuGet {
  if (packagesDirectory) args '-PackagesDirectory', packagesDirectory
  if (solutionDirectory) args '-SolutionDirectory', solutionDirectory
  if (disableParallelProcessing) args '-DisableParallelProcessing'
+ if (!msBuildVersion) msBuildVersion = GradleHelper.getPropertyFromTask(project, 'version', 'msbuild')
+ if (msBuildVersion) args '-MsBuildVersion', msBuildVersion
 
  project.logger.info "Restoring NuGet packages " +
  (sources ? "from $sources" : '') +

diff --git a/src/main/groovy/com/ullink/util/GradleHelper.groovy b/src/main/groovy/com/ullink/util/GradleHelper.groovy
@@ -0,0 +1,14 @@
+package com.ullink.util
+
+import org.gradle.api.Project
+
+class GradleHelper {
+ def static String getPropertyFromTask(Project project, String property, String task) {
+ def theTask = project.tasks.findByName(task)
+ if (theTask) {
+ return theTask.property(property)
+ } else {
+ return null
+ }
+ }
+}