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

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mcs/tools/mkbundle/mkbundle.cs
View File

@ -1110,6 +1110,14 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
}
if (error != null) {
Console.Error.WriteLine ("Failure to load i18n assemblies, the following directories were searched for the assemblies:");
foreach (var path in link_paths){
Console.Error.WriteLine (" Path: " + path);
}
if (custom_mode){
Console.WriteLine ("In Custom mode, you need to provide the directory to lookup assemblies from using -L");
}
Error ("Couldn't load one or more of the i18n assemblies: " + error);
Environment.Exit (1);
}
@ -1183,7 +1191,12 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
Assembly a = null;
try {
if (!quiet)
Console.WriteLine ("Attempting to load assembly: {0}", assembly);
a = universe.LoadFile (assembly);
if (!quiet)
Console.WriteLine ("Assembly {0} loaded successfully.", assembly);
} catch (FileNotFoundException){
Error ($"Cannot find assembly `{assembly}'");
} catch (IKVM.Reflection.BadImageFormatException f) {
@ -1206,6 +1219,8 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
string total_log = "";
foreach (string dir in link_paths){
string full_path = Path.Combine (dir, assembly);
if (!quiet)
Console.WriteLine ("Attempting to load assembly from: " + full_path);
if (!assembly.EndsWith (".dll") && !assembly.EndsWith (".exe"))
full_path += ".dll";