admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't always use msbuild from the framework folder: causes problems with VS C++ 14 Tools

Browse Source
This commit is contained in:
Sergei Vorobev
2016-06-24 15:45:31 -07:00
parent bab296f67c
commit c681acc952
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.psm1
+9 -13
View File
@@ -1110,27 +1110,23 @@ function script:ConvertFrom-Xaml {
function script:Use-MSBuild {
# we should ALWAYS use msbuild from Microsoft.Net\Framework folder\v4.0.30319
# other versions may have differences in their behavior
# (i.e. 14.0.25123.0 has a difference in behavior about generating .cs files from XAML)
$canonicalMsBuildLocation = "${env:SystemRoot}\Microsoft.Net\Framework\v4.0.30319\msbuild"
# TODO: we probably should require a particular version of msbuild, if we are taking this dependency
# msbuild v14 and msbuild v4 behaviors are different for XAML generation
$frameworkMsBuildLocation = "${env:SystemRoot}\Microsoft.Net\Framework\v4.0.30319\msbuild"
$msbuild = get-command msbuild -Type Alias -ErrorAction SilentlyContinue
$msbuild = get-command msbuild -ErrorAction SilentlyContinue
if ($msbuild)
{
if ($msbuild.Definition -eq $canonicalMsBuildLocation)
{
# all good, nothing to do
return
}
# all good, nothing to do
return
}
if (-not (Test-Path $canonicalMsBuildLocation))
if (-not (Test-Path $frameworkMsBuildLocation))
{
throw "msbuild not found in '$canonicalMsBuildLocation'. Install Visual Studio 2015."
throw "msbuild not found in '$frameworkMsBuildLocation'. Install Visual Studio 2015."
}
Set-Alias msbuild $canonicalMsBuildLocation -Scope Script
Set-Alias msbuild $frameworkMsBuildLocation -Scope Script
}