Merge branch 'upstream'
Former-commit-id: 3f3d0e5b0cdf25f2623505a36fbeeca405c55fbb
This commit is contained in:
commit
34df701c03
@ -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);
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
cfcf4af8929d3bc8e81a03420da6247493229048
|
@ -1 +0,0 @@
|
||||
954a63d9fe84b3433462ac32843883482f105840
|
@ -1 +0,0 @@
|
||||
cf1cd597492462c59672f2550d25cb1bf1ae63e5
|
@ -1 +0,0 @@
|
||||
4c4d81e0fb06844904ef14d21102e50067085a36
|
@ -1 +0,0 @@
|
||||
5ffcec35a847d1faa4aba05efb9a9bdd2b70c1b6
|
@ -1 +0,0 @@
|
||||
5e1d3ea9834fefadd99b1af3b286bad69f927ee0
|
@ -1 +0,0 @@
|
||||
d81aeb47f04563668e50b5808ac1275e274a610a
|
@ -1 +0,0 @@
|
||||
e3b29c54067694c176ab5a6ca5072b8258392587
|
@ -0,0 +1 @@
|
||||
addab8be965ae9005b32f1e7d936ae29cb4ddcb9
|
@ -0,0 +1 @@
|
||||
08b71dcc521f5daf8d9ae0ed23c76174fd660f3d
|
@ -0,0 +1 @@
|
||||
8fa48a2b7ac8924c42b928ae493daa20f9f7b5fd
|
@ -0,0 +1 @@
|
||||
a5183e89063f54935ac22fc1f71783b278094ec8
|
@ -0,0 +1 @@
|
||||
6432fb38c53b70767df7c23d754f0389dd1c81c2
|
@ -0,0 +1 @@
|
||||
3fc6751cf2f2ec7fdaf7aef8bdc83bf41b164075
|
@ -0,0 +1 @@
|
||||
844cbe62fee56b09c1f2f11cae8e716261c7c4e6
|
@ -0,0 +1 @@
|
||||
e352912f599cf03664d63b0c48185fa3935cb9ce
|
@ -1 +0,0 @@
|
||||
cfcf4af8929d3bc8e81a03420da6247493229048
|
@ -1 +0,0 @@
|
||||
954a63d9fe84b3433462ac32843883482f105840
|
@ -1 +0,0 @@
|
||||
cf1cd597492462c59672f2550d25cb1bf1ae63e5
|
@ -1 +0,0 @@
|
||||
4c4d81e0fb06844904ef14d21102e50067085a36
|
@ -1 +0,0 @@
|
||||
5ffcec35a847d1faa4aba05efb9a9bdd2b70c1b6
|
@ -1 +0,0 @@
|
||||
5e1d3ea9834fefadd99b1af3b286bad69f927ee0
|
@ -1 +0,0 @@
|
||||
b06e35d757ace14193649bdf4f5b152bc571d141
|
@ -1 +0,0 @@
|
||||
e3b29c54067694c176ab5a6ca5072b8258392587
|
@ -0,0 +1 @@
|
||||
addab8be965ae9005b32f1e7d936ae29cb4ddcb9
|
@ -0,0 +1 @@
|
||||
08b71dcc521f5daf8d9ae0ed23c76174fd660f3d
|
@ -0,0 +1 @@
|
||||
8fa48a2b7ac8924c42b928ae493daa20f9f7b5fd
|
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