Imported Upstream version 5.10.0.175
Former-commit-id: 1e840d201fb1f6fbd7457792e41c05a22ccd4e4f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
e846c34f82
commit
65c63c2057
@ -1 +1 @@
|
||||
0901a7a1da963229628e2b7b7bbc02f795393465
|
||||
edec24455435e7b458b7556fd3543a3eafae5ce6
|
||||
@ -1 +1 @@
|
||||
4cecb189bb8aa174e63de4efd89dce759af34f99
|
||||
0ecd459785417545d203bdf97d4ea71299a89345
|
||||
@ -34,11 +34,11 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.10.0.172";
|
||||
public const string MonoVersion = "5.10.0.175";
|
||||
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 int MonoCorlibVersion = 1051000002;
|
||||
public const int MonoCorlibVersion = 1051000003;
|
||||
|
||||
#if MOBILE
|
||||
// Versions of .NET Framework for Silverlight 4.0
|
||||
|
||||
@ -9,6 +9,7 @@ ReferenceSources/ThisAssembly.cs
|
||||
ReferenceSources/TypeScope.cs
|
||||
ReferenceSources/Wsdl.cs
|
||||
ReferenceSources/CodeDom.cs
|
||||
ReferenceSources/BinaryCompatibility.cs
|
||||
../referencesource/System.Data.SqlXml/System/Xml/Xsl/ISourceLineInfo.cs
|
||||
../referencesource/System.Data.SqlXml/System/Xml/Xsl/ListBase.cs
|
||||
../referencesource/System.Data.SqlXml/System/Xml/Xsl/Pair.cs
|
||||
@ -138,7 +139,6 @@ ReferenceSources/CodeDom.cs
|
||||
../referencesource/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs
|
||||
../referencesource/System.Xml/System/Xml/Cache/XPathNodeView.cs
|
||||
../referencesource/System.Xml/System/Xml/Cache/XPathNodeViewPropertyDescriptor.cs
|
||||
../referencesource/System.Xml/System/Xml/Core/BinaryCompatibility.cs
|
||||
../referencesource/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs
|
||||
../referencesource/System.Xml/System/Xml/Core/ConformanceLevel.cs
|
||||
../referencesource/System.Xml/System/Xml/Core/DtdProcessing.cs
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Mono {
|
||||
|
||||
@ -79,5 +80,29 @@ namespace Mono {
|
||||
// No longer used
|
||||
return true;
|
||||
}
|
||||
|
||||
#if !MOBILE
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
static extern void DisableMicrosoftTelemetry (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath);
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath);
|
||||
|
||||
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_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))
|
||||
{
|
||||
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value);
|
||||
}
|
||||
} else {
|
||||
throw new PlatformNotSupportedException("Merp support is currently only supported on OSX.");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1 +0,0 @@
|
||||
ed69f5344bf24ad11371839c02cf584071bc5a1f
|
||||
@ -1 +0,0 @@
|
||||
6fc4e4a0161940e6807970124309b8791a0c4ee5
|
||||
@ -1 +0,0 @@
|
||||
826ebb8db593776dab1890974a881fd10b7c606c
|
||||
@ -1 +0,0 @@
|
||||
dad509233a0d0baafcaea8b99276fc5ee22e6d59
|
||||
@ -1 +0,0 @@
|
||||
f12880195e71882b7b5992035fc134edb5ec9d6e
|
||||
@ -1 +0,0 @@
|
||||
79f200c96b97d760f7a77521232a791b116b286a
|
||||
@ -1 +0,0 @@
|
||||
d55e55aa5abba620a8be8747ea0fabe61a4c3c4a
|
||||
@ -0,0 +1 @@
|
||||
1e49fc778db7e517f163d6a87b8ea781f9b94bdf
|
||||
@ -0,0 +1 @@
|
||||
e43cf6129964a591f4f6bf558e389fb2820cfc35
|
||||
@ -0,0 +1 @@
|
||||
fe54dc8fdf0183377c74cff6067597ed3d11206c
|
||||
@ -0,0 +1 @@
|
||||
f2a8f3e4b7ea9aa87b551e8169e6e4a7436c99ed
|
||||
@ -0,0 +1 @@
|
||||
8f5d5c1fdb320e526043f2d73869f47b081ab57a
|
||||
@ -0,0 +1 @@
|
||||
584c985c6275ff870c194df676ea1e9b9b02bbf1
|
||||
@ -0,0 +1 @@
|
||||
ad13ce4d9c79472586e828245b897a30750ea8b2
|
||||
@ -1 +0,0 @@
|
||||
ed69f5344bf24ad11371839c02cf584071bc5a1f
|
||||
@ -1 +0,0 @@
|
||||
6fc4e4a0161940e6807970124309b8791a0c4ee5
|
||||
@ -1 +0,0 @@
|
||||
826ebb8db593776dab1890974a881fd10b7c606c
|
||||
@ -1 +0,0 @@
|
||||
dad509233a0d0baafcaea8b99276fc5ee22e6d59
|
||||
@ -1 +0,0 @@
|
||||
f12880195e71882b7b5992035fc134edb5ec9d6e
|
||||
@ -1 +0,0 @@
|
||||
79f200c96b97d760f7a77521232a791b116b286a
|
||||
@ -1 +0,0 @@
|
||||
d55e55aa5abba620a8be8747ea0fabe61a4c3c4a
|
||||
@ -0,0 +1 @@
|
||||
1e49fc778db7e517f163d6a87b8ea781f9b94bdf
|
||||
@ -0,0 +1 @@
|
||||
e43cf6129964a591f4f6bf558e389fb2820cfc35
|
||||
@ -0,0 +1 @@
|
||||
fe54dc8fdf0183377c74cff6067597ed3d11206c
|
||||
@ -0,0 +1 @@
|
||||
f2a8f3e4b7ea9aa87b551e8169e6e4a7436c99ed
|
||||
@ -0,0 +1 @@
|
||||
8f5d5c1fdb320e526043f2d73869f47b081ab57a
|
||||
@ -0,0 +1 @@
|
||||
584c985c6275ff870c194df676ea1e9b9b02bbf1
|
||||
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