Merge pull request #1277 from alexsorokoletov/dev-undo-processhelper

Undo all changes in ProcessHelper made for #1194
fsprojects · Jun 20, 2016 · 1a2f43a · 1a2f43a
2 parents 14854de + b9dfeca
commit 1a2f43a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/app/FakeLib/ProcessHelper.fs b/src/app/FakeLib/ProcessHelper.fs
@@ -19,9 +19,6 @@ let start (proc : Process) =
     if isMono && proc.StartInfo.FileName.ToLowerInvariant().EndsWith(".exe") then
         proc.StartInfo.Arguments <- "--debug \"" + proc.StartInfo.FileName + "\" " + proc.StartInfo.Arguments
         proc.StartInfo.FileName <- monoPath
-    if isMono then
-        proc.StartInfo.StandardOutputEncoding <- Encoding.UTF8
-        proc.StartInfo.StandardErrorEncoding  <- Encoding.UTF8
     proc.Start() |> ignore
     startedProcesses.Add(proc.Id, proc.StartTime) |> ignore
 
@@ -68,6 +65,9 @@ let ExecProcessWithLambdas configProcessStartInfoF (timeOut : TimeSpan) silent e
     if silent then 
         proc.StartInfo.RedirectStandardOutput <- true
         proc.StartInfo.RedirectStandardError <- true
+        if isMono then
+            proc.StartInfo.StandardOutputEncoding <- Encoding.UTF8
+            proc.StartInfo.StandardErrorEncoding  <- Encoding.UTF8
         proc.ErrorDataReceived.Add(fun d -> 
             if d.Data <> null then errorF d.Data)
         proc.OutputDataReceived.Add(fun d ->