Fix build for VS2019 (not complete yet)

This commit is contained in:
Sebastiaan Janssen
2019-06-06 13:53:42 +02:00
parent aaab14be3e
commit 202f2d2e27
2 changed files with 11 additions and 2 deletions

View File

@@ -135,7 +135,9 @@ function Get-UmbracoBuildEnv
$vsPath = ""
$vsVer = ""
$msBuild = $null
&$vswhere | foreach {
$params = @()
$params += "-prerelease"
&$vswhere @params | foreach {
if ($_.StartsWith("installationPath:")) { $vsPath = $_.SubString("installationPath:".Length).Trim() }
if ($_.StartsWith("installationVersion:")) { $vsVer = $_.SubString("installationVersion:".Length).Trim() }
}
@@ -144,7 +146,10 @@ function Get-UmbracoBuildEnv
$vsVerParts = $vsVer.Split('.')
$vsMajor = [int]::Parse($vsVerParts[0])
$vsMinor = [int]::Parse($vsVerParts[1])
if ($vsMajor -eq 15) {
if ($vsMajor -eq 16) {
$msBuild = "$vsPath\MSBuild\Current\Bin"
}
elseif ($vsMajor -eq 15) {
$msBuild = "$vsPath\MSBuild\$vsMajor.0\Bin"
}
elseif ($vsMajor -eq 14) {

View File

@@ -195,6 +195,10 @@ function Compile-Umbraco
{
$toolsVersion = "15.0"
}
if ($uenv.VisualStudio.Major -eq 16)
{
$toolsVersion = "Current"
}
Write-Host ">> Compile Umbraco"
Write-Host "Logging to $tmp\msbuild.umbraco.log"