From 202f2d2e276a7dd0a8a2dd3fe86ee1b9fdf5626b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 6 Jun 2019 13:53:42 +0200
Subject: [PATCH] Fix build for VS2019 (not complete yet)

---
 build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1 | 9 +++++++--
 build/Modules/Umbraco.Build/Umbraco.Build.psm1      | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1 b/build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
index 2a1e9e6831..4a130a9849 100644
--- a/build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
+++ b/build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
@@ -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) {
diff --git a/build/Modules/Umbraco.Build/Umbraco.Build.psm1 b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
index 6b9cdb28da..bceccdb030 100644
--- a/build/Modules/Umbraco.Build/Umbraco.Build.psm1
+++ b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
@@ -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"