diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2020-08-15 07:18:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-15 07:18:40 +0300 |
| commit | 0161714a5adbb8738f1d6227662b6b5aadf90405 (patch) | |
| tree | a32a9688ab0980acbd22ac9fa6c1756d4aa6c601 | |
| parent | 442aeedc5efa9dd5860327680488671840733d8c (diff) | |
[mono] Make bundle filename changes netcore-only (#20251)
cc: @thaystg
Co-authored-by: CoffeeFlux <CoffeeFlux@users.noreply.github.com>
| -rw-r--r-- | mono/metadata/assembly.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c index ccf05748c9e..34cd398cd90 100644 --- a/mono/metadata/assembly.c +++ b/mono/metadata/assembly.c @@ -2500,8 +2500,12 @@ mono_assembly_open_from_bundle (MonoAssemblyLoadContext *alc, const char *filena name = g_path_get_basename (filename); for (i = 0; !image && bundles [i]; ++i) { if (strcmp (bundles [i]->name, is_satellite ? filename : name) == 0) { +#ifdef ENABLE_NETCORE // Since bundled images don't exist on disk, don't give them a legit filename image = mono_image_open_from_data_internal (alc, (char*)bundles [i]->data, bundles [i]->size, FALSE, status, refonly, FALSE, name, NULL); +#else + image = mono_image_open_from_data_internal (alc, (char*)bundles [i]->data, bundles [i]->size, FALSE, status, refonly, FALSE, name, name); +#endif break; } } |