Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msbuild /noconlog #463

Merged
merged 1 commit into from
Jun 9, 2014
Merged

msbuild /noconlog #463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/app/FakeLib/MSBuildHelper.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ type MSBuildParams =
NodeReuse : bool
ToolsVersion : string option
Verbosity : MSBuildVerbosity option
NoConsoleLogger : bool
FileLoggers : MSBuildFileLoggerConfig list option }

/// Defines a default for MSBuild task parameters
Expand All @@ -131,12 +132,13 @@ let mutable MSBuildDefaults =
NodeReuse = true
ToolsVersion = None
Verbosity = None
NoConsoleLogger = false
FileLoggers = None }

/// [omit]
let getAllParameters targets maxcpu nodeReuse tools verbosity fileLoggers properties =
if isUnix then [ targets; tools; verbosity ] @ fileLoggers @ properties
else [ targets; maxcpu; nodeReuse; tools; verbosity ] @ fileLoggers @ properties
let getAllParameters targets maxcpu nodeReuse tools verbosity noconsolelogger fileLoggers properties =
if isUnix then [ targets; tools; verbosity; noconsolelogger ] @ fileLoggers @ properties
else [ targets; maxcpu; nodeReuse; tools; verbosity; noconsolelogger ] @ fileLoggers @ properties

let private serializeArgs args =
args
Expand Down Expand Up @@ -187,6 +189,10 @@ let serializeMSBuildParams (p : MSBuildParams) =
| None -> None
| Some v -> Some("v", verbosityName v)

let noconsolelogger =
if p.NoConsoleLogger then Some("noconlog", "")
else None

let fileLoggers =
let logParams param =
match param with
Expand Down Expand Up @@ -226,7 +232,7 @@ let serializeMSBuildParams (p : MSBuildParams) =
|> List.map (fun p -> sprintf "%s;" (logParams p))
|> String.concat "")))

getAllParameters targets maxcpu nodeReuse tools verbosity fileLoggers properties
getAllParameters targets maxcpu nodeReuse tools verbosity noconsolelogger fileLoggers properties
|> serializeArgs

/// [omit]
Expand Down