Merge branch 'upstream'

Former-commit-id: 3f3d0e5b0cdf25f2623505a36fbeeca405c55fbb
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-10-02 09:36:23 +00:00
commit 34df701c03
230 changed files with 63 additions and 55 deletions

@ -1 +1 @@
60a79a7b89a82334772050675ba7da0cc4f910d1
37cc903befff71e98631598a26de46eacfdc7aca

@ -1 +1 @@
ed50e44c7b9748cf25b5006cd5407e8134531cab
f1495d076977e40b18b728f5367643e7374a3bc0

@ -30,7 +30,7 @@
static partial class Consts
{
public const string MonoCorlibVersion = "2cfaeda3-94a9-44e5-8fcb-51979a3398c9";
public const string MonoCorlibVersion = "657116DD-B24B-4615-8680-6C56BA42F86D";
}
#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.103";
public const string MonoVersion = "6.6.0.104";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

@ -193,6 +193,14 @@ namespace Mono {
return new Tuple<String, ulong, ulong> (payload_str, portable_hash, unportable_hash);
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void RegisterReportingForAllNativeLibs_internal ();
static void RegisterReportingForAllNativeLibs ()
{
RegisterReportingForAllNativeLibs_internal ();
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void RegisterReportingForNativeLib_internal (IntPtr modulePathSuffix, IntPtr moduleName);

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