Imported Upstream version 5.14.0.100
Former-commit-id: 17d59e68a4be951d03b08a81c8da615569cdb00c
This commit is contained in:
parent
300ff421ef
commit
c30f196079
@ -1 +1 @@
|
||||
5df36bf6767b4dc7856dd80dcc0b9b48d09fea80
|
||||
8dde0017e6f63b3054466a77bab8ef5722a54870
|
@ -1 +1 @@
|
||||
5fc828dca3fdf41143cc1f3b6afabb8ebbc1ce43
|
||||
43264e0ee4e38c606242bd6d2a3541ca4b06049f
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.14.0.93";
|
||||
public const string MonoVersion = "5.14.0.100";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -10,7 +10,9 @@ namespace MonoTests.System.Threading.Tasks
|
||||
{
|
||||
[TestFixture]
|
||||
public class ThreadPrincipalTests
|
||||
{
|
||||
{
|
||||
|
||||
#if !MONOTOUCH // Uses LogicalCallContext
|
||||
[Test]
|
||||
public void PrincipalFlowsToAsyncTask ()
|
||||
{
|
||||
@ -18,6 +20,7 @@ namespace MonoTests.System.Threading.Tasks
|
||||
* where SynchronizationContext is set (e.g. Xamarin.iOS) */
|
||||
Assert.IsTrue (Task.Run (async () => await _PrincipalFlowsToAsyncTask ()).Wait (5000));
|
||||
}
|
||||
#endif
|
||||
|
||||
public async Task _PrincipalFlowsToAsyncTask ()
|
||||
{
|
||||
|
@ -1 +1 @@
|
||||
e0c31033cb234fbe245111fd514aa92d8fdf2932
|
||||
387874c33279821ecf4c3c65c4b6be0fbf4530ca
|
@ -1 +1 @@
|
||||
0918023fa07a69ea21bf62858b5e96077aa3691c
|
||||
94a0e366dc7a3a32249f013acdb108113871c9f0
|
@ -1 +1 @@
|
||||
0f0a171716a2a2c26c59478c41d1810394a93ca6
|
||||
b29ac60ca35d1e9dae87583d2b7183dd9bc0e356
|
@ -1 +1 @@
|
||||
b79a2601bb345aa58d09bd453fc59773b13e326c
|
||||
dce6045ebed689ee7cc0cf98225aa3474f3eb3d8
|
@ -1 +1 @@
|
||||
e8a3d67696f746c7f1053bee56d7678f26e7ad44
|
||||
fa787623a7ef5d34d480976111f5791b0d92c4a8
|
@ -1 +1 @@
|
||||
70e683ec01f53c43698314560eea4bb57c2aa44d
|
||||
80f27b413640ff25223e654724f276a4c6925abc
|
@ -1 +1 @@
|
||||
dbf109dbc245a0e693d2ded6244fa5929d0055be
|
||||
ffde4cb2ef12a7462c5b6e336ae8c5e27f8b79ed
|
@ -1 +1 @@
|
||||
e0c31033cb234fbe245111fd514aa92d8fdf2932
|
||||
387874c33279821ecf4c3c65c4b6be0fbf4530ca
|
@ -1 +1 @@
|
||||
0918023fa07a69ea21bf62858b5e96077aa3691c
|
||||
94a0e366dc7a3a32249f013acdb108113871c9f0
|
@ -1 +1 @@
|
||||
0f0a171716a2a2c26c59478c41d1810394a93ca6
|
||||
b29ac60ca35d1e9dae87583d2b7183dd9bc0e356
|
@ -1 +1 @@
|
||||
b79a2601bb345aa58d09bd453fc59773b13e326c
|
||||
dce6045ebed689ee7cc0cf98225aa3474f3eb3d8
|
@ -1 +1 @@
|
||||
e8a3d67696f746c7f1053bee56d7678f26e7ad44
|
||||
fa787623a7ef5d34d480976111f5791b0d92c4a8
|
@ -1 +1 @@
|
||||
70e683ec01f53c43698314560eea4bb57c2aa44d
|
||||
80f27b413640ff25223e654724f276a4c6925abc
|
@ -1 +1 @@
|
||||
dbf109dbc245a0e693d2ded6244fa5929d0055be
|
||||
ffde4cb2ef12a7462c5b6e336ae8c5e27f8b79ed
|
@ -1 +1 @@
|
||||
e0c31033cb234fbe245111fd514aa92d8fdf2932
|
||||
387874c33279821ecf4c3c65c4b6be0fbf4530ca
|
@ -1 +1 @@
|
||||
0918023fa07a69ea21bf62858b5e96077aa3691c
|
||||
94a0e366dc7a3a32249f013acdb108113871c9f0
|
@ -1 +1 @@
|
||||
0f0a171716a2a2c26c59478c41d1810394a93ca6
|
||||
b29ac60ca35d1e9dae87583d2b7183dd9bc0e356
|
@ -1 +1 @@
|
||||
b79a2601bb345aa58d09bd453fc59773b13e326c
|
||||
dce6045ebed689ee7cc0cf98225aa3474f3eb3d8
|
@ -1 +1 @@
|
||||
e8a3d67696f746c7f1053bee56d7678f26e7ad44
|
||||
fa787623a7ef5d34d480976111f5791b0d92c4a8
|
@ -1 +1 @@
|
||||
70e683ec01f53c43698314560eea4bb57c2aa44d
|
||||
80f27b413640ff25223e654724f276a4c6925abc
|
@ -1 +1 @@
|
||||
dbf109dbc245a0e693d2ded6244fa5929d0055be
|
||||
ffde4cb2ef12a7462c5b6e336ae8c5e27f8b79ed
|
@ -1 +1 @@
|
||||
9f49eda52fe1c7559833769a8e1bfc7ebc7fa5dd
|
||||
07ed49b2376a13e417f121868ff95c8a890ca137
|
@ -20,4 +20,7 @@ mono_image_load_module_checked (MonoImage *image, int idx, MonoError *error);
|
||||
MonoImage *
|
||||
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__ */
|
||||
|
@ -1286,8 +1286,8 @@ hash_guid (const char *str)
|
||||
return h;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
is_problematic_image (MonoImage *image)
|
||||
gboolean
|
||||
mono_is_problematic_image (MonoImage *image)
|
||||
{
|
||||
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))
|
||||
goto invalid_image;
|
||||
|
||||
if (!image->ref_only && is_problematic_image (image)) {
|
||||
if (!image->ref_only && mono_is_problematic_image (image)) {
|
||||
if (image->load_from_context) {
|
||||
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Loading problematic image %s", image->name);
|
||||
} else {
|
||||
@ -1682,6 +1682,18 @@ mono_image_open_a_lot (const char *fname, MonoImageOpenStatus *status, gboolean
|
||||
mono_images_lock ();
|
||||
image = g_hash_table_lookup (loaded_images, absfname);
|
||||
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);
|
||||
if (image->has_entry_point && image->ref_count == 0) {
|
||||
/* Increment reference count on images loaded outside of the runtime. */
|
||||
@ -1752,6 +1764,18 @@ mono_image_open_a_lot (const char *fname, MonoImageOpenStatus *status, gboolean
|
||||
g_free (absfname);
|
||||
|
||||
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_images_unlock ();
|
||||
return image;
|
||||
|
@ -1 +1 @@
|
||||
18bf6a78880a7daf012ef4980fccad0a409c471d
|
||||
931957deea18077f13d2209cdd0ae49ec613284b
|
@ -1 +1 @@
|
||||
5af3c5156272f2514967cfc39847525b1645ccd6
|
||||
34ee5e7416c3e346e3815a79e9dc208430fb4947
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/0985509"
|
||||
#define FULL_VERSION "explicit/46e3bd5"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
80d743d6111377b7ec2c45f8714f8a12bc4359b5
|
||||
83af2976a93b0983251f67c0ea05e5287c80e184
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
1fc022089fba35a14e3acc1570832de14b8a3eb7
|
||||
f1f65123a870f0cedc5c52aa1d95d1b55de05f15
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
0f600dd8a8aefd29bf4464227563f9c6c33f35d6
|
||||
96d403b13912cb1f80d597268bd150ef3450f798
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.14.0.93\n"
|
||||
"Project-Id-Version: mono 5.14.0.100\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-05-23 08:41+0000\n"
|
||||
"POT-Creation-Date: 2018-05-24 08:55+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
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
6c0693507274ad01db54288b85fc31df896fc51c
|
||||
8af8d403183ca79d00c207dd9a703ba567d6b6b2
|
Loading…
x
Reference in New Issue
Block a user