Merge branch 'upstream'

Former-commit-id: 1666728bf4b6bfbe07c181c7ca38867183c5eca8
2018-05-11 08:49:50 +00:00 · 2018-05-11 08:49:50 +00:00 · 35232dda62
commit 35232dda62
parent edbe3729d6 6ee8b1dcbb
40 changed files with 38 additions and 38 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-f82402782c183a9b3d0d7ff8dcf09665fe659437
+bad7f5194ee248b1996a79e4d3c06f0d93073535
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-62d58e5ad09d9ee78241060e8c8fd498d658b690
+a2bfb06bdd6b174954323519b35119f067fab088
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "5.14.0.78";
+	public const string MonoVersion = "5.14.0.81";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@ -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);
 			}
--- a/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-5bbdb28d177b6c7c5296146f8f6657911a17d9ff
+6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-9084a538593186fa0b78b53c3f3c400a0b154888
+e74715fee1c1237cded6c578d6e96811514e10c3
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4f982dd758484e7d9dedc80704686176254546fb
+2218f66703fe03ed897ab3a05be5f123230e8476
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-a84f3a5098c1badfd3c220a431fd598cb265fa66
+cee3d766b3432842682b9abf35f15abaca42bb0e
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-d9b67c8fe7d84716fdec7ad28c391b4622a68ee0
+c4fbdb7f2811f0459626d5d5e26e4980060a5db9
--- a/mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id
@ -1 +1 @@
-d256823b3e8007e1e37e92b2d0d8abb3a7ecc96c
+6c3985cf067e80c8f89524faba458cf7595582e1
--- a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-d933cd10fd0abc9546eb2002618bc2ad19f3e9cb
+0d5f79705325be831a61476b8bf583be14422134
--- a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-86cf695ef4ffb54b278a3115a93794a53a33607e
+8145e0b3651e4a04733818078ac7afc4b147efac
--- a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-5bbdb28d177b6c7c5296146f8f6657911a17d9ff
+6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
--- a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-9084a538593186fa0b78b53c3f3c400a0b154888
+e74715fee1c1237cded6c578d6e96811514e10c3
--- a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4f982dd758484e7d9dedc80704686176254546fb
+2218f66703fe03ed897ab3a05be5f123230e8476
--- a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-a84f3a5098c1badfd3c220a431fd598cb265fa66
+cee3d766b3432842682b9abf35f15abaca42bb0e
--- a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-d9b67c8fe7d84716fdec7ad28c391b4622a68ee0
+c4fbdb7f2811f0459626d5d5e26e4980060a5db9
--- a/mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id
@ -1 +1 @@
-d256823b3e8007e1e37e92b2d0d8abb3a7ecc96c
+6c3985cf067e80c8f89524faba458cf7595582e1
--- a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-d933cd10fd0abc9546eb2002618bc2ad19f3e9cb
+0d5f79705325be831a61476b8bf583be14422134
--- a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-86cf695ef4ffb54b278a3115a93794a53a33607e
+8145e0b3651e4a04733818078ac7afc4b147efac
--- a/Show More
+++ b/Show More