Improve MSBuild search

Update referenced vswhere to 2.6.7 (current latest release)
MSBuild search is more robust with vswhere-integrated search (no longer fixed to version 15.0)
This commit is contained in:
Kulikova 2019-05-10 23:12:07 -07:00 committed by GitHub
parent 00578497d8
commit d774c73d58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -65,7 +65,7 @@ function Init
Download "https://github.com/kode54/fdk-aac/archive/master.zip" "dependencies\fdk-aac.zip" Download "https://github.com/kode54/fdk-aac/archive/master.zip" "dependencies\fdk-aac.zip"
Download "https://github.com/kode54/qaac/archive/master.zip" "dependencies\qaac.zip" Download "https://github.com/kode54/qaac/archive/master.zip" "dependencies\qaac.zip"
Download "https://www.nuget.org/api/v2/package/wtl/9.1.1" "dependencies\wtl.zip" Download "https://www.nuget.org/api/v2/package/wtl/9.1.1" "dependencies\wtl.zip"
Download "https://github.com/Microsoft/vswhere/releases/download/2.2.11/vswhere.exe" "dependencies\vswhere.exe" Download "https://github.com/Microsoft/vswhere/releases/download/2.6.7/vswhere.exe" "dependencies\vswhere.exe"
Download "https://www.foobar2000.org/SDK" "dependencies\SDK" Download "https://www.foobar2000.org/SDK" "dependencies\SDK"
$key = (Select-String -Path dependencies\SDK -Pattern "\/([a-f0-9]+)\/SDK-2018-01-11\.zip").matches.groups[1] $key = (Select-String -Path dependencies\SDK -Pattern "\/([a-f0-9]+)\/SDK-2018-01-11\.zip").matches.groups[1]
@ -118,10 +118,7 @@ function Build
if(!(Test-Path $vswhere)) { Init } if(!(Test-Path $vswhere)) { Init }
$msbuild = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath $msbuild = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
if ($msbuild) {
$msbuild = Join-Path $msbuild 'MSBuild\15.0\Bin\MSBuild.exe'
}
if(!($msbuild -and $(Test-Path $msbuild))) { if(!($msbuild -and $(Test-Path $msbuild))) {
Write-Error "Unable to find MSBuild. Is Visual Studio installed?" Write-Error "Unable to find MSBuild. Is Visual Studio installed?"