mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: bed7c114016c474d7fd4eec66f7d60f4c7f94103
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-11-21 08:29:05 +00:00
commit aeb7805618
47 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
6226dff39317c3229c933cee75df73f7c3b8c747 399f1f2ab50a8eda2245a1b793d8e4bc1f7a1097

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
41df5100fb174fb73affcbd29506df6421ebd621 9bb330a0f8bac481ff50d139facd2f3a7ce9cae6

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "5.18.0.208"; public const string MonoVersion = "5.18.0.209";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
cb78f90e4bc50c7e4ef308e99d1e02c7281b9a2f 77a11cfe4f3a150828e34a5080e8c337c31cb438

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
fa3fb277ab2d51159b85763ee891d209df5e57cc dc9d94a97a9b463168d01177053779a833f86377

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
9b8c5c18dc03b16335f539ba331c136e5becccba 82b0c30b4b4bbaa45c98b3898a93927dbc7ba7d1

BIN
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
0497e181b8c7a57b3244a38c77607566a27d4021 349b5a6bf0815a026f66bb9da62c8887539b87dd

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
1dce201224de58b4fbf7b1dd09923f0c6f30e5d2 05320fa55afa4dbc514377bb52e9d3a004cb2c18

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
08909c711023544d6631a3556fff14a0a57d5a0b d7a6ddb2b3be5996ee2f1dd586f9a64c84a85879

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
9db568ea75371550c6343aa4417c48ce546db061 946d411695c24acea0b7a88aaba089fff576eedb

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
cb78f90e4bc50c7e4ef308e99d1e02c7281b9a2f 77a11cfe4f3a150828e34a5080e8c337c31cb438

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
fa3fb277ab2d51159b85763ee891d209df5e57cc dc9d94a97a9b463168d01177053779a833f86377

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
9b8c5c18dc03b16335f539ba331c136e5becccba 82b0c30b4b4bbaa45c98b3898a93927dbc7ba7d1

BIN
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
0497e181b8c7a57b3244a38c77607566a27d4021 349b5a6bf0815a026f66bb9da62c8887539b87dd

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
1dce201224de58b4fbf7b1dd09923f0c6f30e5d2 05320fa55afa4dbc514377bb52e9d3a004cb2c18

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
08909c711023544d6631a3556fff14a0a57d5a0b d7a6ddb2b3be5996ee2f1dd586f9a64c84a85879

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
9db568ea75371550c6343aa4417c48ce546db061 946d411695c24acea0b7a88aaba089fff576eedb

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
cb78f90e4bc50c7e4ef308e99d1e02c7281b9a2f 77a11cfe4f3a150828e34a5080e8c337c31cb438

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
fa3fb277ab2d51159b85763ee891d209df5e57cc dc9d94a97a9b463168d01177053779a833f86377

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
9b8c5c18dc03b16335f539ba331c136e5becccba 82b0c30b4b4bbaa45c98b3898a93927dbc7ba7d1

BIN
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
0497e181b8c7a57b3244a38c77607566a27d4021 349b5a6bf0815a026f66bb9da62c8887539b87dd

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
1dce201224de58b4fbf7b1dd09923f0c6f30e5d2 05320fa55afa4dbc514377bb52e9d3a004cb2c18

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
08909c711023544d6631a3556fff14a0a57d5a0b d7a6ddb2b3be5996ee2f1dd586f9a64c84a85879

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
9db568ea75371550c6343aa4417c48ce546db061 946d411695c24acea0b7a88aaba089fff576eedb

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
cb78f90e4bc50c7e4ef308e99d1e02c7281b9a2f 77a11cfe4f3a150828e34a5080e8c337c31cb438

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
fa3fb277ab2d51159b85763ee891d209df5e57cc dc9d94a97a9b463168d01177053779a833f86377

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
9b8c5c18dc03b16335f539ba331c136e5becccba 82b0c30b4b4bbaa45c98b3898a93927dbc7ba7d1

BIN
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
0497e181b8c7a57b3244a38c77607566a27d4021 349b5a6bf0815a026f66bb9da62c8887539b87dd

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
1dce201224de58b4fbf7b1dd09923f0c6f30e5d2 05320fa55afa4dbc514377bb52e9d3a004cb2c18

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
08909c711023544d6631a3556fff14a0a57d5a0b d7a6ddb2b3be5996ee2f1dd586f9a64c84a85879

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
9db568ea75371550c6343aa4417c48ce546db061 946d411695c24acea0b7a88aaba089fff576eedb

12
mono/mini/gshared.cs
View File

@ -1701,6 +1701,8 @@ public class Tests
uint i1, uint i2, uint i3, uint i4); uint i1, uint i2, uint i3, uint i4);
int Structs (T t, int dummy1, int a2, int a3, int a4, int a5, int a6, int a7, int dummy8, int Structs (T t, int dummy1, int a2, int a3, int a4, int a5, int a6, int a7, int dummy8,
BStruct s); BStruct s);
int Floats (T t, double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8,
double d9, double d10, float s11, float s12);
void Generic<T2> (T t, T2[] arr, int dummy1, int a2, int a3, int a4, int a5, int a6, int a7, int dummy8, void Generic<T2> (T t, T2[] arr, int dummy1, int a2, int a3, int a4, int a5, int a6, int a7, int dummy8,
T2 i1, T2 i2, T2 i3, T2 i4); T2 i1, T2 i2, T2 i3, T2 i4);
} }
@ -1734,7 +1736,10 @@ public class Tests
BStruct s) { BStruct s) {
return s.a + s.b + s.c + s.d; return s.a + s.b + s.c + s.d;
} }
public int Floats (T t, double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8,
double d9, double d10, float s11, float s12) {
return (int)d9 + (int)d10 + (int)s11 + (int)s12;
}
public void Generic<T2> (T t, T2[] arr, int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, T2 i1, T2 i2, T2 i3, T2 i4) { public void Generic<T2> (T t, T2[] arr, int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, T2 i1, T2 i2, T2 i3, T2 i4) {
arr [0] = i1; arr [0] = i1;
arr [1] = i2; arr [1] = i2;
@ -1764,10 +1769,13 @@ public class Tests
int res6 = o.UInts (new EmptyStruct (), 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4); int res6 = o.UInts (new EmptyStruct (), 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4);
if (res6 != 10) if (res6 != 10)
return 6; return 6;
int res7 = o.Floats (new EmptyStruct (), 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 10.0, 20.0, 30.0f, 40.0f);
if (res7 != 100)
return 7;
int[] arr = new int [4]; int[] arr = new int [4];
o.Generic<int> (new EmptyStruct (), arr, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4); o.Generic<int> (new EmptyStruct (), arr, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4);
if (arr [0] != 1 || arr [1] != 2 || arr [2] != 3 || arr [3] != 4) if (arr [0] != 1 || arr [1] != 2 || arr [2] != 3 || arr [3] != 4)
return 7; return 8;
return 0; return 0;
} }

4
mono/mini/mini-arm64-gsharedvt.c
View File

@ -105,6 +105,8 @@ get_arg_slots (ArgInfo *ainfo, int **out_slots)
src [i] = map_reg (sreg + i); src [i] = map_reg (sreg + i);
break; break;
case ArgOnStack: case ArgOnStack:
case ArgOnStackR4:
case ArgOnStackR8:
nsrc = 1; nsrc = 1;
src = g_malloc (nsrc * sizeof (int)); src = g_malloc (nsrc * sizeof (int));
src [0] = map_stack_slot (sslot); src [0] = map_stack_slot (sslot);
@ -253,7 +255,7 @@ mono_arch_get_gsharedvt_call_info (gpointer addr, MonoMethodSignature *normal_si
} }
if (nsrc) if (nsrc)
src [0] |= (arg_marshal << 18); src [0] |= (arg_marshal << 18);
if (ainfo->storage == ArgOnStack && ainfo->slot_size != 8) { if ((ainfo->storage == ArgOnStack || ainfo->storage == ArgOnStackR4) && ainfo->slot_size != 8) {
GSharedVtArgSize arg_size = GSHAREDVT_ARG_SIZE_NONE; GSharedVtArgSize arg_size = GSHAREDVT_ARG_SIZE_NONE;
/* /*

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/e3a4484" #define FULL_VERSION "explicit/7b9d9b3"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
c49623c788f62237d1382500d0a3b0abb8d5d9ba f5131daebea9672f93a4738fcb924d515fa5e01a

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
cddccf85a231433a73cdeb89c9b900791efc7dc8 3b905f88c92eb8d94b33929ec41fdec1885d2e11

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
1667c83cd1ff3408265deb369bcbc52e374a274b 7c3ed4132cb0a3a3606db16ec7dfcc981b15bfdc

4
po/mcs/mcs.pot
View File

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

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
d707c5c7bcc900329c8e5360558a0fea9393856e 7e2e403dad06a459886c2dd7f8fb0bce27e6911c