Imported Upstream version 5.18.0.248

Former-commit-id: 738e3044ff639637d8fe2511a8b60b065577838e
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-01-26 08:23:49 +00:00
parent ce8e504569
commit 2393d5688b
315 changed files with 1737 additions and 313 deletions

View File

@ -271,6 +271,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -1 +1 @@
185fb4f08d318b39e998de65aba693189afa76a0 7f3958be9a6931aca43164ee90cc309157607744

View File

@ -128,6 +128,9 @@
/* Enable checked build */ /* Enable checked build */
#undef ENABLE_CHECKED_BUILD #undef ENABLE_CHECKED_BUILD
/* Enable private types checked build */
#undef ENABLE_CHECKED_BUILD_CRASH_REPORTING
/* Enable GC checked build */ /* Enable GC checked build */
#undef ENABLE_CHECKED_BUILD_GC #undef ENABLE_CHECKED_BUILD_GC

View File

@ -1 +1 @@
71dc8fe57558a446321e50a23e91869dab8dedaa bdbd153c60b89936e581e8ab20760519f6c085d5

View File

@ -1 +1 @@
92303c6a5292257b11be207811e10a1229c86eed 9bc140b656340fd663721273ac122fbbd2d71135

View File

@ -294,6 +294,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -276,6 +276,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -276,6 +276,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -276,6 +276,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -263,6 +263,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -200,6 +200,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -186,6 +186,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -218,6 +218,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@ HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@ HOST_CC = @HOST_CC@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@

View File

@ -34,11 +34,11 @@ static class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "5.18.0.247"; public const string MonoVersion = "5.18.0.248";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";
public const string MonoCorlibVersion = "CA4932AE-2294-4ECD-B863-BF98FDD84F33"; public const string MonoCorlibVersion = "179F7FD7-9CE8-424E-84AF-0DF5B0B8B469";
#if MOBILE #if MOBILE
// Versions of .NET Framework for Silverlight 4.0 // Versions of .NET Framework for Silverlight 4.0

View File

@ -204,16 +204,43 @@ namespace Mono {
} }
} }
enum CrashReportLogLevel : int {
MonoSummaryNone = 0,
MonoSummarySetup,
MonoSummarySuspendHandshake,
MonoSummaryUnmanagedStacks,
MonoSummaryManagedStacks,
MonoSummaryStateWriter,
MonoSummaryStateWriterDone,
MonoSummaryMerpWriter,
MonoSummaryMerpInvoke,
MonoSummaryCleanup,
MonoSummaryDone,
MonoSummaryDoubleFault
}
[MethodImplAttribute (MethodImplOptions.InternalCall)] [MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern int CheckCrashReportLog_internal (IntPtr directory, bool clear); static extern int CheckCrashReportLog_internal (IntPtr directory, bool clear);
static int CheckCrashReportLog (string directory_str, bool clear) static CrashReportLogLevel CheckCrashReportLog (string directory_str, bool clear)
{ {
using (var directory_chars = RuntimeMarshal.MarshalString (directory_str)) using (var directory_chars = RuntimeMarshal.MarshalString (directory_str))
{ {
return CheckCrashReportLog_internal (directory_chars.Value, clear); return (CrashReportLogLevel) CheckCrashReportLog_internal (directory_chars.Value, clear);
} }
} }
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void AnnotateMicrosoftTelemetry_internal (IntPtr key, IntPtr val);
static void AnnotateMicrosoftTelemetry (string key, string val)
{
using (var key_chars = RuntimeMarshal.MarshalString (key))
using (var val_chars = RuntimeMarshal.MarshalString (val))
{
AnnotateMicrosoftTelemetry_internal (key_chars.Value, val_chars.Value);
}
}
} }
} }

View File

@ -525,9 +525,10 @@ namespace MonoTests.System
{ {
var monoType = Type.GetType ("Mono.Runtime", false); var monoType = Type.GetType ("Mono.Runtime", false);
var convert = monoType.GetMethod("CheckCrashReportLog", BindingFlags.NonPublic | BindingFlags.Static); var convert = monoType.GetMethod("CheckCrashReportLog", BindingFlags.NonPublic | BindingFlags.Static);
var result = (int) convert.Invoke(null, new object[] { "./", true }); var result = convert.Invoke(null, new object[] { "./", true });
var monoSummaryDone = 8; var enumType = monoType.Assembly.GetType("Mono.Runtime+CrashReportLogLevel");
Assert.AreEqual (monoSummaryDone, result, "#DLC1"); var doneEnum = Enum.Parse(enumType, "MonoSummaryDone");
Assert.AreEqual (doneEnum, result, "#DLC1");
} }
[Test] [Test]

View File

@ -0,0 +1 @@
df3e538a7e74b417e6a2d96c261a263e60962477

View File

@ -0,0 +1 @@
a7f4686bf1f799a16ff0e064a8d48db9b223a632

View File

@ -0,0 +1 @@
7f719b9432bba617f4b8a0698e6e2daeb4f1fd67

View File

@ -0,0 +1 @@
5961c8f3966970cb28c7ca4abb4ecc49ec6592fe

View File

@ -0,0 +1 @@
ac9273811bef3519a99fe6da2b133007b607c63d

View File

@ -0,0 +1 @@
eb430d169c6ed98b1438c649c7bf612aa05ef529

View File

@ -0,0 +1 @@
2489f48c0fc55b23751bad0783923d5df43a53a2

View File

@ -1 +0,0 @@
9d489f07f35dfde38b445d94bd71ecbba18bf6a2

View File

@ -1 +0,0 @@
36b24674059a18ee66e0623e3ec5658128fae6a2

View File

@ -1 +0,0 @@
cddf838ab0cdf2f92e6ce71e1c79cc562599b507

View File

@ -1 +0,0 @@
2d632fa83d6deafa4972e40f65bf8003ef4f91ee

View File

@ -1 +0,0 @@
19b165b38095730cf5a17284cc4417a346656153

View File

@ -1 +0,0 @@
d0e4f370ae84a457d43f3c02b005c00965fad9f2

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