Imported Upstream version 6.6.0.128
Former-commit-id: 32674ae439740141dd94f4d9a66d7f0e39f4e0d5
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
9688a86d64
commit
907f629e4f
@ -1 +1 @@
|
||||
ebd630e156eac7407f36ca75ddf640b8bb10aa38
|
||||
e99de790e27e54ae0cbce0db611ab735386b06d2
|
||||
@ -1 +1 @@
|
||||
266cb9c5161cd3e32ae031112d39c30fb523ba60
|
||||
2126007ad631362e44600237a94b76bc10cb7be7
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
static partial class Consts
|
||||
{
|
||||
public const string MonoCorlibVersion = "657116DD-B24B-4615-8680-6C56BA42F86D";
|
||||
public const string MonoCorlibVersion = "A144A63D-652C-4CCF-A9EE-8E5A091547F1";
|
||||
}
|
||||
|
||||
#if !NETCORE
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.6.0.126";
|
||||
public const string MonoVersion = "6.6.0.128";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -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.");
|
||||
|
||||
@ -1 +0,0 @@
|
||||
29f46e3c65d16cd005144dd10490b629fdf54a8d
|
||||
@ -1 +0,0 @@
|
||||
b1651189da4a2e71f6630b96be96aa8b2ae910ba
|
||||
@ -1 +0,0 @@
|
||||
7811db9dc3fb55dc794b1a70fa5bd651b6e16867
|
||||
@ -1 +0,0 @@
|
||||
136bd79f0b2476cf15155edd47aea423d4264954
|
||||
@ -1 +0,0 @@
|
||||
00f314534638e9d73f40994aaabb18d765c2c265
|
||||
@ -1 +0,0 @@
|
||||
6ba5c5ccac86b5776a693263f7f52a911a311dc8
|
||||
@ -1 +0,0 @@
|
||||
844cbe62fee56b09c1f2f11cae8e716261c7c4e6
|
||||
@ -1 +0,0 @@
|
||||
7a7b3ba80ba3990d1f2d45adbd1e983a2a4278f0
|
||||
@ -0,0 +1 @@
|
||||
89e45ec332a791625f1f00a79c83866a1f50581f
|
||||
@ -0,0 +1 @@
|
||||
f3666c75cf299935ce7d98afad77e3fd806a5947
|
||||
@ -0,0 +1 @@
|
||||
6afe3d0aaf1b20c05b5970c395988505e6d81484
|
||||
@ -0,0 +1 @@
|
||||
79c868774947b3efa0ece81712bb568df8b4927c
|
||||
@ -0,0 +1 @@
|
||||
74f03df4b3bc6d6f248f883fc145547b03970ad9
|
||||
@ -0,0 +1 @@
|
||||
bf559e19a4204224fdaa8166a68a938e4e567afb
|
||||
@ -0,0 +1 @@
|
||||
9cd9d03def90a4614eda02f0c3ca4848fea4554c
|
||||
@ -0,0 +1 @@
|
||||
0a008b2c7a75809e566ef96fa411184427d72072
|
||||
@ -1 +0,0 @@
|
||||
29f46e3c65d16cd005144dd10490b629fdf54a8d
|
||||
@ -1 +0,0 @@
|
||||
b1651189da4a2e71f6630b96be96aa8b2ae910ba
|
||||
@ -1 +0,0 @@
|
||||
7811db9dc3fb55dc794b1a70fa5bd651b6e16867
|
||||
@ -1 +0,0 @@
|
||||
136bd79f0b2476cf15155edd47aea423d4264954
|
||||
@ -1 +0,0 @@
|
||||
00f314534638e9d73f40994aaabb18d765c2c265
|
||||
@ -1 +0,0 @@
|
||||
6ba5c5ccac86b5776a693263f7f52a911a311dc8
|
||||
@ -1 +0,0 @@
|
||||
4486a33397ac5279eed56f28502f54ce4b7441b0
|
||||
@ -1 +0,0 @@
|
||||
7a7b3ba80ba3990d1f2d45adbd1e983a2a4278f0
|
||||
@ -0,0 +1 @@
|
||||
89e45ec332a791625f1f00a79c83866a1f50581f
|
||||
@ -0,0 +1 @@
|
||||
f3666c75cf299935ce7d98afad77e3fd806a5947
|
||||
@ -0,0 +1 @@
|
||||
6afe3d0aaf1b20c05b5970c395988505e6d81484
|
||||
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