Merge branch 'upstream'

Former-commit-id: d9d0f29b4b70374d37c46a93dbae827f8cde9b12
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-06-22 09:04:32 +00:00
commit e317f7b96e
50 changed files with 51 additions and 43 deletions

View File

@ -1 +1 @@
0f4a07f6e526eed79077b03a055fe8e03dc66abe
cd60dbc711b07a8165a9e2ceb4971485fc99e4b8

View File

@ -1 +1 @@
9239596563ef2d2fe44a6793a4260bf4a9a325da
578c66a0578032c9d0b9458acc537ffacd9ec25f

View File

@ -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.307";
public const string MonoVersion = "6.0.0.309";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -414,6 +414,10 @@ public class Tests : TestsBase, ITest2
unhandled_exception ();
return 0;
}
if (args.Length >0 && args [0] == "unhandled-exception-wrapper") {
unhandled_exception_wrapper ();
return 0;
}
if (args.Length >0 && args [0] == "unhandled-exception-endinvoke") {
unhandled_exception_endinvoke ();
return 0;
@ -1483,6 +1487,10 @@ public class Tests : TestsBase, ITest2
Thread.Sleep (10000);
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void unhandled_exception_wrapper () {
throw new ArgumentException("test");
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void unhandled_exception_endinvoke_2 () {
}

View File

@ -1 +1 @@
b0c0de5c832e47168e591f21dfc9a8b6866a32d2
6ac1934d3bf36a8694c80b93904eb5ddf2895af3

View File

@ -1 +1 @@
58d8351822b1482a368c096bf6dd8d83c06ee4dc
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2

View File

@ -1 +1 @@
cba15db7195f95948083a9e6ef564263de0dba81
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c

View File

@ -1 +1 @@
d3a23a05f96b81b6a44f8f221989f063c0b6a3ca
09510fbcabe070401af8e00a2be12196fb3dc466

View File

@ -1 +1 @@
cff8ae50e3bd0315463b37b005ca2133d9c37859
573517ad47d4e9316b036efe3929d1fb92f16c13

View File

@ -1 +1 @@
2655f1ce98343bb1bc4b9fa6551c05fda81fcea1
20948f52a7247a2c723a1a45d96365024c028f59

View File

@ -1 +1 @@
2693ef5c1e33d711ed9be1758314758d350490c6
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032

View File

@ -1 +1 @@
70f9b65a932f2c174568ae51ddf0576038feaf4d
883e2079791d7a692e256df74168b5bcd0f52dcf

View File

@ -1 +1 @@
58d8351822b1482a368c096bf6dd8d83c06ee4dc
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2

View File

@ -1 +1 @@
cba15db7195f95948083a9e6ef564263de0dba81
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c

View File

@ -1 +1 @@
d3a23a05f96b81b6a44f8f221989f063c0b6a3ca
09510fbcabe070401af8e00a2be12196fb3dc466

View File

@ -1 +1 @@
cff8ae50e3bd0315463b37b005ca2133d9c37859
573517ad47d4e9316b036efe3929d1fb92f16c13

View File

@ -1 +1 @@
2655f1ce98343bb1bc4b9fa6551c05fda81fcea1
20948f52a7247a2c723a1a45d96365024c028f59

View File

@ -1 +1 @@
2693ef5c1e33d711ed9be1758314758d350490c6
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032

Some files were not shown because too many files have changed in this diff Show More