diff --git a/.gitignore b/.gitignore index 87cfc8ad5..57687b5ce 100644 --- 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 new file mode 100644 index 000000000..117ede660 Binary files /dev/null and b/.paket/paket.exe differ diff --git a/build.fsx b/build.fsx index bf5a9fc2e..12b153ea4 100644 --- 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"