mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.6.0.128

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/build/common/Consts.cs
View File

@ -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";

7
mcs/class/corlib/Mono/Runtime.cs
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.");

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
29f46e3c65d16cd005144dd10490b629fdf54a8d

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
b1651189da4a2e71f6630b96be96aa8b2ae910ba

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
7811db9dc3fb55dc794b1a70fa5bd651b6e16867

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
136bd79f0b2476cf15155edd47aea423d4264954

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
00f314534638e9d73f40994aaabb18d765c2c265

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
6ba5c5ccac86b5776a693263f7f52a911a311dc8

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id
View File

@ -1 +0,0 @@
844cbe62fee56b09c1f2f11cae8e716261c7c4e6

1
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
7a7b3ba80ba3990d1f2d45adbd1e983a2a4278f0

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.Collections.Concurrent.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.Collections.Concurrent.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.Collections.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.Collections.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.Diagnostics.Debug.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.Diagnostics.Debug.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.Diagnostics.FileVersionInfo.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.Diagnostics.FileVersionInfo.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.Diagnostics.Tools.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.Diagnostics.Tools.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.Dynamic.Runtime.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.Dynamic.Runtime.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.Globalization.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.Globalization.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.IO.FileSystem.Primitives.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.IO.FileSystem.Primitives.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.IO.FileSystem.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.IO.FileSystem.dll
View File

0
mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Facades/System.IO.dll → mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Facades/System.IO.dll
View File

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