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: 7f2277243988f1e73203aa1dac9bfe81586f35dc
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-07 19:41:28 +00:00
commit 10f6260d3a
35 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
5c04f91573d0557a2c64610620433a17a53fc635
1d308ffd3ebdc0530200bb4b02b177970f9b82b7

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

@ -1 +1 @@
a544c273ddbf680c2fc1cfbf5a6d2e0a1c551fc9
29087718843a824dda1ded1bed2a03d021775679

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.91";
public const string MonoVersion = "5.10.0.94";
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/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
af2124cfbb3fc8ad0adb58c7b36b4760b57c0c16
e117a95f92777b26fd2d1298fbce8d3d80e7b11d

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

@ -1 +1 @@
bf376e2ebb2d1f9ffc17868794d31c4901de43b0
88276368473e9573399ca3df2baee284f1215f68

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

@ -1 +1 @@
7319297a7d7dccc075bcc6de8bf3a09c4a85aebc
ac4327db48f5eb59dbf26f72caa5710e179675cb

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

@ -1 +1 @@
52bdf6ac55dbbc3dbe83c65f4ed8680763bdf70c
91cac790950b1627448157528f3f8949946c90a0

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

@ -1 +1 @@
0bbfbbfd8573f69a64164fcba1da857e0e1e4159
4891bd2b96920ca353f0ae80e626100da295715c

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

@ -1 +1 @@
c77975dc0ecd88db8912d9bae7fabed8d1f1096d
956a59b4433bd96d75836cbd1bbac8396bec5050

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

@ -1 +1 @@
43d9743098b81645a85431b5b3a042ab89e132fa
1a7558b1fb4a467c985ec6e856be5afc1a0eb535

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

@ -1 +1 @@
af2124cfbb3fc8ad0adb58c7b36b4760b57c0c16
e117a95f92777b26fd2d1298fbce8d3d80e7b11d

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

@ -1 +1 @@
bf376e2ebb2d1f9ffc17868794d31c4901de43b0
88276368473e9573399ca3df2baee284f1215f68

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

@ -1 +1 @@
7319297a7d7dccc075bcc6de8bf3a09c4a85aebc
ac4327db48f5eb59dbf26f72caa5710e179675cb

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

@ -1 +1 @@
52bdf6ac55dbbc3dbe83c65f4ed8680763bdf70c
91cac790950b1627448157528f3f8949946c90a0

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

@ -1 +1 @@
0bbfbbfd8573f69a64164fcba1da857e0e1e4159
4891bd2b96920ca353f0ae80e626100da295715c

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

@ -1 +1 @@
c77975dc0ecd88db8912d9bae7fabed8d1f1096d
956a59b4433bd96d75836cbd1bbac8396bec5050

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

@ -1 +1 @@
43d9743098b81645a85431b5b3a042ab89e132fa
1a7558b1fb4a467c985ec6e856be5afc1a0eb535

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

@ -1 +1 @@
af2124cfbb3fc8ad0adb58c7b36b4760b57c0c16
e117a95f92777b26fd2d1298fbce8d3d80e7b11d

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

@ -1 +1 @@
bf376e2ebb2d1f9ffc17868794d31c4901de43b0
88276368473e9573399ca3df2baee284f1215f68

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

@ -1 +1 @@
7319297a7d7dccc075bcc6de8bf3a09c4a85aebc
ac4327db48f5eb59dbf26f72caa5710e179675cb

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

@ -1 +1 @@
52bdf6ac55dbbc3dbe83c65f4ed8680763bdf70c
91cac790950b1627448157528f3f8949946c90a0

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

@ -1 +1 @@
0bbfbbfd8573f69a64164fcba1da857e0e1e4159
4891bd2b96920ca353f0ae80e626100da295715c

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

@ -1 +1 @@
c77975dc0ecd88db8912d9bae7fabed8d1f1096d
956a59b4433bd96d75836cbd1bbac8396bec5050

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

@ -1 +1 @@
43d9743098b81645a85431b5b3a042ab89e132fa
1a7558b1fb4a467c985ec6e856be5afc1a0eb535

6
mono/metadata/w32socket-win32.c
View File

@ -186,7 +186,7 @@ int mono_w32socket_send (SOCKET s, char *buf, int len, int flags, gboolean block
{
int ret = SOCKET_ERROR;
MONO_ENTER_GC_SAFE;
ALERTABLE_SOCKET_CALL (FD_WRITE_BIT, blocking, FALSE, ret, send, s, buf, len, flags);
ALERTABLE_SOCKET_CALL (FD_WRITE_BIT, blocking, TRUE, ret, send, s, buf, len, flags);
MONO_EXIT_GC_SAFE;
return ret;
}
@ -195,7 +195,7 @@ int mono_w32socket_sendto (SOCKET s, const char *buf, int len, int flags, const
{
int ret = SOCKET_ERROR;
MONO_ENTER_GC_SAFE;
ALERTABLE_SOCKET_CALL (FD_WRITE_BIT, blocking, FALSE, ret, sendto, s, buf, len, flags, to, tolen);
ALERTABLE_SOCKET_CALL (FD_WRITE_BIT, blocking, TRUE, ret, sendto, s, buf, len, flags, to, tolen);
MONO_EXIT_GC_SAFE;
return ret;
}
@ -204,7 +204,7 @@ int mono_w32socket_sendbuffers (SOCKET s, WSABUF *lpBuffers, guint32 dwBufferCou
{
int ret = SOCKET_ERROR;
MONO_ENTER_GC_SAFE;
ALERTABLE_SOCKET_CALL (FD_WRITE_BIT, blocking, FALSE, ret, WSASend, s, lpBuffers, dwBufferCount, lpNumberOfBytesRecvd, lpFlags, lpOverlapped, lpCompletionRoutine);
ALERTABLE_SOCKET_CALL (FD_WRITE_BIT, blocking, TRUE, ret, WSASend, s, lpBuffers, dwBufferCount, lpNumberOfBytesRecvd, lpFlags, lpOverlapped, lpCompletionRoutine);
MONO_EXIT_GC_SAFE;
return ret;
}

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/fa7740e"
#define FULL_VERSION "explicit/1420478"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
57751d630bde4168012986417017c5045f28ed74
20d450e83a2ffd5481e366ffd8408e3099b8d049

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
2b87e62bf2d943d513f877cf2d1c5ef7d059c656
71daebff0ad6fb1c19c7af42781de25ef441d88d

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
789ac78ddd6eeedd86886366e1e52553647d1c71
d9661873bd8a29a6d60edd4d3ffaf75e19faf615

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.91\n"
"Project-Id-Version: mono 5.10.0.94\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-02-06 18:52+0000\n"
"POT-Creation-Date: 2018-02-07 19:01+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 @@
71c6a58881155d5d7342489cd27d148796ffc2d7
f3c367901deaecb753930f0bb6b856a910eaec7d