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: 0af31bf82f488bdd6e8157beded2f8b3f9adba30
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-15 09:15:51 +00:00
commit dbc1a96663
38 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
edec24455435e7b458b7556fd3543a3eafae5ce6
9774f14a084c7940953e8aa66678e69a2f477362

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

@ -1 +1 @@
0ecd459785417545d203bdf97d4ea71299a89345
957cb149fe4cc671a3dc90079b0db6edbe6c323c

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.
//
public const string MonoVersion = "5.10.0.175";
public const string MonoVersion = "5.10.0.176";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
1e49fc778db7e517f163d6a87b8ea781f9b94bdf
06926744392e85001870650a3a257006a0e76492

2
mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
e43cf6129964a591f4f6bf558e389fb2820cfc35
d3f4cd77dc60ca7c340191278359f61b823c8607

2
mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
fe54dc8fdf0183377c74cff6067597ed3d11206c
982f8c43712ec5333cc3acb603344267a51b8d1d

2
mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
f2a8f3e4b7ea9aa87b551e8169e6e4a7436c99ed
896a1e419453152496e2d64acce1175ce2897a2a

2
mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
8f5d5c1fdb320e526043f2d73869f47b081ab57a
0394570fb69b53a0aa3eea23e6b750f5b746024e

2
mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
584c985c6275ff870c194df676ea1e9b9b02bbf1
b9a5181cb8d8405bb006a98f4d5497fef0aedf21

2
mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
ad13ce4d9c79472586e828245b897a30750ea8b2
18fec44a585ccb0719117b956086dfe7fb9177b8

2
mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
1e49fc778db7e517f163d6a87b8ea781f9b94bdf
06926744392e85001870650a3a257006a0e76492

2
mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
e43cf6129964a591f4f6bf558e389fb2820cfc35
d3f4cd77dc60ca7c340191278359f61b823c8607

2
mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
fe54dc8fdf0183377c74cff6067597ed3d11206c
982f8c43712ec5333cc3acb603344267a51b8d1d

2
mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
f2a8f3e4b7ea9aa87b551e8169e6e4a7436c99ed
896a1e419453152496e2d64acce1175ce2897a2a

2
mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
8f5d5c1fdb320e526043f2d73869f47b081ab57a
0394570fb69b53a0aa3eea23e6b750f5b746024e

2
mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
584c985c6275ff870c194df676ea1e9b9b02bbf1
b9a5181cb8d8405bb006a98f4d5497fef0aedf21

2
mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
ad13ce4d9c79472586e828245b897a30750ea8b2
18fec44a585ccb0719117b956086dfe7fb9177b8

2
mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
1e49fc778db7e517f163d6a87b8ea781f9b94bdf
06926744392e85001870650a3a257006a0e76492

2
mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
e43cf6129964a591f4f6bf558e389fb2820cfc35
d3f4cd77dc60ca7c340191278359f61b823c8607

2
mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
fe54dc8fdf0183377c74cff6067597ed3d11206c
982f8c43712ec5333cc3acb603344267a51b8d1d

2
mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
f2a8f3e4b7ea9aa87b551e8169e6e4a7436c99ed
896a1e419453152496e2d64acce1175ce2897a2a

2
mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
8f5d5c1fdb320e526043f2d73869f47b081ab57a
0394570fb69b53a0aa3eea23e6b750f5b746024e

2
mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
584c985c6275ff870c194df676ea1e9b9b02bbf1
b9a5181cb8d8405bb006a98f4d5497fef0aedf21

2
mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
ad13ce4d9c79472586e828245b897a30750ea8b2
18fec44a585ccb0719117b956086dfe7fb9177b8

2
mono/metadata/icall.c.REMOVED.git-id
View File

@ -1 +1 @@
4848396165d218b23b04f928244318302fb49d05
8e3eaec8515ed4b4c5f2d8327e739f7b954ea8c9

2
mono/mini/mini-exceptions.c.REMOVED.git-id
View File

@ -1 +1 @@
05ff043765c176e7d2d83e45dcce18bd2ea4b142
bda7e14f3437c9f6c6eeae4f0380ce7f33c6d040

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/131c3dd"
#define FULL_VERSION "explicit/a7adb18"

4
mono/utils/mono-merp.c
View File

@ -12,7 +12,7 @@
#include <config.h>
#include <glib.h>
#ifdef HOST_DARWIN
#ifdef TARGET_OSX
#include "mono-merp.h"
#include <unistd.h>
@ -496,5 +496,5 @@ mono_merp_enabled (void)
return config.enable_merp;
}
#endif // HOST_DARWIN
#endif // TARGET_OSX

4
mono/utils/mono-merp.h
View File

@ -14,7 +14,7 @@
#include <config.h>
#include <glib.h>
#ifdef HOST_DARWIN
#ifdef TARGET_OSX
/**
* Unregister the MERP-based handler
@ -48,6 +48,6 @@ gboolean mono_merp_enabled (void);
void mono_merp_invoke (pid_t crashed_pid, intptr_t thread_pointer, const char *signal);
#endif // HOST_DARWIN
#endif // TARGET_OSX
#endif // MONO_UTILS_MERP

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
4a3fb91ded421553c128d77bdc0f446849778a7a
4e01d91e31b437a394eff1fcf5560b63f28e1728

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
e71d36062d4747e0d949cbb04c8ba990ce635d7d
4cd17e5bac01af45159832ee36a0119dc40fcbb9

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
c715c5f9f89cab218a8e5e37e4a2191a529ad029
affe3ef0e44a1f27bf8e8744ac6a7ec2e4f9a996

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.175\n"
"Project-Id-Version: mono 5.10.0.176\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-14 08:37+0000\n"
"POT-Creation-Date: 2018-03-15 08:27+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
View File

Binary file not shown.

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

@ -1 +1 @@
0ef72b99de3eb8b29dd05ec9be84080d04cb753c
58f992293a2875916343fc7faea707a922268cf8