Merge branch 'upstream'

Former-commit-id: edb2254e671e3076c2da14d922ac4c5672802fb1
2019-05-10 09:32:28 +00:00 · 2019-05-10 09:32:28 +00:00 · b9ca88600a
commit b9ca88600a
parent f70e268f9a f18ba2cf19
49 changed files with 56 additions and 46 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-68e2a845bb27480070695a60f4cdcb72a154a353
+5c2286d69e2b1592a3bb7109af675eda2ab00fec
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-8518cfdd7136281b77dc008b86eb265159face89
+c1d028a3fafdc23199df14719085e90004fa9dbb
--- a/external/helix-binaries/xunit-reporter.py
+++ b/external/helix-binaries/xunit-reporter.py
@ -2,7 +2,6 @@

 import re
 import os
-import urlparse
 import helix.azure_storage
 import helix.event
 import helix.settings
@ -72,7 +71,7 @@ def main():

    log.info("Uploading results from {}".format(results_path))

-    with file(results_path) as result_file:
+    with open(results_path) as result_file:
        test_count = 0
        total_regex = re.compile(r'total="(\d+)"')
        for line in result_file:
--- 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.225";
+	public const string MonoVersion = "6.0.0.230";
 	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 @@
-f04488d495bbf3bdb7ac1c319baf571a2141c1c2
+8960a37d653039a939985a12347c4314a5a51024
--- 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 @@
-b17aadeb6b78a99aee2b77511d9884efa77888bc
+1bebbd31ba08fbb639edab2308d54067ca5a76e1
--- 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 @@
-c34d118fd276336ad85062d6a6a6b3f6b7444fe7
+e37edc7ec583cebdbb28a44448621959aac3b6d1
--- 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 @@
-15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1
+f98f7a0854157e74434ed6ca591d3f44cc05dfef
--- 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 @@
-c24fee98d9f0992305b9b31d8b1625981c725589
+a40550ce059f422b02b777ed7c4231143e9bc979
--- 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 @@
-42696c6ba9f54675dbbbb5084800d59f8b67c8af
+4d176567891a9d0c459c114f930995c889db0678
--- 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 @@
-77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb
+bfcd14f430932203f7ef13fb87df53c5d05b439e
--- 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 @@
-f04488d495bbf3bdb7ac1c319baf571a2141c1c2
+8960a37d653039a939985a12347c4314a5a51024
--- 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 @@
-b17aadeb6b78a99aee2b77511d9884efa77888bc
+1bebbd31ba08fbb639edab2308d54067ca5a76e1
--- 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 @@
-c34d118fd276336ad85062d6a6a6b3f6b7444fe7
+e37edc7ec583cebdbb28a44448621959aac3b6d1
--- 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 @@
-15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1
+f98f7a0854157e74434ed6ca591d3f44cc05dfef
--- 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 @@
-c24fee98d9f0992305b9b31d8b1625981c725589
+a40550ce059f422b02b777ed7c4231143e9bc979
--- 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 @@
-42696c6ba9f54675dbbbb5084800d59f8b67c8af
+4d176567891a9d0c459c114f930995c889db0678
--- 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 @@
-77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb
+bfcd14f430932203f7ef13fb87df53c5d05b439e
--- a/Show More
+++ b/Show More