Imported Upstream version 6.6.0.128

Former-commit-id: 32674ae439740141dd94f4d9a66d7f0e39f4e0d5
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-10-16 08:55:08 +00:00
parent 9688a86d64
commit 907f629e4f
228 changed files with 61 additions and 58 deletions

View File

@@ -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, IntPtr configDir);
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath, IntPtr appPath, IntPtr configDir);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void SendMicrosoftTelemetry_internal (IntPtr payload, ulong portable_hash, ulong unportable_hash);
@@ -148,18 +148,17 @@ namespace Mono {
}
// 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, string configDir_str)
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str, string unused /* eventType_str */, string appPath_str, string configDir_str)
{
if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
using (var appBundleID_chars = RuntimeMarshal.MarshalString (appBundleID_str))
using (var appSignature_chars = RuntimeMarshal.MarshalString (appSignature_str))
using (var appVersion_chars = RuntimeMarshal.MarshalString (appVersion_str))
using (var merpGUIPath_chars = RuntimeMarshal.MarshalString (merpGUIPath_str))
using (var eventType_chars = RuntimeMarshal.MarshalString (eventType_str))
using (var appPath_chars = RuntimeMarshal.MarshalString (appPath_str))
using (var configDir_chars = RuntimeMarshal.MarshalString (configDir_str))
{
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, eventType_chars.Value, appPath_chars.Value, configDir_chars.Value);
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, appPath_chars.Value, configDir_chars.Value);
}
} else {
throw new PlatformNotSupportedException("Merp support is currently only supported on OSX.");

View File

@@ -1 +0,0 @@
29f46e3c65d16cd005144dd10490b629fdf54a8d

View File

@@ -1 +0,0 @@
b1651189da4a2e71f6630b96be96aa8b2ae910ba

View File

@@ -1 +0,0 @@
7811db9dc3fb55dc794b1a70fa5bd651b6e16867

View File

@@ -1 +0,0 @@
00f314534638e9d73f40994aaabb18d765c2c265

View File

@@ -1 +0,0 @@
6ba5c5ccac86b5776a693263f7f52a911a311dc8

View File

@@ -1 +0,0 @@
844cbe62fee56b09c1f2f11cae8e716261c7c4e6

View File

@@ -1 +0,0 @@
7a7b3ba80ba3990d1f2d45adbd1e983a2a4278f0

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