mirror of
https://github.com/PowerShell/PowerShell.git
synced 2024-11-24 02:04:07 +08:00
Build vxcproj file instead of sln file on fullCLR
Building sln file generated by cmake causes troubles on my dev machine. It contains additional checks for tools version that cannot be satisfied.
This commit is contained in:
parent
9c0ee7072e
commit
50984f7036
@ -1,11 +1,12 @@
|
||||
param(
|
||||
# "" is for default generator on the platform
|
||||
[ValidateSet(
|
||||
"",
|
||||
"Visual Studio 12 2013",
|
||||
"Visual Studio 12 2013 Win64",
|
||||
"Visual Studio 14 2015",
|
||||
"Visual Studio 14 2015 Win64")]
|
||||
[string]$cmakeGenerator = "",
|
||||
[string]$cmakeGenerator = "Visual Studio 12 2013",
|
||||
|
||||
[ValidateSet(
|
||||
"Debug",
|
||||
@ -51,7 +52,6 @@ try
|
||||
cd src\Microsoft.PowerShell.ConsoleHost
|
||||
dotnet publish --framework dnx451 --output $BINFULL
|
||||
|
||||
# build native host
|
||||
mkdir $build -ErrorAction SilentlyContinue
|
||||
cd $build
|
||||
|
||||
@ -63,7 +63,8 @@ try
|
||||
{
|
||||
cmake ..\src\powershell-native
|
||||
}
|
||||
msbuild powershell.sln /p:Configuration=$msbuildConfiguration
|
||||
|
||||
msbuild powershell.vcxproj /p:Configuration=$msbuildConfiguration
|
||||
|
||||
cp -rec $msbuildConfiguration\* $BINFULL
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user