Evolve build.ps1 to work with Nuget 3 or greater

giggio · giggio · commit 174493e21c58 · 2017-03-12T20:09:29.000-03:00
diff --git a/build.ps1 b/build.ps1
@@ -1,29 +1,30 @@
 $ErrorActionPreference = "Stop"
 # functions:
 
-function IsNugetVersion3($theNugetExe) {
+function IsNugetVersion3OrAbove($theNugetExe) {
     try {
         $nugetText = . $theNugetExe | Out-String
     } catch {
         return false
     }
-    [regex]$regex = '^NuGet Version: (.*)\n'
+    [regex]$regex = '^NuGet Version: (\d)\.(\d).*\n'
     $match = $regex.Match($nugetText)
     $version = $match.Groups[1].Value
-    return $version.StartsWith(3)
+    Write-Host "Nuget major version is $version"
+    return [System.Convert]::ToInt32($version) -ge 3
 }
 
 function Get-Nuget {
     if (gcm nuget -ErrorAction SilentlyContinue) {
-        if (IsNugetVersion3 'nuget') {
-            $nugetExe = 'nuget'
+        if (IsNugetVersion3OrAbove 'nuget') {
+            $script:nugetExe = 'nuget'
         } else {
             Download-Nuget
-            $nugetExe = $localNuget
+            $script:nugetExe = $localNuget
         }
     } else {
         Download-Nuget
-        $nugetExe = $localNuget
+        $script:nugetExe = $localNuget
     }
 }
 
@@ -33,10 +34,10 @@ function Download-Nuget {
         md "$env:TEMP\codecracker\" | Out-Null
     }
     if (Test-Path $localNuget) {
-        if (IsNugetVersion3($localNuget)) { return }
+        if (IsNugetVersion3OrAbove($localNuget)) { return }
     }
     if (Test-Path $tempNuget) {
-        if (IsNugetVersion3($tempNuget)) {
+        if (IsNugetVersion3OrAbove($tempNuget)) {
             cp $tempNuget $localNuget
             return
         }
@@ -48,7 +49,8 @@ function Download-Nuget {
 function Import-Psake {
     $psakeModule = "$PSScriptRoot\packages\psake.4.5.0\tools\psake.psm1"
     if ((Test-Path $psakeModule) -ne $true) {
-        . "$nugetExe" restore $PSScriptRoot\.nuget\packages.config -SolutionDirectory $PSScriptRoot
+        Write-Host "Restoring $PSScriptRoot\.nuget with $script:nugetExe"
+        . "$script:nugetExe" restore $PSScriptRoot\.nuget\packages.config -SolutionDirectory $PSScriptRoot
     }
     Import-Module $psakeModule -force
 }
