Imported Upstream version 5.10.0.107
Former-commit-id: b1b451a5c10f756428dd56301de98fae2be5461a
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
5e8fcc7e50
commit
05e67c9e5f
@ -1 +1 @@
|
||||
e85437818f00d2cd9616f6dcf51f3e793755c691
|
||||
df960e3f494b0d30d808c1bd44ee0be557e4ca67
|
||||
@ -1 +1 @@
|
||||
f717d8e40d24ffb6ae41b33e6a891cb36e88c578
|
||||
0da7de0818f03e991729bf29ede5a6c90311c912
|
||||
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.10.0.105";
|
||||
public const string MonoVersion = "5.10.0.107";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -20,7 +20,7 @@ namespace System.IO {
|
||||
|
||||
public LogcatTextWriter (string appname, TextWriter stdout)
|
||||
{
|
||||
this.appname = Encoding.UTF8.GetBytes (appname);
|
||||
this.appname = Encoding.UTF8.GetBytes (appname + '\0');
|
||||
this.stdout = stdout;
|
||||
}
|
||||
|
||||
@ -48,13 +48,43 @@ namespace System.IO {
|
||||
var o = line.ToString ();
|
||||
line.Clear ();
|
||||
|
||||
Log (o);
|
||||
stdout.WriteLine (o);
|
||||
}
|
||||
|
||||
void Log (string message)
|
||||
{
|
||||
const int buffer_size = 512;
|
||||
|
||||
unsafe {
|
||||
fixed (byte *b_appname = appname)
|
||||
fixed (byte *b_message = Encoding.UTF8.GetBytes(o)) {
|
||||
Log (b_appname, 1 << 5 /* G_LOG_LEVEL_MESSAGE */, b_message);
|
||||
if (Encoding.UTF8.GetByteCount (message) < buffer_size) {
|
||||
try {
|
||||
fixed (char *b_message = message) {
|
||||
byte* buffer = stackalloc byte[buffer_size];
|
||||
int written = Encoding.UTF8.GetBytes (b_message, message.Length, buffer, buffer_size - 1);
|
||||
buffer [written] = (byte)'\0';
|
||||
|
||||
Log (buffer);
|
||||
}
|
||||
|
||||
return;
|
||||
} catch (ArgumentException) {
|
||||
/* It might be due to a failure to encode a character, or due to a smaller than necessary buffer. In the
|
||||
* secode case, we want to fallback to simply allocating on the heap. */
|
||||
}
|
||||
}
|
||||
|
||||
fixed (byte *b_message = Encoding.UTF8.GetBytes(message + '\0')) {
|
||||
Log (b_message);
|
||||
}
|
||||
}
|
||||
stdout.WriteLine (o);
|
||||
}
|
||||
|
||||
unsafe void Log (byte* b_message)
|
||||
{
|
||||
fixed (byte *b_appname = appname) {
|
||||
Log (b_appname, 1 << 5 /* G_LOG_LEVEL_MESSAGE */, b_message);
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsRunningOnAndroid ()
|
||||
|
||||
@ -1 +1 @@
|
||||
fddd884e0a3f48fdac078ec0d528d6159dfe3856
|
||||
bcddfd5f8af86e0b05fd9c450ea4edada90bb493
|
||||
@ -1 +1 @@
|
||||
3d10120799d1ccf8914b1902a7c3fb41069946f5
|
||||
625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5
|
||||
@ -1 +1 @@
|
||||
d599d559b4f824d76c3fcfcf98e6a7ee61fdcfb6
|
||||
7d093351bb4b8ff663b2f39fa536221188341b25
|
||||
@ -1 +1 @@
|
||||
4c4fd3ffa294a529c35142173f121f7298a5c4a1
|
||||
647964d71fe4b956b19eea16d85d62a6a31d0214
|
||||
@ -1 +1 @@
|
||||
4fddd6a0abadcaa77515b4ed9f5f6f64ae70cfa4
|
||||
ce49c39b40d2ff5525da2fc5badbdfeed1ad5766
|
||||
@ -1 +1 @@
|
||||
040c8846dde8f31ee7cfa823ba1e2e45f34138a8
|
||||
f78e411b0e0ef98a22b4d4e0092347189395dcf8
|
||||
@ -1 +1 @@
|
||||
67be408a823afdbf1873d117d1ecc541ba05d81a
|
||||
1c80cfd07f438371c803270dfa1d3df05d5565b5
|
||||
@ -1 +1 @@
|
||||
fddd884e0a3f48fdac078ec0d528d6159dfe3856
|
||||
bcddfd5f8af86e0b05fd9c450ea4edada90bb493
|
||||
@ -1 +1 @@
|
||||
3d10120799d1ccf8914b1902a7c3fb41069946f5
|
||||
625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5
|
||||
@ -1 +1 @@
|
||||
d599d559b4f824d76c3fcfcf98e6a7ee61fdcfb6
|
||||
7d093351bb4b8ff663b2f39fa536221188341b25
|
||||
@ -1 +1 @@
|
||||
4c4fd3ffa294a529c35142173f121f7298a5c4a1
|
||||
647964d71fe4b956b19eea16d85d62a6a31d0214
|
||||
@ -1 +1 @@
|
||||
4fddd6a0abadcaa77515b4ed9f5f6f64ae70cfa4
|
||||
ce49c39b40d2ff5525da2fc5badbdfeed1ad5766
|
||||
@ -1 +1 @@
|
||||
040c8846dde8f31ee7cfa823ba1e2e45f34138a8
|
||||
f78e411b0e0ef98a22b4d4e0092347189395dcf8
|
||||
@ -1 +1 @@
|
||||
67be408a823afdbf1873d117d1ecc541ba05d81a
|
||||
1c80cfd07f438371c803270dfa1d3df05d5565b5
|
||||
@ -1 +1 @@
|
||||
fddd884e0a3f48fdac078ec0d528d6159dfe3856
|
||||
bcddfd5f8af86e0b05fd9c450ea4edada90bb493
|
||||
@ -1 +1 @@
|
||||
3d10120799d1ccf8914b1902a7c3fb41069946f5
|
||||
625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5
|
||||
@ -1 +1 @@
|
||||
d599d559b4f824d76c3fcfcf98e6a7ee61fdcfb6
|
||||
7d093351bb4b8ff663b2f39fa536221188341b25
|
||||
@ -1 +1 @@
|
||||
4c4fd3ffa294a529c35142173f121f7298a5c4a1
|
||||
647964d71fe4b956b19eea16d85d62a6a31d0214
|
||||
@ -1 +1 @@
|
||||
4fddd6a0abadcaa77515b4ed9f5f6f64ae70cfa4
|
||||
ce49c39b40d2ff5525da2fc5badbdfeed1ad5766
|
||||
@ -1 +1 @@
|
||||
040c8846dde8f31ee7cfa823ba1e2e45f34138a8
|
||||
f78e411b0e0ef98a22b4d4e0092347189395dcf8
|
||||
@ -1 +1 @@
|
||||
67be408a823afdbf1873d117d1ecc541ba05d81a
|
||||
1c80cfd07f438371c803270dfa1d3df05d5565b5
|
||||
@ -66,18 +66,8 @@ class MakeBundle {
|
||||
static bool custom_mode = true;
|
||||
static string embedded_options = null;
|
||||
|
||||
static string runtime_bin = null;
|
||||
static string runtime = null;
|
||||
|
||||
static string runtime {
|
||||
get {
|
||||
if (runtime_bin == null && IsUnix)
|
||||
runtime_bin = Process.GetCurrentProcess().MainModule.FileName;
|
||||
return runtime_bin;
|
||||
}
|
||||
|
||||
set { runtime_bin = value; }
|
||||
}
|
||||
|
||||
static bool aot_compile = false;
|
||||
static string aot_args = "static";
|
||||
static DirectoryInfo aot_temp_dir = null;
|
||||
@ -737,8 +727,12 @@ class MakeBundle {
|
||||
static bool GeneratePackage (List<string> files)
|
||||
{
|
||||
if (runtime == null){
|
||||
Error ("You must specify at least one runtime with --runtime or --cross");
|
||||
Environment.Exit (1);
|
||||
if (IsUnix)
|
||||
runtime = Process.GetCurrentProcess().MainModule.FileName;
|
||||
else {
|
||||
Error ("You must specify at least one runtime with --runtime or --cross");
|
||||
Environment.Exit (1);
|
||||
}
|
||||
}
|
||||
if (!File.Exists (runtime)){
|
||||
Error ($"The specified runtime at {runtime} does not exist");
|
||||
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/4b17454"
|
||||
#define FULL_VERSION "explicit/a0af42a"
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
cc8024f516ae9fea459ceda6fba3c016f14a6efc
|
||||
bc010bb587374a6f3e89fa6eafada32b21696d73
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c4537258cd664d87def43be8805b47ed38c4472c
|
||||
5e0e8217bedaebbe399236d2375b7d34cef39ea5
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a99facea2d20fef37b686f85f7183b5e4bb9939a
|
||||
ef8077dbf75103a8106ca15de92c5a577fedf46a
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.10.0.105\n"
|
||||
"Project-Id-Version: mono 5.10.0.107\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-02-13 18:43+0000\n"
|
||||
"POT-Creation-Date: 2018-02-14 19:26+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 @@
|
||||
de04511f37523886da0f4f17f42cbd88f60476a0
|
||||
73da5ec3a76a3ca59029c7388f2de35e58a4ff9c
|
||||
Loading…
x
Reference in New Issue
Block a user