fix windows build for vs2017/msbuild15 install

fsprojects · Mar 22, 2017 · 381216e · 381216e
1 parent 6bb556c
commit 381216e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,6 @@ misc/literate/output/content/
 *.sln.DotSettings.user
 *.userprefs
 *.bak
-.paket/paket.exe
 release.cmd
 *.orig
 *.aux

diff --git a/.paket/paket.exe b/.paket/paket.exe
diff --git a/build.fsx b/build.fsx
@@ -97,14 +97,29 @@ Target "UpdateFsxVersions" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Build library
 
+//Target "Build" (fun _ ->
+//    { BaseDirectory = __SOURCE_DIRECTORY__
+//      Includes = ["FSharp.Formatting.sln"]
+//      Excludes = [] }
+//    |> MSBuildRelease "" "Build"
+//    |> ignore
+//)
+
+let solutionFile = "FSharp.Formatting.sln"
+
+
+let msbuild14 = ProgramFilesX86</>"MSBuild"</>"14.0"</>"Bin"</>"MSBuild.exe"
+
+if isWindows && fileExists msbuild14 then 
+    setEnvironVar "MSBUILD"  msbuild14
+
 Target "Build" (fun _ ->
-    { BaseDirectory = __SOURCE_DIRECTORY__
-      Includes = ["FSharp.Formatting.sln"]
-      Excludes = [] }
-    |> MSBuildRelease "" "Build"
+    !! solutionFile
+    |> MSBuildRelease "" "Rebuild"
     |> ignore
 )
 
+
 Target "MergeVSPowerTools" (fun _ ->
     () (*
     let binDir = __SOURCE_DIRECTORY__ @@ "bin"