Merge branch 'upstream'

Former-commit-id: 85ae8dce85b8d1522239110715c85d68c3808950
2019-04-12 08:28:37 +00:00 · 2019-04-12 08:28:37 +00:00 · fd7d773f4b
commit fd7d773f4b
parent cc4e6f0d44 8016999e4d
49 changed files with 118 additions and 47 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-3006e2a2a7a8cfba468d92a89168a31c18027dfa
+0a10d7702cce258aa223df527db3d3fee7a708ea
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-532ef3a00f247ae98241e65ac65352caac56ad72
+319dfcbd34aa76e21d7ed75404a80d09228b79d1
--- a/man/mono-profilers.1
+++ b/man/mono-profilers.1
@ -335,6 +335,9 @@ format.
 .SS Options
 The AOT profiler supports the following options:
 .TP
+\fBduration\fR=\fInum\fR
+Profile only NUM seconds of runtime and then write the data.
+.TP
 \fBhelp\fR
 Print usage instructions.
 .TP
--- 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.20.1.19";
+	public const string MonoVersion = "5.20.1.22";
 	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/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-065959baee82ccf5268cb2244317ee0873c04f09
+ac652b696075764615aa9b93fa948e13b894e529
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-d419de537d8d25d6fca28ef5e8fc7f9abae9e883
+622b80598dbba00a57ad15733364b393c65f9274
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-126bd535bd0a15f9793c78d1ec0bce7cae623943
+0422682b6daa776842f1fd227f8de4123a36c56a
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-b67a9318e1980ab5202015ea42e72f1c647a8588
+72fcf0d9681ee249a97fbf36c0e31a4230972146
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-30300aa58f21e5f39eb6e170df359a5ece11efc1
+391eabaa568cedc999c8831f0ab26c9fb88f7b7b
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-d3f8b26fc3174e107e87346ddf89d1af89e77a81
+fb0bb3afc766acff0e70763c085ec83c69b0a324
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-9ec3b8a1a1d8dc04574811d4ddbd933770bd811b
+5005d60039f324b50717e6bf945083068cc2ba0c
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-065959baee82ccf5268cb2244317ee0873c04f09
+ac652b696075764615aa9b93fa948e13b894e529
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-d419de537d8d25d6fca28ef5e8fc7f9abae9e883
+622b80598dbba00a57ad15733364b393c65f9274
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-126bd535bd0a15f9793c78d1ec0bce7cae623943
+0422682b6daa776842f1fd227f8de4123a36c56a
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-b67a9318e1980ab5202015ea42e72f1c647a8588
+72fcf0d9681ee249a97fbf36c0e31a4230972146
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-30300aa58f21e5f39eb6e170df359a5ece11efc1
+391eabaa568cedc999c8831f0ab26c9fb88f7b7b
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-d3f8b26fc3174e107e87346ddf89d1af89e77a81
+fb0bb3afc766acff0e70763c085ec83c69b0a324
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-9ec3b8a1a1d8dc04574811d4ddbd933770bd811b
+5005d60039f324b50717e6bf945083068cc2ba0c
--- a/Show More
+++ b/Show More