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

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,14 +1082,14 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
static void LoadLocalizedAssemblies (List<string> assemblies)
{
var other = i18n.Select (x => "I18N." + x + (x.Length > 0 ? "." : "") + "dll");
string error = null;
bool error = false;
foreach (string name in other) {
try {
Assembly a = LoadAssembly (name);
if (a == null) {
error = "Failed to load " + name;
error = true;
continue;
}
@ -1105,8 +1105,8 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
}
}
if (error != null) {
Error ("Couldn't load one or more of the i18n assemblies: " + error);
if (error) {
Error ("Couldn't load one or more of the i18n assemblies.");
Environment.Exit (1);
}
}
@ -1159,7 +1159,7 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
Assembly a = universe.LoadFile (path);
foreach (AssemblyName an in a.GetReferencedAssemblies ()) {
a = universe.Load (an.FullName);
LoadAssembly (an.FullName);
if (!QueueAssembly (files, a.CodeBase))
return false;
}
@ -1221,6 +1221,7 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
static void Error (string msg, params object [] args)
{
Console.Error.WriteLine ("ERROR: {0}", string.Format (msg, args));
throw new Exception ();
Environment.Exit (1);
}