Updated psake and nuget to latest versions - fixes bitness problem wi…

…th build script.
MindTouch · Jan 17, 2013 · 718789d · 718789d
1 parent e463331
commit 718789d
Show file tree

Hide file tree

Showing 3 changed files with 171 additions and 178 deletions.
diff --git a/tools/nuget/NuGet.exe b/tools/nuget/NuGet.exe
diff --git a/tools/psake/psake.ps1 b/tools/psake/psake.ps1
@@ -5,33 +5,42 @@
 # Must match parameter definitions for psake.psm1/invoke-psake 
 # otherwise named parameter binding fails
 param(
-  [Parameter(Position=0,Mandatory=0)]
-  [string]$buildFile = 'default.ps1',
-  [Parameter(Position=1,Mandatory=0)]
-  [string[]]$taskList = @(),
-  [Parameter(Position=2,Mandatory=0)]
-  [string]$framework,
-  [Parameter(Position=3,Mandatory=0)]
-  [switch]$docs = $false,
-  [Parameter(Position=4,Mandatory=0)]
-  [System.Collections.Hashtable]$parameters = @{},
-  [Parameter(Position=5, Mandatory=0)]
-  [System.Collections.Hashtable]$properties = @{},
-  [Parameter(Position=6, Mandatory=0)]
-  [string]$scriptPath = $(Split-Path -parent $MyInvocation.MyCommand.path),
-  [Parameter(Position=7, Mandatory=0)]
-  [switch]$nologo = $false
+    [Parameter(Position=0,Mandatory=0)]
+    [string]$buildFile = 'default.ps1',
+    [Parameter(Position=1,Mandatory=0)]
+    [string[]]$taskList = @(),
+    [Parameter(Position=2,Mandatory=0)]
+    [string]$framework,
+    [Parameter(Position=3,Mandatory=0)]
+    [switch]$docs = $false,
+    [Parameter(Position=4,Mandatory=0)]
+    [System.Collections.Hashtable]$parameters = @{},
+    [Parameter(Position=5, Mandatory=0)]
+    [System.Collections.Hashtable]$properties = @{},
+    [Parameter(Position=6, Mandatory=0)]
+    [alias("init")]
+    [scriptblock]$initialization = {},
+    [Parameter(Position=7, Mandatory=0)]
+    [switch]$nologo = $false,
+    [Parameter(Position=8, Mandatory=0)]
+    [switch]$help = $false,
+    [Parameter(Position=9, Mandatory=0)]
+    [string]$scriptPath = $(Split-Path -parent $MyInvocation.MyCommand.path)
 )
 
-remove-module psake -ea 'SilentlyContinue'
+# '[p]sake' is the same as 'psake' but $Error is not polluted
+remove-module [p]sake
 import-module (join-path $scriptPath psake.psm1)
-if (-not(test-path $buildFile))
-{
+if ($help) {
+  Get-Help Invoke-psake -full
+  return
+}
+
+if (-not(test-path $buildFile)) {
     $absoluteBuildFile = (join-path $scriptPath $buildFile)
-	if (test-path $absoluteBuildFile)
-	{
-		$buildFile = $absoluteBuildFile
-	}
+    if (test-path $absoluteBuildFile) {
+        $buildFile = $absoluteBuildFile
+    }
 } 
-invoke-psake $buildFile $taskList $framework $docs $parameters $properties $nologo
-exit $lastexitcode
+
+invoke-psake $buildFile $taskList $framework $docs $parameters $properties $initialization $nologo