Imported Upstream version 4.8.0.371

Former-commit-id: 1cedda3b6a8e480191a7a40a8dc33eb078fba58b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-28 21:01:12 +00:00
parent 62edeef69b
commit 069517201b
48 changed files with 181 additions and 50 deletions

View File

@ -1071,9 +1071,11 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
}
}
if (error)
if (error) {
Error ("Couldn't load one or more of the assemblies.");
Environment.Exit (1);
}
return assemblies;
}
@ -1103,8 +1105,10 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
}
}
if (error)
if (error) {
Error ("Couldn't load one or more of the i18n assemblies.");
Environment.Exit (1);
}
}