Merge branch 'upstream'
Former-commit-id: 275c337c565cc638f617cf9cfb98c158a11180d4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
1c22562c0a
@ -1 +1 @@
|
||||
799bcbd4d60c3694db91755fa7c8c99bc65fb780
|
||||
e4dbd55a6935d98c1061117e8bc216643726030d
|
||||
@ -1 +1 @@
|
||||
df10188ed85b7c592c5676b2d81a3f1d8135dbd0
|
||||
662a404734cf8813c639a09f84523e7ab398aaf0
|
||||
@ -1 +1 @@
|
||||
d44dbe0810a188fc6ce61f9edc7458776a0504a0
|
||||
c876fc10c44dfbcd52c7bbff4f0aa7e6b9dd856d
|
||||
@ -1 +1 @@
|
||||
b9bc91cfb92aaab8d33ff1821d3d6972e6191a55
|
||||
471dc3bfaf12041985008efef21da18be5b4995c
|
||||
@ -1 +1 @@
|
||||
d26fb9d4290ecadae1dccea4fce05985005fd56f
|
||||
cae17c3c9a4c8c124b8fc63aabb49906a9bac010
|
||||
@ -12,6 +12,8 @@ namespace System.ComponentModel
|
||||
/// </summary>
|
||||
public abstract class BaseNumberConverter : TypeConverter
|
||||
{
|
||||
internal BaseNumberConverter() { }
|
||||
|
||||
/// <summary>
|
||||
/// Determines whether this editor will attempt to convert hex (0x or #) strings
|
||||
/// </summary>
|
||||
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.0.0.278";
|
||||
public const string MonoVersion = "6.0.0.284";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
fae8e88b78a85ab345a7e6910eecdb3d56a4729d
|
||||
0081ae35dbce9a10dcfd0a9a0a22e9690e19da56
|
||||
@ -1 +1 @@
|
||||
ec251c8d881147eb53f4a7be43eb34d514ff5386
|
||||
1cbed502c7bc7f3ee585f5a992af3439588908ee
|
||||
@ -1 +1 @@
|
||||
7ef81088b15583acff58f8162c2cf3cba80018ab
|
||||
de4610d6ed476d486c45dcda2a88ff584d1ff1c3
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
4e951b67f5f1f1636e4a20d6b79c9a754fad456d
|
||||
489d7ee861c287503c007ef4054371bb2650a61f
|
||||
@ -1 +1 @@
|
||||
5e5858169817e28ccd47ab619433a4308f01be96
|
||||
0755b77099541d721dba6c265a09c09e9cc9d9be
|
||||
@ -1 +1 @@
|
||||
4de6210313c96a129141e34340b491792621e5f6
|
||||
ef2e4304281563bd8360933f8a58371f6e4dba90
|
||||
@ -1 +1 @@
|
||||
a13cb0413466e72b31800ea79f418a69be00210b
|
||||
8a04fc03dae997ce5a67c88ff36d45e62465988c
|
||||
@ -1 +1 @@
|
||||
e0ee85c32e73f249e8da0486bc5d2b47895e7292
|
||||
13da60b713ea88aa40dfb5cac5b123260ecbe2b1
|
||||
@ -1 +1 @@
|
||||
fae8e88b78a85ab345a7e6910eecdb3d56a4729d
|
||||
0081ae35dbce9a10dcfd0a9a0a22e9690e19da56
|
||||
@ -1 +1 @@
|
||||
ec251c8d881147eb53f4a7be43eb34d514ff5386
|
||||
1cbed502c7bc7f3ee585f5a992af3439588908ee
|
||||
@ -1 +1 @@
|
||||
7ef81088b15583acff58f8162c2cf3cba80018ab
|
||||
de4610d6ed476d486c45dcda2a88ff584d1ff1c3
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
4e951b67f5f1f1636e4a20d6b79c9a754fad456d
|
||||
489d7ee861c287503c007ef4054371bb2650a61f
|
||||
@ -1 +1 @@
|
||||
5e5858169817e28ccd47ab619433a4308f01be96
|
||||
0755b77099541d721dba6c265a09c09e9cc9d9be
|
||||
@ -1 +1 @@
|
||||
4de6210313c96a129141e34340b491792621e5f6
|
||||
ef2e4304281563bd8360933f8a58371f6e4dba90
|
||||
@ -1 +1 @@
|
||||
a13cb0413466e72b31800ea79f418a69be00210b
|
||||
8a04fc03dae997ce5a67c88ff36d45e62465988c
|
||||
@ -1 +1 @@
|
||||
e0ee85c32e73f249e8da0486bc5d2b47895e7292
|
||||
13da60b713ea88aa40dfb5cac5b123260ecbe2b1
|
||||
@ -1 +1 @@
|
||||
fae8e88b78a85ab345a7e6910eecdb3d56a4729d
|
||||
0081ae35dbce9a10dcfd0a9a0a22e9690e19da56
|
||||
@ -1 +1 @@
|
||||
ec251c8d881147eb53f4a7be43eb34d514ff5386
|
||||
1cbed502c7bc7f3ee585f5a992af3439588908ee
|
||||
@ -1 +1 @@
|
||||
7ef81088b15583acff58f8162c2cf3cba80018ab
|
||||
de4610d6ed476d486c45dcda2a88ff584d1ff1c3
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
4e951b67f5f1f1636e4a20d6b79c9a754fad456d
|
||||
489d7ee861c287503c007ef4054371bb2650a61f
|
||||
@ -1 +1 @@
|
||||
5e5858169817e28ccd47ab619433a4308f01be96
|
||||
0755b77099541d721dba6c265a09c09e9cc9d9be
|
||||
@ -1 +1 @@
|
||||
4de6210313c96a129141e34340b491792621e5f6
|
||||
ef2e4304281563bd8360933f8a58371f6e4dba90
|
||||
@ -1 +1 @@
|
||||
a13cb0413466e72b31800ea79f418a69be00210b
|
||||
8a04fc03dae997ce5a67c88ff36d45e62465988c
|
||||
@ -1 +1 @@
|
||||
e0ee85c32e73f249e8da0486bc5d2b47895e7292
|
||||
13da60b713ea88aa40dfb5cac5b123260ecbe2b1
|
||||
@ -1 +1 @@
|
||||
fae8e88b78a85ab345a7e6910eecdb3d56a4729d
|
||||
0081ae35dbce9a10dcfd0a9a0a22e9690e19da56
|
||||
@ -1 +1 @@
|
||||
ec251c8d881147eb53f4a7be43eb34d514ff5386
|
||||
1cbed502c7bc7f3ee585f5a992af3439588908ee
|
||||
@ -1 +1 @@
|
||||
7ea14cdb5daf363ff9a39002e0df72785114caf1
|
||||
029790984b39c5f269604dd5b23d09490714e01e
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
4e951b67f5f1f1636e4a20d6b79c9a754fad456d
|
||||
489d7ee861c287503c007ef4054371bb2650a61f
|
||||
@ -1 +1 @@
|
||||
5e5858169817e28ccd47ab619433a4308f01be96
|
||||
0755b77099541d721dba6c265a09c09e9cc9d9be
|
||||
@ -1 +1 @@
|
||||
4de6210313c96a129141e34340b491792621e5f6
|
||||
ef2e4304281563bd8360933f8a58371f6e4dba90
|
||||
@ -1 +1 @@
|
||||
a13cb0413466e72b31800ea79f418a69be00210b
|
||||
8a04fc03dae997ce5a67c88ff36d45e62465988c
|
||||
@ -1 +1 @@
|
||||
42afa2b11a64b1ba87bb0320fb483c80374b0aad
|
||||
2b47191e993569bb9dfb2ab9b483f0337516a99e
|
||||
@ -1 +1 @@
|
||||
03b6953cd0206c7925a410d5c0d8c56a9b019e8b
|
||||
a80005d333ee51e15456a1238ec415b4ad717f06
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/0e21597"
|
||||
#define FULL_VERSION "explicit/0349bbe"
|
||||
|
||||
@ -30,6 +30,12 @@
|
||||
|
||||
#if HAVE_COMMONCRYPTO_COMMONDIGEST_H
|
||||
|
||||
// CC_MD5_* API is deprecated on macOS 10.15
|
||||
#if defined(__APPLE__) && defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* mono_md5_init:
|
||||
*/
|
||||
@ -57,6 +63,10 @@ mono_md5_final (MonoMD5Context *ctx, guchar digest[16])
|
||||
CC_MD5_Final (digest, ctx);
|
||||
}
|
||||
|
||||
#if defined(__APPLE__) && defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
static void md5_transform (guint32 buf[4], const guint32 in[16]);
|
||||
|
||||
@ -9,6 +9,9 @@
|
||||
*/
|
||||
|
||||
#if defined(__MACH__)
|
||||
|
||||
#define OBJC_OLD_DISPATCH_PROTOTYPES 1 // TODO remove once https://github.com/mono/mono/issues/14792 is fixed
|
||||
|
||||
#include "config.h"
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
0c04209848736fd6d264d2185bba7d60b186a74a
|
||||
d2d046677f253f11e4b1fb4677692bb019af3fdc
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c6c8b605a1d151442e1eb1721e0516f6b9f03ee3
|
||||
aca1a1a9bd3b093925511cedb1436dfe93b46a78
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4e80896dc5ef2630f20378b39d6329f9bcc69d4b
|
||||
9b10e2f843290ba167a32db005fdd532e1ef8e1f
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.0.0.278\n"
|
||||
"Project-Id-Version: mono 6.0.0.284\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-06-05 08:05+0000\n"
|
||||
"POT-Creation-Date: 2019-06-06 08:08+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"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c7210f699c811d8c6d9487dc781234b6aaedb80d
|
||||
a94486f75e80f406755249a0bcb76d7590076261
|
||||
Loading…
x
Reference in New Issue
Block a user