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

Imported Upstream version 5.10.0.154

Browse Source 
Former-commit-id: 0757913fc4bf322bdde7a2ae028f9f13e567f0a3
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-03 12:27:23 +00:00
parent c2eaad6954
commit 9678eafc8e
38 changed files with 95 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
e04390d13efbb906a4c7205066284c78ad908d3d
165723b01ed7fa4a7f2ec316c0c178c56021d4d8

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

@ -1 +1 @@
b78b8e302331d583167ac8c2b4299783363a0a2c
6027a9c7bc2c335d658a5fab00bfc7d6084509fe

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.147";
public const string MonoVersion = "5.10.0.154";
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/corlib/Test/System/TypeTest.cs.REMOVED.git-id
View File

@ -1 +1 @@
6608ef9cc4301918179262a621d3f033dcdead0b
8abbb6fa6686078f6c619fd2b2e5e8f1ef3ab045

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

@ -1 +1 @@
48c2d3af0e2d1d2c00ac99e9070e3aa547943b32
8d6c26c4197ac4732f24e9ce47033e36e2270670

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

@ -1 +1 @@
8564042fbb77157d176988b757c441f6741e5ef4
aa27eb214d2b935ea35aa33127f2f84cd7269a38

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

@ -1 +1 @@
eb01300809eefbb499b043319f321d0e122016b2
cc99a7feb7e5fc6cfe8db8807f3cfe225ba0b4c9

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

@ -1 +1 @@
8021eda09d2df537bd33b2ecbbc9f925afd8d028
affce4b6359cc8fb1449472293f085986d8a3c06

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

@ -1 +1 @@
e869b0dacf55e322347e9d2d349db6d6a958ae99
e93c49f284fcfdceed4fa1c3977e2156c5035849

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

@ -1 +1 @@
7a1a1baab43342fffb44bef0f8c6abae2257137c
9262432719f550b816e26dec9ffda3e9108255a3

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

@ -1 +1 @@
1d17cca82bd569fd30c52a475c3eaa6670f33dc6
2163c245fa058e63116553da7f9ee94488d24058

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

@ -1 +1 @@
48c2d3af0e2d1d2c00ac99e9070e3aa547943b32
8d6c26c4197ac4732f24e9ce47033e36e2270670

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

@ -1 +1 @@
8564042fbb77157d176988b757c441f6741e5ef4
aa27eb214d2b935ea35aa33127f2f84cd7269a38

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

@ -1 +1 @@
eb01300809eefbb499b043319f321d0e122016b2
cc99a7feb7e5fc6cfe8db8807f3cfe225ba0b4c9

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

@ -1 +1 @@
8021eda09d2df537bd33b2ecbbc9f925afd8d028
affce4b6359cc8fb1449472293f085986d8a3c06

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

@ -1 +1 @@
e869b0dacf55e322347e9d2d349db6d6a958ae99
e93c49f284fcfdceed4fa1c3977e2156c5035849

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

@ -1 +1 @@
7a1a1baab43342fffb44bef0f8c6abae2257137c
9262432719f550b816e26dec9ffda3e9108255a3

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

@ -1 +1 @@
1d17cca82bd569fd30c52a475c3eaa6670f33dc6
2163c245fa058e63116553da7f9ee94488d24058

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

@ -1 +1 @@
48c2d3af0e2d1d2c00ac99e9070e3aa547943b32
8d6c26c4197ac4732f24e9ce47033e36e2270670

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

@ -1 +1 @@
8564042fbb77157d176988b757c441f6741e5ef4
aa27eb214d2b935ea35aa33127f2f84cd7269a38

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

@ -1 +1 @@
eb01300809eefbb499b043319f321d0e122016b2
cc99a7feb7e5fc6cfe8db8807f3cfe225ba0b4c9

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

@ -1 +1 @@
8021eda09d2df537bd33b2ecbbc9f925afd8d028
affce4b6359cc8fb1449472293f085986d8a3c06

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

@ -1 +1 @@
e869b0dacf55e322347e9d2d349db6d6a958ae99
e93c49f284fcfdceed4fa1c3977e2156c5035849

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

@ -1 +1 @@
7a1a1baab43342fffb44bef0f8c6abae2257137c
9262432719f550b816e26dec9ffda3e9108255a3

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

@ -1 +1 @@
1d17cca82bd569fd30c52a475c3eaa6670f33dc6
2163c245fa058e63116553da7f9ee94488d24058

67
mono/metadata/appdomain.c
View File

@ -1491,29 +1491,66 @@ mono_make_shadow_copy (const char *filename, MonoError *error)
return (char *) filename;
}
#else
typedef enum {
SHADOW_COPY_SIBLING_EXT_APPEND,
SHADOW_COPY_SIBLING_EXT_REPLACE,
} ShadowCopySiblingExt;
static
gchar *
make_sibling_path (const gchar *path, gint pathlen, const char *extension, ShadowCopySiblingExt extopt)
{
gchar *result = NULL;
switch (extopt) {
case SHADOW_COPY_SIBLING_EXT_APPEND: {
result = g_strconcat (path, extension, NULL);
break;
}
case SHADOW_COPY_SIBLING_EXT_REPLACE: {
/* expect path to be a .dll or .exe (or some case insensitive variant) */
g_assert (pathlen >= 4 && path[pathlen - 4] == '.');
GString *s = g_string_sized_new (pathlen - 4 + strlen (extension));
g_string_append_len (s, path, pathlen - 4);
g_string_append (s, extension);
result = g_string_free (s, FALSE);
break;
}
default:
g_assert_not_reached ();
}
return result;
}
static gboolean
shadow_copy_sibling (gchar *src, gint srclen, const char *extension, gchar *target, gint targetlen, gint tail_len)
shadow_copy_sibling (const gchar *src_pristine, gint srclen, const char *extension, ShadowCopySiblingExt extopt, const gchar *target_pristine, gint targetlen)
{
guint16 *orig, *dest;
gboolean copy_result;
gint32 copy_error;
gchar *src = NULL;
gchar *target = NULL;
strcpy (src + srclen - tail_len, extension);
src = make_sibling_path (src_pristine, srclen, extension, extopt);
if (IS_PORTABILITY_CASE) {
gchar *file = mono_portability_find_file (src, TRUE);
if (file == NULL)
if (file == NULL) {
g_free (src);
return TRUE;
}
g_free (file);
} else if (!g_file_test (src, G_FILE_TEST_IS_REGULAR)) {
g_free (src);
return TRUE;
}
orig = g_utf8_to_utf16 (src, strlen (src), NULL, NULL, NULL);
strcpy (target + targetlen - tail_len, extension);
target = make_sibling_path (target_pristine, targetlen, extension, extopt);
dest = g_utf8_to_utf16 (target, strlen (target), NULL, NULL, NULL);
mono_w32file_delete (dest);
@ -1528,6 +1565,8 @@ shadow_copy_sibling (gchar *src, gint srclen, const char *extension, gchar *targ
g_free (orig);
g_free (dest);
g_free (src);
g_free (target);
return copy_result;
}
@ -1778,8 +1817,7 @@ char *
mono_make_shadow_copy (const char *filename, MonoError *oerror)
{
MonoError error;
gchar *sibling_source, *sibling_target;
gint sibling_source_len, sibling_target_len;
gint filename_len, shadow_len;
guint16 *orig, *dest;
guint32 attrs;
char *shadow;
@ -1867,20 +1905,15 @@ mono_make_shadow_copy (const char *filename, MonoError *oerror)
return NULL;
}
/* attempt to copy .mdb, .config if they exist */
sibling_source = g_strconcat (filename, ".config", NULL);
sibling_source_len = strlen (sibling_source);
sibling_target = g_strconcat (shadow, ".config", NULL);
sibling_target_len = strlen (sibling_target);
/* attempt to copy .mdb, .pdb and .config if they exist */
filename_len = strlen (filename);
shadow_len = strlen (shadow);
copy_result = shadow_copy_sibling (sibling_source, sibling_source_len, ".mdb", sibling_target, sibling_target_len, 7);
copy_result = shadow_copy_sibling (filename, filename_len, ".mdb", SHADOW_COPY_SIBLING_EXT_APPEND, shadow, shadow_len);
if (copy_result)
copy_result = shadow_copy_sibling (sibling_source, sibling_source_len, ".pdb", sibling_target, sibling_target_len, 11);
copy_result = shadow_copy_sibling (filename, filename_len, ".pdb", SHADOW_COPY_SIBLING_EXT_REPLACE, shadow, shadow_len);
if (copy_result)
copy_result = shadow_copy_sibling (sibling_source, sibling_source_len, ".config", sibling_target, sibling_target_len, 7);
g_free (sibling_source);
g_free (sibling_target);
copy_result = shadow_copy_sibling (filename, filename_len, ".config", SHADOW_COPY_SIBLING_EXT_APPEND, shadow, shadow_len);
if (!copy_result) {
g_free (shadow);

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

@ -1 +1 @@
7b32f0215e2c03fa50e84914f489cb6c407c599a
a83a637f7da9c270a6ec168f7a0e5bbf953749c1

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/e1ff841"
#define FULL_VERSION "explicit/85fb6bc"

22
mono/utils/mono-publib.h
View File

@ -48,7 +48,7 @@ typedef unsigned __int64 uint64_t;
#include <stdint.h>
#ifdef __GNUC__
#if defined (__clang__) || defined (__GNUC__)
#define MONO_API_EXPORT __attribute__ ((__visibility__ ("default")))
#else
#define MONO_API_EXPORT
@ -119,24 +119,27 @@ mono_set_allocator_vtable (MonoAllocatorVTable* vtable);
#define MONO_RT_CENTRINEL_SUPPRESS
#endif
#if defined (__clang__)
#if defined (__clang__) || defined (__GNUC__)
#define MONO_RT_EXTERNAL_ONLY \
__attribute__ ((__unavailable__ ("The mono runtime must not call this function"))) \
MONO_RT_CENTRINEL_SUPPRESS
#elif defined (__GNUC__)
#define MONO_RT_EXTERNAL_ONLY \
__attribute__ ((__error__ ("The mono runtime must not call this function"))) \
__attribute__ ((__deprecated__ ("The mono runtime must not call this function."))) \
MONO_RT_CENTRINEL_SUPPRESS
// This is used in place of configure gcc -Werror=deprecated-declarations:
// 1. To be portable across build systems.
// 2. configure is very sensitive to compiler flags; they break autoconf's probes.
// Though #2 can be mitigted by being late in configure.
#pragma GCC diagnostic error "-Wdeprecated-declarations" // Works with clang too.
#else
#define MONO_RT_EXTERNAL_ONLY MONO_RT_CENTRINEL_SUPPRESS
#endif /* __clang__ */
#endif /// clang or gcc
#else
#define MONO_RT_EXTERNAL_ONLY
#define MONO_RT_MANAGED_ATTR
#endif /* MONO_INSIDE_RUNTIME */
#ifdef __GNUC__
#if defined (__clang__) || defined (__GNUC__)
#define _MONO_DEPRECATED __attribute__ ((__deprecated__))
#elif defined (_MSC_VER)
#define _MONO_DEPRECATED __declspec (deprecated)
@ -149,4 +152,3 @@ mono_set_allocator_vtable (MonoAllocatorVTable* vtable);
MONO_END_DECLS
#endif /* __MONO_PUBLIB_H__ */

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
cc17d5718dfd92c1e21cd13370e2bb090008dd9f
e2d6a65ea51a600b2cdb3971297eb46c677709c8

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
b1f5822e3a00e6c7597f98e4b5f177018d56638f
a4ee18247026586b2a6e3b05ca8e0e29987b1fd9

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
f3748e2b65933a60ac113e282d177399a69ea14e
9564a4a2906a8d84ea0e6972b9a8c928532cba2c

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.147\n"
"Project-Id-Version: mono 5.10.0.154\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-01 08:38+0000\n"
"POT-Creation-Date: 2018-03-03 11:54+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 @@
6db44217511c3cd292c5dd25bd446b84a5b2a184
6479e2fe3576a239602fa18c463ced6906ad63ae