Imported Upstream version 5.18.0.234

Former-commit-id: 8071ec1a8c5eaa9be24b41745add19297608001f
2019-01-08 08:22:36 +00:00
parent f32dbaf0b2
commit 212f6bafcb
28494 changed files with 359 additions and 3867025 deletions
--- 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.18.0.225";
+	public const string MonoVersion = "5.18.0.234";
 	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/corlib/Test/System.IO/DriveInfoTest.cs
+++ b/mcs/class/corlib/Test/System.IO/DriveInfoTest.cs
@@ -86,7 +86,6 @@ namespace MonoTests.System.IO
 			}

 			if (d.DriveType == DriveType.Fixed) { // just consider fixed drives for now
-				Assert.True (d.IsReady);
 				AssertHelper.GreaterOrEqual (d.AvailableFreeSpace, 0);
 				AssertHelper.GreaterOrEqual (d.TotalFreeSpace, 0);
 				AssertHelper.GreaterOrEqual (d.TotalSize, 0);
--- a/mcs/class/corlib/Test/System/DateTimeTest.cs
+++ b/mcs/class/corlib/Test/System/DateTimeTest.cs
@@ -2667,5 +2667,18 @@ namespace MonoTests.System
 			Assert.AreEqual (1, res.Day, "#12");
 			Assert.AreEqual (DateTimeKind.Utc, res.Kind, "#13");
 		}
+
+		[Test] // https://github.com/mono/mono/issues/11317
+		public void DateTimeKoCulture ()
+		{
+			foreach (var culture in new [] { new CultureInfo ("ko"), new CultureInfo ("ko-KR") })
+			{
+				var dateTimeAm = new DateTime (2018, 1, 1, 11, 0, 0);
+				var dateTimePm = new DateTime (2018, 1, 1, 13, 0, 0);
+
+				Assert.AreEqual ("오전 11:00:00", dateTimeAm.ToString ("T", culture.DateTimeFormat));
+				Assert.AreEqual ("오후 1:00:00", dateTimePm.ToString ("T", culture.DateTimeFormat));
+			}
+		}
 	}
 }
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-997eac011b834fdbf282f0f88c07806343a3da2e
+73216614b63455b8959385eab8f19b27f142dee8
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-0c1583e1ab1cc16695c636d966d3a2b1b4802c28
+dc2ad9e429a07d03a9ef5ef7247c7ea7aa4c01a0
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-46ec2a365069b8e0486f805ccbc9170a73858939
+af5616e10547d1218a89bce0a5b9fbfa10ef2fc5
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-f7c51e6d7cfce06feee0e100fad0a3a0ce29a9cc
+a984e5eca05c5ac8f59ebf753d70f49fc98f698c
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-184855a0007e5fe4a79f2c6f463c93bb2a738899
+b1811ca5f190b17ecaa4a2fe92524a63c3aeca35
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-467fe54561c73fd41581fe2b71de03d442b0b6f6
+1e323831768417819f63539aacf0e47608fffc08
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-7874cb3533bda6bfd7612482363b8bc433209a15
+00f8e64f276112f0ca6203b87234f6eb49f495e6
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-997eac011b834fdbf282f0f88c07806343a3da2e
+73216614b63455b8959385eab8f19b27f142dee8
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-0c1583e1ab1cc16695c636d966d3a2b1b4802c28
+dc2ad9e429a07d03a9ef5ef7247c7ea7aa4c01a0
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-46ec2a365069b8e0486f805ccbc9170a73858939
+af5616e10547d1218a89bce0a5b9fbfa10ef2fc5
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-f7c51e6d7cfce06feee0e100fad0a3a0ce29a9cc
+a984e5eca05c5ac8f59ebf753d70f49fc98f698c
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-184855a0007e5fe4a79f2c6f463c93bb2a738899
+b1811ca5f190b17ecaa4a2fe92524a63c3aeca35
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-467fe54561c73fd41581fe2b71de03d442b0b6f6
+1e323831768417819f63539aacf0e47608fffc08
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-7874cb3533bda6bfd7612482363b8bc433209a15
+00f8e64f276112f0ca6203b87234f6eb49f495e6
--- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-997eac011b834fdbf282f0f88c07806343a3da2e
+73216614b63455b8959385eab8f19b27f142dee8
--- a/Show More
+++ b/Show More