Skip to content

Commit 6ed52ea

Browse files
committed
Updating powershell scripts for VS2015 RC.
1 parent ed2df91 commit 6ed52ea

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

setup_ps_env_VS2013.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function VsVars32()
1313
Get-Batchfile $BatchFile
1414
}
1515

16-
"Initializing Casablanca Powershell VS2013 Environment"
16+
"Initializing C++ REST SDK Powershell VS2013 Environment"
1717

1818
# get VS tools
1919
VsVars32

setup_ps_env_VS2015.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,18 @@ function VsVars32()
1313
Get-Batchfile $BatchFile
1414
}
1515

16-
"Initializing Casablanca Powershell VS2015 Environment"
16+
"Initializing C++ REST SDK Powershell VS2015 Environment"
1717

1818
# Add MSBuild to the path.
19-
$msbuildLocation = (Get-ChildItem env:ProgramFiles).Value
19+
if (Test-Path "Env:ProgramFiles(x86)")
20+
{
21+
$msbuildLocation = (Get-ChildItem "Env:ProgramFiles(x86)").Value
22+
}
23+
else
24+
{
25+
$msbuildLocation = (Get-ChildItem "Env:ProgramFiles").Value
26+
}
27+
2028
$msbuildLocation = [System.IO.Path]::Combine($msbuildLocation, "MSBuild", "14.0", "Bin")
2129
$Env:Path += ";" + $msbuildLocation
2230

0 commit comments

Comments
 (0)