Merge branch 'upstream'

Former-commit-id: 5b78b007fccc0d014f29da02324434b3c9b2b645
2019-04-26 09:04:12 +00:00
parent 8a4f257fcd 35f990fbe2
commit aa29d5403f
48 changed files with 42 additions and 42 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@@ -1 +1 @@
-88ae40fc58a5310e60c827d644a6ae69ac155d4e
+47a71503ad4b11956a23560ed811f6bb076b62ca
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@@ -1 +1 @@
-0346879ad8ae4821c830eca067aaa7e6b3c03ea9
+dcc2e4a5df31f6452354a2e366e400f4b9f092d1
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
-	public const string MonoVersion = "6.0.0.197";
+	public const string MonoVersion = "6.0.0.198";
 	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/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-6ea3ae9edc197662299ca0d3075e685019a7b8dd
+aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0
--- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-f1a222b408068895f22724347ada81b5003d862f
+bea941d874dd4784a679cc458ce856ccf9e0deda
--- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6
+7d89df00999623f2e9930629925a7fc42015b045
--- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-7c33198f69feeb6579e3f58225e1f0e8ac7124ea
+148e032f3c68a850e387040ad23de7b26b9ed71f
--- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-573311b27754edd7471b26643bd8eeffa55b5b89
+9f6b5684d29e65a42e837c8a80aa8e621919ad44
--- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-e73142283b03345f330630803b4c58749bad9117
+388ea3de18abe0e34263f802d378229d8ce8b88b
--- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-61c024d204a54a55f550964baa702d5517a1a4c0
+ea56610502a494d395b9db809fe702dd63e76dcb
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-6ea3ae9edc197662299ca0d3075e685019a7b8dd
+aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-f1a222b408068895f22724347ada81b5003d862f
+bea941d874dd4784a679cc458ce856ccf9e0deda
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6
+7d89df00999623f2e9930629925a7fc42015b045
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-7c33198f69feeb6579e3f58225e1f0e8ac7124ea
+148e032f3c68a850e387040ad23de7b26b9ed71f
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-573311b27754edd7471b26643bd8eeffa55b5b89
+9f6b5684d29e65a42e837c8a80aa8e621919ad44
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-e73142283b03345f330630803b4c58749bad9117
+388ea3de18abe0e34263f802d378229d8ce8b88b
--- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-61c024d204a54a55f550964baa702d5517a1a4c0
+ea56610502a494d395b9db809fe702dd63e76dcb
--- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-6ea3ae9edc197662299ca0d3075e685019a7b8dd
+aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0
--- a/Show More
+++ b/Show More
		`@@ -1 +1 @@`
			`88ae40fc58a5310e60c827d644a6ae69ac155d4e`				`47a71503ad4b11956a23560ed811f6bb076b62ca`
		`@@ -1 +1 @@`
			`0346879ad8ae4821c830eca067aaa7e6b3c03ea9`				`dcc2e4a5df31f6452354a2e366e400f4b9f092d1`
		`@@ -1 +1 @@`
			`6ea3ae9edc197662299ca0d3075e685019a7b8dd`				`aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0`
		`@@ -1 +1 @@`
			`f1a222b408068895f22724347ada81b5003d862f`				`bea941d874dd4784a679cc458ce856ccf9e0deda`
		`@@ -1 +1 @@`
			`e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6`				`7d89df00999623f2e9930629925a7fc42015b045`
		`@@ -1 +1 @@`
			`7c33198f69feeb6579e3f58225e1f0e8ac7124ea`				`148e032f3c68a850e387040ad23de7b26b9ed71f`
		`@@ -1 +1 @@`
			`573311b27754edd7471b26643bd8eeffa55b5b89`				`9f6b5684d29e65a42e837c8a80aa8e621919ad44`
		`@@ -1 +1 @@`
			`e73142283b03345f330630803b4c58749bad9117`				`388ea3de18abe0e34263f802d378229d8ce8b88b`
		`@@ -1 +1 @@`
			`61c024d204a54a55f550964baa702d5517a1a4c0`				`ea56610502a494d395b9db809fe702dd63e76dcb`