Fix build script for x86

CiciLi1 · Nov 7, 2016 · 084d8bd · 084d8bd
1 parent e71e012
commit 084d8bd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/build/common.ps1 b/build/common.ps1
@@ -25,6 +25,12 @@ Set-Alias nuget $NuGetExe
 Set-Alias xunit $XunitConsole
 Set-Alias ilmerge $ILMerge
 
+$Version = New-Object -TypeName System.Version -ArgumentList "4.0"
+
+if ($PSVersionTable.PSVersion.CompareTo($Version) -le 0) {
+    Set-Alias wget Invoke-WebRequest
+}
+
 Function Read-PackageSources {
     param($NuGetConfig)
     $xml = New-Object xml

diff --git a/configure.ps1 b/configure.ps1
@@ -123,7 +123,13 @@ Function New-BuildToolset {
     $ToolsetObject
 }
 
-$MSBuildDefaultRoot = Join-Path ${env:ProgramFiles(x86)} MSBuild
+$ProgramFiles = ${env:ProgramFiles(x86)}
+
+if (-not $ProgramFiles -or -not (Test-Path $ProgramFiles)) {
+    $ProgramFiles = $env:ProgramFiles
+}
+
+$MSBuildDefaultRoot = Join-Path $ProgramFiles MSBuild
 $MSBuildRelativePath = 'bin\msbuild.exe'
 
 Invoke-BuildStep 'Validating VS14 toolset installation' {