Merge pull request #822 from github-for-unity/fixes/encoding-regression

shana · web-flow · commit 0b506a9eb944 · 2018-06-11T16:32:00.000+01:00
Fix regression when reading output in non-ascii locales
diff --git a/src/GitHub.Api/Tasks/ProcessTask.cs b/src/GitHub.Api/Tasks/ProcessTask.cs
@@ -106,7 +106,7 @@ public void Run()
                     gotOutput.Set();
                     if (e.Data != null)
                     {
-                        var line = Encoding.UTF8.GetString(Encoding.Default.GetBytes(e.Data));
+                        var line = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(e.Data));
                         errors.Add(line.TrimEnd('\r', '\n'));
                         Logger.Trace(line);
                     }
@@ -121,7 +121,7 @@ public void Run()
                     gotOutput.Set();
                     if (e.Data != null)
                     {
-                        var line = Encoding.UTF8.GetString(Encoding.Default.GetBytes(e.Data));
+                        var line = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(e.Data));
                         outputProcessor.LineReceived(line.TrimEnd('\r','\n'));
                     }
                     else

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public void Run()`
`106`	`106`	`gotOutput.Set();`
`107`	`107`	`if (e.Data != null)`
`108`	`108`	`{`
`109`		`- var line = Encoding.UTF8.GetString(Encoding.Default.GetBytes(e.Data));`
	`109`	`+ var line = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(e.Data));`
`110`	`110`	`errors.Add(line.TrimEnd('\r', '\n'));`
`111`	`111`	`Logger.Trace(line);`
`112`	`112`	`}`
`@@ -121,7 +121,7 @@ public void Run()`
`121`	`121`	`gotOutput.Set();`
`122`	`122`	`if (e.Data != null)`
`123`	`123`	`{`
`124`		`- var line = Encoding.UTF8.GetString(Encoding.Default.GetBytes(e.Data));`
	`124`	`+ var line = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(e.Data));`
`125`	`125`	`outputProcessor.LineReceived(line.TrimEnd('\r','\n'));`
`126`	`126`	`}`
`127`	`127`	`else`