Imported Upstream version 5.14.0.81

Former-commit-id: 524064923445f6b5343d21d0453dbda860e08517
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-11 08:40:56 +00:00
parent 19234507ba
commit 6ee8b1dcbb
40 changed files with 38 additions and 38 deletions

View File

@ -801,7 +801,7 @@ namespace System.Diagnostics
if (startInfo.RedirectStandardOutput) {
MonoIO.Close (stdout_write, out error);
Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? Console.Out.Encoding;
Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? Console.OutputEncoding;
standardOutput = new StreamReader (new FileStream (stdout_read, FileAccess.Read, true, 8192), stdoutEncoding, true);
}
@ -809,7 +809,7 @@ namespace System.Diagnostics
if (startInfo.RedirectStandardError) {
MonoIO.Close (stderr_write, out error);
Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? Console.Out.Encoding;
Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? Console.OutputEncoding;
standardError = new StreamReader (new FileStream (stderr_read, FileAccess.Read, true, 8192), stderrEncoding, true);
}