Merge pull request #2274 from csmager/msbuild-16

Add support for MSBuild 16 / VS 2019
fsprojects · Mar 16, 2019 · c4564fd · c4564fd
2 parents 578151c + 84b3d72
commit c4564fd
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/app/Fake.DotNet.MSBuild/MSBuild.fs b/src/app/Fake.DotNet.MSBuild/MSBuild.fs
@@ -9,7 +9,6 @@ open Fake.Core
 open Fake.IO
 open Fake.IO.FileSystemOperators
 open Fake.IO.Globbing.Operators
-open Fake.Core
 
 /// A type to represent MSBuild project files.
 type MSBuildProject = XDocument
@@ -90,22 +89,23 @@ type MSBuildLoggerConfig = MSBuildDistributedLoggerConfig
 #if !NO_VSWHERE // legacy fakelib
 module private MSBuildExeFromVsWhere =
     open BlackFox.VsWhere
-    open System.Text.RegularExpressions
+    open System.Diagnostics
 
     let private getAllVsPath () =
         VsInstances.getWithPackage "Microsoft.Component.MSBuild" false
         |> List.map (fun vs -> vs.InstallationPath)
 
-    let private re = lazy(Regex(@"^\d+\.\d+$", RegexOptions.Compiled))
-
     let private getAllMsBuildPaths vsPath =
-        let versionsDir = Path.Combine(vsPath, "MSBuild")
-        if Directory.Exists(versionsDir) then
-            Directory.EnumerateDirectories(versionsDir)
-            |> Seq.map (fun d -> Path.GetFileName(d), d)
-            |> Seq.filter (fun (v, _) -> re.Value.IsMatch v)
-            |> Seq.map (fun (v, d) -> v, Path.Combine(d, "Bin"))
-            |> Seq.filter (fun (_, f) -> Directory.Exists(f))
+        let msBuildDir = Path.Combine(vsPath, "MSBuild")
+        if Directory.Exists(msBuildDir) then
+            Directory.EnumerateDirectories(msBuildDir)
+            |> Seq.map (fun dir -> Path.Combine(dir, "Bin", "MSBuild.exe"))
+            |> Seq.choose(fun exe ->
+               if File.Exists(exe) then
+                   let v = FileVersionInfo.GetVersionInfo(exe)
+                   Some (sprintf "%d.0" v.FileMajorPart, Path.GetDirectoryName(exe))
+               else
+                   None)
             |> List.ofSeq
         else
             []
@@ -245,6 +245,8 @@ module private MSBuildExe =
         Trace.traceFAKE "If you encounter msbuild errors make sure you have copied the required SDKs, see https://github.com/Microsoft/msbuild/issues/1697"
     elif foundExe.Contains @"\2017\" then
         Trace.logVerbosefn "Using msbuild of VS2017 (%s), if you encounter build errors make sure you have installed the necessary workflows!" foundExe
+    elif foundExe.Contains @"\2019\" then
+        Trace.logVerbosefn "Using msbuild of VS2019 (%s), if you encounter build errors make sure you have installed the necessary workflows!" foundExe
     foundExe
 
 /// A type for MSBuild task parameters
@@ -984,4 +986,4 @@ module MSBuild =
 module internal MSBuildParamExtensions =
   type MSBuildParams with
     member internal x.CliArguments = MSBuild.asCliArguments x
-    member internal oldObj.WithCliArguments (x:MSBuild.CliArguments) = MSBuild.withCliArguments oldObj x
+    member internal oldObj.WithCliArguments (x:MSBuild.CliArguments) = MSBuild.withCliArguments oldObj x