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

Imported Upstream version 5.14.0.134

Browse Source 
Former-commit-id: 364d53307062f14fb72cff247c89c8a312aa882d
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-06-17 08:19:26 +00:00
parent 413682e1ba
commit be71a71334
41 changed files with 37 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
d4eb8520ea86245b6c9dfeb83ac67a150e203d68 dc3d238eb5b32f3b9d95af57d0add50dae0ea152

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

@ -1 +1 @@
627ee29fcdc157195f80e189e7a08055bb955d15 82861fc1f4a9dedd06e51008d67c6b3b7b3ba1dd

2
external/bockbuild/bockbuild/environment.py vendored
View File

@ -12,7 +12,7 @@ class EnvironmentItem:
self.values = values self.values = values
def __str__(self): def __str__(self):
return self.joinchar.join(self.values) return os.path.expandvars(self.joinchar.join(self.values))
class Environment: class Environment:

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.14.0.125"; public const string MonoVersion = "5.14.0.134";
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";

1
mcs/class/System.ServiceProcess/System.ServiceProcess_test.dll.sources
View File

@ -1,5 +1,4 @@
../../test-helpers/NunitHelpers.cs ../../test-helpers/NunitHelpers.cs
System.ServiceProcess/ServiceBaseTest.cs System.ServiceProcess/ServiceBaseTest.cs
System.ServiceProcess/ServiceControllerTest.cs
System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
System.ServiceProcess/ServiceControllerPermissionTest.cs System.ServiceProcess/ServiceControllerPermissionTest.cs

1
mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerTest.cs.REMOVED.git-id
View File

@ -1 +0,0 @@
786fbd93e02b369570d1c9a004f41e495e59062b

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

@ -1 +1 @@
893f2ad93ea2470cc59e4960b51fe683c870f49b 638ba91f5fe73ff64471b71454b5168427471d68

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

@ -1 +1 @@
f35ac4fce686918e2e987e8acbcdc46d6a97764a ade73dcbf855d754472d484a4ffd634eba1bbced

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

@ -1 +1 @@
0e330bafa63f8bd145c7143962d19fd926e7fde0 0810625454c66e829c0287a87039095562557bf5

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

@ -1 +1 @@
03cb6ca187d31ea32322a164856c6a02753270c2 18f7c9a48f6ace23980e9438f0c214c2e26cff8c

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

@ -1 +1 @@
898a55885e4afcd1a4e9fccdc675db59b5f3127a f58f2f6586fa5c670a5bdb6ceb1808300e9df869

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

@ -1 +1 @@
0ee1bb501f0a53864ed03f061a829816b728d2a0 3d3486576cfdc1a7d9ac757b762b06d61a075109

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

@ -1 +1 @@
d0608d70a50226633cb2626c45365c7ec8d987f1 c110a47d73cb9303e73d4edc4d8ddee657846219

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

@ -1 +1 @@
893f2ad93ea2470cc59e4960b51fe683c870f49b 638ba91f5fe73ff64471b71454b5168427471d68

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

@ -1 +1 @@
f35ac4fce686918e2e987e8acbcdc46d6a97764a ade73dcbf855d754472d484a4ffd634eba1bbced

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

@ -1 +1 @@
0e330bafa63f8bd145c7143962d19fd926e7fde0 0810625454c66e829c0287a87039095562557bf5

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

@ -1 +1 @@
03cb6ca187d31ea32322a164856c6a02753270c2 18f7c9a48f6ace23980e9438f0c214c2e26cff8c

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

@ -1 +1 @@
898a55885e4afcd1a4e9fccdc675db59b5f3127a f58f2f6586fa5c670a5bdb6ceb1808300e9df869

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

@ -1 +1 @@
0ee1bb501f0a53864ed03f061a829816b728d2a0 3d3486576cfdc1a7d9ac757b762b06d61a075109

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

@ -1 +1 @@
d0608d70a50226633cb2626c45365c7ec8d987f1 c110a47d73cb9303e73d4edc4d8ddee657846219

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

@ -1 +1 @@
893f2ad93ea2470cc59e4960b51fe683c870f49b 638ba91f5fe73ff64471b71454b5168427471d68

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

@ -1 +1 @@
f35ac4fce686918e2e987e8acbcdc46d6a97764a ade73dcbf855d754472d484a4ffd634eba1bbced

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

@ -1 +1 @@
0e330bafa63f8bd145c7143962d19fd926e7fde0 0810625454c66e829c0287a87039095562557bf5

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

@ -1 +1 @@
03cb6ca187d31ea32322a164856c6a02753270c2 18f7c9a48f6ace23980e9438f0c214c2e26cff8c

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

@ -1 +1 @@
898a55885e4afcd1a4e9fccdc675db59b5f3127a f58f2f6586fa5c670a5bdb6ceb1808300e9df869

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

@ -1 +1 @@
0ee1bb501f0a53864ed03f061a829816b728d2a0 3d3486576cfdc1a7d9ac757b762b06d61a075109

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

@ -1 +1 @@
d0608d70a50226633cb2626c45365c7ec8d987f1 c110a47d73cb9303e73d4edc4d8ddee657846219

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

@ -1 +1 @@
07ed49b2376a13e417f121868ff95c8a890ca137 9f49eda52fe1c7559833769a8e1bfc7ebc7fa5dd

3
mono/metadata/image-internals.h
View File

@ -20,7 +20,4 @@ mono_image_load_module_checked (MonoImage *image, int idx, MonoError *error);
MonoImage * MonoImage *
mono_image_open_a_lot (const char *fname, MonoImageOpenStatus *status, gboolean refonly, gboolean load_from_context); mono_image_open_a_lot (const char *fname, MonoImageOpenStatus *status, gboolean refonly, gboolean load_from_context);
gboolean
mono_is_problematic_image (MonoImage *image);
#endif /* __MONO_METADATA_IMAGE_INTERNALS_H__ */ #endif /* __MONO_METADATA_IMAGE_INTERNALS_H__ */

30
mono/metadata/image.c
View File

@ -1286,8 +1286,8 @@ hash_guid (const char *str)
return h; return h;
} }
gboolean static gboolean
mono_is_problematic_image (MonoImage *image) is_problematic_image (MonoImage *image)
{ {
int h = hash_guid (image->guid); int h = hash_guid (image->guid);
@ -1360,7 +1360,7 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
if (!mono_image_load_cli_data (image)) if (!mono_image_load_cli_data (image))
goto invalid_image; goto invalid_image;
if (!image->ref_only && mono_is_problematic_image (image)) { if (!image->ref_only && is_problematic_image (image)) {
if (image->load_from_context) { if (image->load_from_context) {
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Loading problematic image %s", image->name); mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Loading problematic image %s", image->name);
} else { } else {
@ -1682,18 +1682,6 @@ mono_image_open_a_lot (const char *fname, MonoImageOpenStatus *status, gboolean
mono_images_lock (); mono_images_lock ();
image = g_hash_table_lookup (loaded_images, absfname); image = g_hash_table_lookup (loaded_images, absfname);
if (image) { // Image already loaded if (image) { // Image already loaded
if (!load_from_context && mono_is_problematic_image (image)) {
// If we previously loaded a problematic image, don't
// return it if we're not in LoadFrom context.
//
// Note: this has an interaction with
// mono_problematic_image_reprobe - at that point we
// have a problematic image opened, but we don't want
// to see it again when we go searching for an image
// to load.
mono_images_unlock ();
return NULL;
}
g_assert (image->is_module_handle); g_assert (image->is_module_handle);
if (image->has_entry_point && image->ref_count == 0) { if (image->has_entry_point && image->ref_count == 0) {
/* Increment reference count on images loaded outside of the runtime. */ /* Increment reference count on images loaded outside of the runtime. */
@ -1764,18 +1752,6 @@ mono_image_open_a_lot (const char *fname, MonoImageOpenStatus *status, gboolean
g_free (absfname); g_free (absfname);
if (image) { // Image already loaded if (image) { // Image already loaded
if (!load_from_context && mono_is_problematic_image (image)) {
// If we previously loaded a problematic image, don't
// return it if we're not in LoadFrom context.
//
// Note: this has an interaction with
// mono_problematic_image_reprobe - at that point we
// have a problematic image opened, but we don't want
// to see it again when we go searching for an image
// to load.
mono_images_unlock ();
return NULL;
}
mono_image_addref (image); mono_image_addref (image);
mono_images_unlock (); mono_images_unlock ();
return image; return image;

1
mono/metadata/profiler.c
View File

@ -900,6 +900,7 @@ update_callback (volatile gpointer *location, gpointer new_, volatile gint32 *co
void \ void \
mono_profiler_raise_ ## name params \ mono_profiler_raise_ ## name params \
{ \ { \
if (!mono_profiler_state.startup_done) return; \
for (MonoProfilerHandle h = mono_profiler_state.profilers; h; h = h->next) { \ for (MonoProfilerHandle h = mono_profiler_state.profilers; h; h = h->next) { \
MonoProfiler ## type ## Callback cb = h->name ## _cb; \ MonoProfiler ## type ## Callback cb = h->name ## _cb; \
if (cb) \ if (cb) \

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/47fe82d" #define FULL_VERSION "explicit/36fe145"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
5b627d43a52c08f6d5eaceddcc04894875f39fd9 022be62bca96139cc26142102fd4cd0ed883cfa7

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
65d2678bdb875908a9ac177f6a37418d46e66cfb ab19db700ebdc7c941ebec48e4353e7d89ceeb2b

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
6f3dabb7d683c953fe72aa681c6796359ea8d72e 0ec2c4336601c2ea6ee7c91f4ec771dd01d156e9

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 5.14.0.125\n" "Project-Id-Version: mono 5.14.0.134\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-06-07 17:45+0000\n" "POT-Creation-Date: 2018-06-17 08:05+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 @@
5f63b8c4b78b5f85652a26008736970687554f31 2b30e034db8e5c6ba06fe48af9a39a78e0fa52fc