Merge branch 'upstream'

Former-commit-id: 169f8e54bbb51b7a3a6c15c095b6bdb0e526c4f7
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-02-08 08:43:02 +00:00
commit 464602e30f
55 changed files with 48 additions and 85 deletions

View File

@ -1 +1 @@
aa151640e62ace72c1206365bf089ac239d0bce9
42d9284971bf51d3e040505f0c7b9b308011035b

View File

@ -1 +1 @@
af5f5a8cea2b4af29ce60ef165f2fe81bc7844ee
b23890c3e29672d68a1fe844443ac09ff25a2ac9

View File

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

View File

@ -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
{

View File

@ -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()");
}
}
}

View File

@ -1 +1 @@
ac73c8792dbdb43746aeeab1d2fc010ecce1f93e
a639af7dbcc005f41b8e91a5fc71eede726506f6

View File

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

View File

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

View File

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

View File

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

View File

@ -1 +1 @@
1ef520a3da1e27a8c4df12a36456bb539174045c
807ee298114e63cab56ac11f23f724b64361593e

View File

@ -1 +1 @@
70250640969529a28b61e0fddf06c921f78ce771
d16a9e3f8d92c7681eb5e092d7df6b513c4d44ab

View File

@ -1 +1 @@
1c037c92afac92bdaa84f2eadbeaa91c939cc443
4be30bfda39da9a2ecdc34470e4665c753304cb5

View File

@ -1 +1 @@
7352608ab7c991390401dd933182eae47aefa0be
8e522da568214f396478998d70a9137bedfc4bd4

View File

@ -1 +1 @@
2e0c9b4dd427d10536a71f4d61f884bb10a6356a
c5f9829e33f69207ea8aac86b8ec8e2b64ff87b9

View File

@ -1 +1 @@
bcab8a87e25f14bd0b28d7a824597e1b57dbdb46
eabd0a96a209dae105d82f03d3f1030ea31917f9

View File

@ -1 +1 @@
a69a8b09e5faca41b2bee2c1ab2a953ae2e35245
cd9d8e97314061d17467eb14aeda7610bc40a15d

View File

@ -1 +1 @@
1ef520a3da1e27a8c4df12a36456bb539174045c
807ee298114e63cab56ac11f23f724b64361593e

View File

@ -1 +1 @@
70250640969529a28b61e0fddf06c921f78ce771
d16a9e3f8d92c7681eb5e092d7df6b513c4d44ab

View File

@ -1 +1 @@
1c037c92afac92bdaa84f2eadbeaa91c939cc443
4be30bfda39da9a2ecdc34470e4665c753304cb5

View File

@ -1 +1 @@
7352608ab7c991390401dd933182eae47aefa0be
8e522da568214f396478998d70a9137bedfc4bd4

View File

@ -1 +1 @@
2e0c9b4dd427d10536a71f4d61f884bb10a6356a
c5f9829e33f69207ea8aac86b8ec8e2b64ff87b9

View File

@ -1 +1 @@
bcab8a87e25f14bd0b28d7a824597e1b57dbdb46
eabd0a96a209dae105d82f03d3f1030ea31917f9

View File

@ -1 +1 @@
a69a8b09e5faca41b2bee2c1ab2a953ae2e35245
cd9d8e97314061d17467eb14aeda7610bc40a15d

View File

@ -1 +1 @@
1ef520a3da1e27a8c4df12a36456bb539174045c
807ee298114e63cab56ac11f23f724b64361593e

View File

@ -1 +1 @@
70250640969529a28b61e0fddf06c921f78ce771
d16a9e3f8d92c7681eb5e092d7df6b513c4d44ab

View File

@ -1 +1 @@
1c037c92afac92bdaa84f2eadbeaa91c939cc443
4be30bfda39da9a2ecdc34470e4665c753304cb5

View File

@ -1 +1 @@
7352608ab7c991390401dd933182eae47aefa0be
8e522da568214f396478998d70a9137bedfc4bd4

View File

@ -1 +1 @@
2e0c9b4dd427d10536a71f4d61f884bb10a6356a
c5f9829e33f69207ea8aac86b8ec8e2b64ff87b9

View File

@ -1 +1 @@
bcab8a87e25f14bd0b28d7a824597e1b57dbdb46
eabd0a96a209dae105d82f03d3f1030ea31917f9

View File

@ -1 +1 @@
a69a8b09e5faca41b2bee2c1ab2a953ae2e35245
cd9d8e97314061d17467eb14aeda7610bc40a15d

View File

@ -1 +1 @@
1ef520a3da1e27a8c4df12a36456bb539174045c
807ee298114e63cab56ac11f23f724b64361593e

View File

@ -1 +1 @@
70250640969529a28b61e0fddf06c921f78ce771
d16a9e3f8d92c7681eb5e092d7df6b513c4d44ab

View File

@ -1 +1 @@
1c037c92afac92bdaa84f2eadbeaa91c939cc443
4be30bfda39da9a2ecdc34470e4665c753304cb5

View File

@ -1 +1 @@
7352608ab7c991390401dd933182eae47aefa0be
8e522da568214f396478998d70a9137bedfc4bd4

View File

@ -1 +1 @@
2e0c9b4dd427d10536a71f4d61f884bb10a6356a
c5f9829e33f69207ea8aac86b8ec8e2b64ff87b9

View File

@ -1 +1 @@
bcab8a87e25f14bd0b28d7a824597e1b57dbdb46
eabd0a96a209dae105d82f03d3f1030ea31917f9

View File

@ -1 +1 @@
a69a8b09e5faca41b2bee2c1ab2a953ae2e35245
cd9d8e97314061d17467eb14aeda7610bc40a15d

View File

@ -1 +1 @@
72f3266ed6af0d120d78b70b19fc239dec5fe6d1
305fef51002b059bf5249061ff69afd903e7af72

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/d6c9799"
#define FULL_VERSION "explicit/d3ebbdc"

View File

@ -2,7 +2,7 @@
#include "mono/utils/mono-publib.h"
// Keep in sync with mcs/class/System/Mono/MonoNativePlatformType.cs
// Keep in sync with mcs/class/corlib/Test/Mono/MonoNativePlatformType.cs
typedef enum {
MONO_NATIVE_PLATFORM_TYPE_UNKNOWN = 0,

Binary file not shown.

View File

@ -1 +1 @@
7e6cd398c5d00971f9d52867aec8ab6c38ba779e
2284578bd1c0e74650e8143a0c06fc482684d458

Binary file not shown.

View File

@ -1 +1 @@
101798012b517b4eb11802a62dc720d5e4742ce8
22f634fa30caa15749381abf8029f74290c5d1ae

Binary file not shown.

View File

@ -1 +1 @@
c0dd72f96bdefd203b31eb2175e2ed3f165f0371
b908c0ae69f33af04cd7d8a7322f4f24247d9cdf

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.20.0.189\n"
"Project-Id-Version: mono 5.20.0.191\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-02-07 08:07+0000\n"
"POT-Creation-Date: 2019-02-08 08:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
506f86ea6b1ef287b651c2b7602a830f48fdf76d
c38e3cace33a7f13722f8253915ce71a87fe2ba9