Imported Upstream version 5.10.0.160

Former-commit-id: c53882cc1707d973c4b74b4c6c7d98622ea24677
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-07 08:46:18 +00:00
parent 80d55115d1
commit efb22d3209
38 changed files with 73 additions and 35 deletions

View File

@ -1 +1 @@
9c81b9f04caa0bb1c6e0d19fa99af4490df7e488
3dfddaef886efdcb16b0fb7a9666e20ecfc37c62

View File

@ -1 +1 @@
4e1a808c6491658d344c14fb02474b5c9a1da24e
db18931c9022bc8170fe1397e334f168716084cb

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.0.157";
public const string MonoVersion = "5.10.0.160";
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

@ -46,7 +46,7 @@ namespace System.Security.Cryptography.Pkcs {
// only accessible from SignedPkcs7.SignerInfos
internal SignerInfo (string hashName, X509Certificate2 certificate, SubjectIdentifierType type, object o, int version)
{
_digest = new Oid (CryptoConfig.MapNameToOID (hashName));
_digest = new Oid (CryptoConfig.MapNameToOID (hashName) ?? hashName);
_certificate = certificate;
_counter = new SignerInfoCollection ();
_signed = new CryptographicAttributeObjectCollection ();

File diff suppressed because one or more lines are too long

View File

@ -186,6 +186,10 @@ public class TimeZoneTest {
TST (t1);
break;
case "GMT":
#if MONOTOUCH
if (string.IsNullOrEmpty (t1.DaylightName))
Assert.Ignore ("This test may fail due to: http://www.openradar.me/38174449");
#endif
GMT (t1);
break;
case "NZST":

View File

@ -1 +1 @@
73df7d82e053ed0b2bb95f37d05314c3dc574b2e
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604

View File

@ -1 +1 @@
bfa592c6582db64678b2762985cc310dee889a64
efd89075bd285db5211e08ed43d8a1f277983c2a

View File

@ -1 +1 @@
cbae3744d9f81c02d8e8e3ca99a7f8751a0d47de
398a8f3785344006fc2a18c537335f051152c742

View File

@ -1 +1 @@
57c85538844cc1c710f5ca81c01fd896e3625fb2
e67714b89e0fd4da4a82040c8532f7d87780dcce

View File

@ -1 +1 @@
f4727ecfcca9c1346a21bc90ef342bffa91d16f2
d229e5822be263f7985dd2fe47457be78943cd31

View File

@ -1 +1 @@
e1586b43c970b328631e213dc085796094ca13ed
911ec1eda3f29662b7de938f41e2a56815290873

View File

@ -1 +1 @@
1339072a75cebc3935463cbe44bc85915b7cb897
fe3eb98c4140e84f03eaf1395a30988958a8d221

View File

@ -1 +1 @@
73df7d82e053ed0b2bb95f37d05314c3dc574b2e
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604

View File

@ -1 +1 @@
bfa592c6582db64678b2762985cc310dee889a64
efd89075bd285db5211e08ed43d8a1f277983c2a

View File

@ -1 +1 @@
cbae3744d9f81c02d8e8e3ca99a7f8751a0d47de
398a8f3785344006fc2a18c537335f051152c742

View File

@ -1 +1 @@
57c85538844cc1c710f5ca81c01fd896e3625fb2
e67714b89e0fd4da4a82040c8532f7d87780dcce

View File

@ -1 +1 @@
f4727ecfcca9c1346a21bc90ef342bffa91d16f2
d229e5822be263f7985dd2fe47457be78943cd31

View File

@ -1 +1 @@
e1586b43c970b328631e213dc085796094ca13ed
911ec1eda3f29662b7de938f41e2a56815290873

View File

@ -1 +1 @@
1339072a75cebc3935463cbe44bc85915b7cb897
fe3eb98c4140e84f03eaf1395a30988958a8d221

View File

@ -1 +1 @@
73df7d82e053ed0b2bb95f37d05314c3dc574b2e
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604

View File

@ -1 +1 @@
bfa592c6582db64678b2762985cc310dee889a64
efd89075bd285db5211e08ed43d8a1f277983c2a

View File

@ -1 +1 @@
cbae3744d9f81c02d8e8e3ca99a7f8751a0d47de
398a8f3785344006fc2a18c537335f051152c742

View File

@ -1 +1 @@
57c85538844cc1c710f5ca81c01fd896e3625fb2
e67714b89e0fd4da4a82040c8532f7d87780dcce

View File

@ -1 +1 @@
f4727ecfcca9c1346a21bc90ef342bffa91d16f2
d229e5822be263f7985dd2fe47457be78943cd31

View File

@ -1 +1 @@
e1586b43c970b328631e213dc085796094ca13ed
911ec1eda3f29662b7de938f41e2a56815290873

View File

@ -1 +1 @@
1339072a75cebc3935463cbe44bc85915b7cb897
fe3eb98c4140e84f03eaf1395a30988958a8d221

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/d21cb08"
#define FULL_VERSION "explicit/f3ac8fd"

View File

@ -120,19 +120,33 @@ mono_set_allocator_vtable (MonoAllocatorVTable* vtable);
#endif
#if defined (__clang__) || defined (__GNUC__)
// attribute(deprecated(message)) was introduced in gcc 4.5.
// attribute(deprecated)) was introduced in gcc 4.0.
// Compare: https://gcc.gnu.org/onlinedocs/gcc-3.4.6/gcc/Function-Attributes.html
// https://gcc.gnu.org/onlinedocs/gcc-4.4.0/gcc/Function-Attributes.html
// https://gcc.gnu.org/onlinedocs/gcc-4.5.0/gcc/Function-Attributes.html
#if defined (__clang__) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
#define MONO_RT_EXTERNAL_ONLY \
__attribute__ ((__deprecated__ ("The mono runtime must not call this function."))) \
MONO_RT_CENTRINEL_SUPPRESS
#elif __GNUC__ >= 4
#define MONO_RT_EXTERNAL_ONLY __attribute__ ((__deprecated__)) MONO_RT_CENTRINEL_SUPPRESS
#else
#define MONO_RT_EXTERNAL_ONLY MONO_RT_CENTRINEL_SUPPRESS
#endif
#if defined (__clang__) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
// Pragmas for controlling diagnostics appear to be from gcc 4.2.
// This is used in place of configure gcc -Werror=deprecated-declarations:
// 1. To be portable across build systems.
// 2. configure is very sensitive to compiler flags; they break autoconf's probes.
// Though #2 can be mitigted by being late in configure.
#pragma GCC diagnostic error "-Wdeprecated-declarations" // Works with clang too.
// Though #2 can be mitigated by being late in configure.
#pragma GCC diagnostic error "-Wdeprecated-declarations"
#endif
#else
#define MONO_RT_EXTERNAL_ONLY MONO_RT_CENTRINEL_SUPPRESS
#endif /// clang or gcc
#endif // clang or gcc
#else
#define MONO_RT_EXTERNAL_ONLY

Binary file not shown.

View File

@ -1 +1 @@
720fcd5b61e8faeceb8681982ae87b87e9774df2
4ef49bd2b7ed49aa2fe4a4ef6a2ddf1784005825

Binary file not shown.

View File

@ -1 +1 @@
c5d91f3fdb8132191fd2b125b219d3268b0b50bd
f2848362465fccc30ee55872fa65a8a570d5f885

Binary file not shown.

View File

@ -1 +1 @@
5529751719b4c454aa66000ca4e6fd7efd727992
be955f3b4e4605106613aea7801f7ba5a1b3d17b

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.157\n"
"Project-Id-Version: mono 5.10.0.160\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-06 08:33+0000\n"
"POT-Creation-Date: 2018-03-07 08:21+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 @@
f6c2c3fcf8bf77c47b5bd402c7b851e941b4b806
96fb724c139f6b24fe8d09f586d49dccdc4a2692