Merge branch 'upstream'
Former-commit-id: 169f8e54bbb51b7a3a6c15c095b6bdb0e526c4f7
This commit is contained in:
commit
464602e30f
@ -1 +1 @@
|
||||
aa151640e62ace72c1206365bf089ac239d0bce9
|
||||
42d9284971bf51d3e040505f0c7b9b308011035b
|
@ -1 +1 @@
|
||||
af5f5a8cea2b4af29ce60ef165f2fe81bc7844ee
|
||||
b23890c3e29672d68a1fe844443ac09ff25a2ac9
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.0.189";
|
||||
public const string MonoVersion = "5.20.0.191";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -27,7 +27,7 @@ using System;
|
||||
|
||||
namespace Mono
|
||||
{
|
||||
// Keep in sync with mono/native/mono-native-platform-type.h
|
||||
// Keep in sync with mono/native/mono-native-platform.h
|
||||
[Flags]
|
||||
enum MonoNativePlatformType
|
||||
{
|
@ -30,40 +30,5 @@ namespace MonoTests.Mono
|
||||
var initialized = MonoNativePlatform.IsInitialized ();
|
||||
Assert.IsTrue (initialized, "MonoNativePlatform.IsInitialized()");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestReflectionInitialize ()
|
||||
{
|
||||
var asm = typeof (string).Assembly;
|
||||
var type = asm.GetType ("Mono.MonoNativePlatform");
|
||||
Assert.IsNotNull (type, "MonoNativePlatform");
|
||||
|
||||
var method = type.GetMethod ("Initialize", BindingFlags.Static | BindingFlags.Public);
|
||||
Assert.IsNotNull (method, "MonoNativePlatform.Initialize");
|
||||
|
||||
var method2 = type.GetMethod ("IsInitialized", BindingFlags.Static | BindingFlags.Public);
|
||||
Assert.IsNotNull (method2, "MonoNativePlatform.IsInitialized");
|
||||
|
||||
method.Invoke (null, null);
|
||||
|
||||
var result = (bool)method2.Invoke (null, null);
|
||||
Assert.IsTrue (result, "MonoNativePlatform.IsInitialized()");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestInternalCounter ()
|
||||
{
|
||||
MonoNativePlatform.Initialize ();
|
||||
|
||||
var asm = typeof (string).Assembly;
|
||||
var type = asm.GetType ("Mono.MonoNativePlatform");
|
||||
Assert.IsNotNull (type, "MonoNativePlatform");
|
||||
|
||||
var method = type.GetMethod ("TestInternalCounter", BindingFlags.Static | BindingFlags.NonPublic);
|
||||
Assert.IsNotNull (method, "MonoNativePlatform.TestInternalCounter");
|
||||
var result = method.Invoke (null, null);
|
||||
|
||||
Assert.That (result, Is.GreaterThan (0), "MonoNativePlatform.TestInternalCounter()");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
ac73c8792dbdb43746aeeab1d2fc010ecce1f93e
|
||||
a639af7dbcc005f41b8e91a5fc71eede726506f6
|
@ -2,8 +2,8 @@ Microsoft.Win32/RegistryKeyTest.cs
|
||||
Mono/DataConvertTest.cs
|
||||
../Mono/DataConverter.cs
|
||||
Mono/NativePlatformTest.cs
|
||||
../Mono/MonoNativePlatform.cs
|
||||
../Mono/MonoNativePlatformType.cs
|
||||
Mono/MonoNativePlatform.cs
|
||||
Mono/MonoNativePlatformType.cs
|
||||
System/ActivatorTest.cs
|
||||
System/AppDomainManagerTest.cs
|
||||
System/AppDomainSetupTest.cs
|
||||
|
@ -1,6 +1,6 @@
|
||||
Mono/NativePlatformTest.cs
|
||||
../Mono/MonoNativePlatform.cs
|
||||
../Mono/MonoNativePlatformType.cs
|
||||
Mono/MonoNativePlatform.cs
|
||||
Mono/MonoNativePlatformType.cs
|
||||
Microsoft.Win32/RegistryKeyTest.cs
|
||||
System.Diagnostics.Contracts/ContractAssertTest.cs
|
||||
System.Diagnostics.Contracts/ContractAssumeTest.cs
|
||||
|
@ -1,6 +1,6 @@
|
||||
Mono/NativePlatformTest.cs
|
||||
../Mono/MonoNativePlatform.cs
|
||||
../Mono/MonoNativePlatformType.cs
|
||||
Mono/MonoNativePlatform.cs
|
||||
Mono/MonoNativePlatformType.cs
|
||||
Microsoft.Win32/RegistryKeyTest.cs
|
||||
System.Diagnostics.Contracts/ContractAssertTest.cs
|
||||
System.Diagnostics.Contracts/ContractAssumeTest.cs
|
||||
|
@ -6,8 +6,6 @@ corert/ThreadPoolBoundHandle.platformnotsupported.cs
|
||||
corefx/Interop.GetRandomBytes.Mono.cs
|
||||
corefx/Mono.SafePasswordHandle.Unix.cs
|
||||
../../../external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Unix.cs
|
||||
Mono/MonoNativePlatform.cs
|
||||
Mono/MonoNativePlatformType.cs
|
||||
Microsoft.Win32/IRegistryApi.cs
|
||||
Microsoft.Win32/Registry.cs
|
||||
Microsoft.Win32/RegistryKey.cs
|
||||
|
@ -1 +1 @@
|
||||
1ef520a3da1e27a8c4df12a36456bb539174045c
|
||||
807ee298114e63cab56ac11f23f724b64361593e
|
@ -1 +1 @@
|
||||
70250640969529a28b61e0fddf06c921f78ce771
|
||||
d16a9e3f8d92c7681eb5e092d7df6b513c4d44ab
|
@ -1 +1 @@
|
||||
1c037c92afac92bdaa84f2eadbeaa91c939cc443
|
||||
4be30bfda39da9a2ecdc34470e4665c753304cb5
|
Binary file not shown.
@ -1 +1 @@
|
||||
7352608ab7c991390401dd933182eae47aefa0be
|
||||
8e522da568214f396478998d70a9137bedfc4bd4
|
@ -1 +1 @@
|
||||
2e0c9b4dd427d10536a71f4d61f884bb10a6356a
|
||||
c5f9829e33f69207ea8aac86b8ec8e2b64ff87b9
|
@ -1 +1 @@
|
||||
bcab8a87e25f14bd0b28d7a824597e1b57dbdb46
|
||||
eabd0a96a209dae105d82f03d3f1030ea31917f9
|
@ -1 +1 @@
|
||||
a69a8b09e5faca41b2bee2c1ab2a953ae2e35245
|
||||
cd9d8e97314061d17467eb14aeda7610bc40a15d
|
@ -1 +1 @@
|
||||
1ef520a3da1e27a8c4df12a36456bb539174045c
|
||||
807ee298114e63cab56ac11f23f724b64361593e
|
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