Skip to content

Commit 718789d

Browse files
committed
Updated psake and nuget to latest versions - fixes bitness problem with build script.
1 parent e463331 commit 718789d

File tree

3 files changed

+171
-178
lines changed

3 files changed

+171
-178
lines changed

tools/nuget/NuGet.exe

123 KB
Binary file not shown.

tools/psake/psake.ps1

+34-25
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,42 @@
55
# Must match parameter definitions for psake.psm1/invoke-psake
66
# otherwise named parameter binding fails
77
param(
8-
[Parameter(Position=0,Mandatory=0)]
9-
[string]$buildFile = 'default.ps1',
10-
[Parameter(Position=1,Mandatory=0)]
11-
[string[]]$taskList = @(),
12-
[Parameter(Position=2,Mandatory=0)]
13-
[string]$framework,
14-
[Parameter(Position=3,Mandatory=0)]
15-
[switch]$docs = $false,
16-
[Parameter(Position=4,Mandatory=0)]
17-
[System.Collections.Hashtable]$parameters = @{},
18-
[Parameter(Position=5, Mandatory=0)]
19-
[System.Collections.Hashtable]$properties = @{},
20-
[Parameter(Position=6, Mandatory=0)]
21-
[string]$scriptPath = $(Split-Path -parent $MyInvocation.MyCommand.path),
22-
[Parameter(Position=7, Mandatory=0)]
23-
[switch]$nologo = $false
8+
[Parameter(Position=0,Mandatory=0)]
9+
[string]$buildFile = 'default.ps1',
10+
[Parameter(Position=1,Mandatory=0)]
11+
[string[]]$taskList = @(),
12+
[Parameter(Position=2,Mandatory=0)]
13+
[string]$framework,
14+
[Parameter(Position=3,Mandatory=0)]
15+
[switch]$docs = $false,
16+
[Parameter(Position=4,Mandatory=0)]
17+
[System.Collections.Hashtable]$parameters = @{},
18+
[Parameter(Position=5, Mandatory=0)]
19+
[System.Collections.Hashtable]$properties = @{},
20+
[Parameter(Position=6, Mandatory=0)]
21+
[alias("init")]
22+
[scriptblock]$initialization = {},
23+
[Parameter(Position=7, Mandatory=0)]
24+
[switch]$nologo = $false,
25+
[Parameter(Position=8, Mandatory=0)]
26+
[switch]$help = $false,
27+
[Parameter(Position=9, Mandatory=0)]
28+
[string]$scriptPath = $(Split-Path -parent $MyInvocation.MyCommand.path)
2429
)
2530

26-
remove-module psake -ea 'SilentlyContinue'
31+
# '[p]sake' is the same as 'psake' but $Error is not polluted
32+
remove-module [p]sake
2733
import-module (join-path $scriptPath psake.psm1)
28-
if (-not(test-path $buildFile))
29-
{
34+
if ($help) {
35+
Get-Help Invoke-psake -full
36+
return
37+
}
38+
39+
if (-not(test-path $buildFile)) {
3040
$absoluteBuildFile = (join-path $scriptPath $buildFile)
31-
if (test-path $absoluteBuildFile)
32-
{
33-
$buildFile = $absoluteBuildFile
34-
}
41+
if (test-path $absoluteBuildFile) {
42+
$buildFile = $absoluteBuildFile
43+
}
3544
}
36-
invoke-psake $buildFile $taskList $framework $docs $parameters $properties $nologo
37-
exit $lastexitcode
45+
46+
invoke-psake $buildFile $taskList $framework $docs $parameters $properties $initialization $nologo

0 commit comments

Comments
 (0)