Explicitly specify msbuild from the .Net 4.0 framework directory

amaitland · amaitland · commit 72270b155b82 · 2015-01-20T13:16:25.000+10:00
diff --git a/build.ps1 b/build.ps1
@@ -14,6 +14,9 @@ $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition
 
 $CefSln = Join-Path $WorkingDir 'CefSharp3.sln'
 
+$MSBuildExe = join-path -path (Get-ItemProperty "HKLM:\software\Microsoft\MSBuild\ToolsVersions\4.0").MSBuildToolsPath -childpath "msbuild.exe"
+$MSBuildExe = $MSBuildExe -replace "Framework64", "Framework"
+
 function Write-Diagnostic 
 {
     param(
@@ -162,7 +165,7 @@ function Msvs
     )
 
     $StartInfo = New-Object System.Diagnostics.ProcessStartInfo
-    $StartInfo.FileName = "msbuild.exe"
+    $StartInfo.FileName = $MSBuildExe
     $StartInfo.Arguments = $Arguments
 
     $StartInfo.EnvironmentVariables.Clear()

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition`
`14`	`14`
`15`	`15`	`$CefSln = Join-Path $WorkingDir 'CefSharp3.sln'`
`16`	`16`
	`17`	`+$MSBuildExe = join-path -path (Get-ItemProperty "HKLM:\software\Microsoft\MSBuild\ToolsVersions\4.0").MSBuildToolsPath -childpath "msbuild.exe"`
	`18`	`+$MSBuildExe = $MSBuildExe -replace "Framework64", "Framework"`
	`19`	`+`
`17`	`20`	`function Write-Diagnostic`
`18`	`21`	`{`
`19`	`22`	`param(`
`@@ -162,7 +165,7 @@ function Msvs`
`162`	`165`	`)`
`163`	`166`
`164`	`167`	`$StartInfo = New-Object System.Diagnostics.ProcessStartInfo`
`165`		`- $StartInfo.FileName = "msbuild.exe"`
	`168`	`+ $StartInfo.FileName = $MSBuildExe`
`166`	`169`	`$StartInfo.Arguments = $Arguments`
`167`	`170`
`168`	`171`	`$StartInfo.EnvironmentVariables.Clear()`