Imported Upstream version 5.18.0.237
Former-commit-id: 656d32283cda0da3af4016476796d9184d8cdd84
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
2785a80efd
commit
fbc511bfbe
@ -1266,6 +1266,9 @@
|
||||
/* Define to 1 if you have the `vsyslog' function. */
|
||||
#undef HAVE_VSYSLOG
|
||||
|
||||
/* Define to 1 if you have the `waitpid' function. */
|
||||
#undef HAVE_WAITPID
|
||||
|
||||
/* Define to 1 if you have the <wchar.h> header file. */
|
||||
#undef HAVE_WCHAR_H
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
821406e39bda6b475ab8262523590b3d45bf9d49
|
||||
780e08f1c84044d68b8cf86772043410d3356b47
|
||||
@ -1 +1 @@
|
||||
8932c606c17293b53296a42a8029105cf46d68c1
|
||||
2092fc41e2cc7db82ed0569a412bdf7e09f30285
|
||||
@ -34,11 +34,11 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.18.0.235";
|
||||
public const string MonoVersion = "5.18.0.237";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
public const string MonoCorlibVersion = "F602B559-7639-49B6-97EE-C433CE7A56F2";
|
||||
public const string MonoCorlibVersion = "CA4932AE-2294-4ECD-B863-BF98FDD84F33";
|
||||
|
||||
#if MOBILE
|
||||
// Versions of .NET Framework for Silverlight 4.0
|
||||
|
||||
@ -100,7 +100,7 @@ namespace Mono {
|
||||
static extern void DisableMicrosoftTelemetry ();
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath, IntPtr eventType, IntPtr appPath);
|
||||
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath, IntPtr eventType, IntPtr appPath, IntPtr configDir);
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
static extern void SendMicrosoftTelemetry_internal (IntPtr payload, ulong portable_hash, ulong unportable_hash);
|
||||
@ -147,6 +147,7 @@ namespace Mono {
|
||||
SendMicrosoftTelemetry (payload_str, portable_hash, unportable_hash);
|
||||
}
|
||||
|
||||
// All must be set except for configDir_str
|
||||
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str, string eventType_str, string appPath_str)
|
||||
{
|
||||
if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
|
||||
@ -157,12 +158,13 @@ namespace Mono {
|
||||
using (var eventType_chars = RuntimeMarshal.MarshalString (eventType_str))
|
||||
using (var appPath_chars = RuntimeMarshal.MarshalString (appPath_str))
|
||||
{
|
||||
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, eventType_chars.Value, appPath_chars.Value);
|
||||
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, eventType_chars.Value, appPath_chars.Value, IntPtr.Zero);
|
||||
}
|
||||
} else {
|
||||
throw new PlatformNotSupportedException("Merp support is currently only supported on OSX.");
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
@ -192,14 +194,24 @@ namespace Mono {
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
static extern void RegisterReportingForNativeLib_internal (IntPtr modulePathSuffix, IntPtr moduleName);
|
||||
static extern void EnableCrashReportLog_internal (IntPtr directory);
|
||||
|
||||
static void RegisterReportingForNativeLib (string modulePathSuffix_str, string moduleName_str)
|
||||
static void EnableCrashReportLog (string directory_str)
|
||||
{
|
||||
using (var modulePathSuffix_chars = RuntimeMarshal.MarshalString (modulePathSuffix_str))
|
||||
using (var moduleName_chars = RuntimeMarshal.MarshalString (moduleName_str))
|
||||
using (var directory_chars = RuntimeMarshal.MarshalString (directory_str))
|
||||
{
|
||||
RegisterReportingForNativeLib_internal (modulePathSuffix_chars.Value, moduleName_chars.Value);
|
||||
EnableCrashReportLog_internal (directory_chars.Value);
|
||||
}
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
static extern int CheckCrashReportLog_internal (IntPtr directory, bool clear);
|
||||
|
||||
static int CheckCrashReportLog (string directory_str, bool clear)
|
||||
{
|
||||
using (var directory_chars = RuntimeMarshal.MarshalString (directory_str))
|
||||
{
|
||||
return CheckCrashReportLog_internal (directory_chars.Value, clear);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -507,6 +507,39 @@ namespace MonoTests.System
|
||||
Assert.IsTrue (dump.Length > 0, "#3");
|
||||
}
|
||||
|
||||
void DumpLogSet ()
|
||||
{
|
||||
var monoType = Type.GetType ("Mono.Runtime", false);
|
||||
var convert = monoType.GetMethod("EnableCrashReportLog", BindingFlags.NonPublic | BindingFlags.Static);
|
||||
convert.Invoke(null, new object[] { "./" });
|
||||
}
|
||||
|
||||
void DumpLogUnset ()
|
||||
{
|
||||
var monoType = Type.GetType ("Mono.Runtime", false);
|
||||
var convert = monoType.GetMethod("EnableCrashReportLog", BindingFlags.NonPublic | BindingFlags.Static);
|
||||
convert.Invoke(null, new object[] { null });
|
||||
}
|
||||
|
||||
void DumpLogCheck ()
|
||||
{
|
||||
var monoType = Type.GetType ("Mono.Runtime", false);
|
||||
var convert = monoType.GetMethod("CheckCrashReportLog", BindingFlags.NonPublic | BindingFlags.Static);
|
||||
var result = (int) convert.Invoke(null, new object[] { "./", true });
|
||||
var monoSummaryDone = 8;
|
||||
Assert.AreEqual (monoSummaryDone, result, "#DLC1");
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("NotOnWindows")]
|
||||
public void DumpICallTotalLogged ()
|
||||
{
|
||||
DumpLogSet ();
|
||||
DumpTotal ();
|
||||
DumpLogUnset ();
|
||||
DumpLogCheck ();
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("NotOnWindows")]
|
||||
public void DumpICallSingleOnce ()
|
||||
|
||||
@ -0,0 +1 @@
|
||||
908cd04819fde0fa5b49a8179b597c3a66e22c4e
|
||||
@ -0,0 +1 @@
|
||||
7cfb76b39793a684c9a17a0405973089bcd5f954
|
||||
@ -0,0 +1 @@
|
||||
c95ba4d04ef7f337af46d383ede8538bd5035b34
|
||||
Binary file not shown.
@ -0,0 +1 @@
|
||||
e98e0d83cabf1f38615315bb2b7df51f73adea61
|
||||
@ -0,0 +1 @@
|
||||
0a80a6acb8e70f48b3835bbd0108b9121f32dc6d
|
||||
@ -0,0 +1 @@
|
||||
74d8a027616997fa1fe916cb9eb486f73393f9c7
|
||||
@ -0,0 +1 @@
|
||||
3d2eee5927931b3874594e1a689fd92b3792653e
|
||||
@ -1 +0,0 @@
|
||||
4073b83279f7f038c200ab642e8773f0f3f70331
|
||||
@ -1 +0,0 @@
|
||||
610870bb605ba9c4cf035c3654622bb0b772c494
|
||||
@ -1 +0,0 @@
|
||||
f2c3161722b34a9121c26887f012eb49d7c824ab
|
||||
@ -1 +0,0 @@
|
||||
d74c12343d18871a6f6fc91ce7fce46d1973a7db
|
||||
@ -1 +0,0 @@
|
||||
267b467a27a236097c16a30f88f093b743a170ca
|
||||
@ -1 +0,0 @@
|
||||
4a529741e033dac1470428b99ca9c63f54339594
|
||||
@ -1 +0,0 @@
|
||||
6918437e2e75cfec553ecab463a3e7f3ddafbc25
|
||||
@ -0,0 +1 @@
|
||||
908cd04819fde0fa5b49a8179b597c3a66e22c4e
|
||||
@ -0,0 +1 @@
|
||||
7cfb76b39793a684c9a17a0405973089bcd5f954
|
||||
@ -0,0 +1 @@
|
||||
c95ba4d04ef7f337af46d383ede8538bd5035b34
|
||||
Binary file not shown.
@ -0,0 +1 @@
|
||||
e98e0d83cabf1f38615315bb2b7df51f73adea61
|
||||
@ -0,0 +1 @@
|
||||
0a80a6acb8e70f48b3835bbd0108b9121f32dc6d
|
||||
@ -0,0 +1 @@
|
||||
74d8a027616997fa1fe916cb9eb486f73393f9c7
|
||||
@ -0,0 +1 @@
|
||||
3d2eee5927931b3874594e1a689fd92b3792653e
|
||||
@ -1 +0,0 @@
|
||||
4073b83279f7f038c200ab642e8773f0f3f70331
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user