2004-05-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>

[mono.git] / mono / metadata / object.c

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 86b96b32a85430c60fe6ae0ca0fe331d471ab106..932a95ad1e384b62e3c052513d3fcb5a30b9fc5d 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -1436,8 +1436,16 @@ mono_runtime_exec_main (MonoMethod *method, MonoArray *args, MonoObject **exc)
 
        domain = mono_object_domain (args);
        if (!domain->entry_assembly) {
+               gchar *str;
+               gchar *config_suffix;
+
                domain->entry_assembly = method->klass->image->assembly;
                ves_icall_System_AppDomainSetup_InitAppDomainSetup (domain->setup);
+               config_suffix = g_strconcat (domain->entry_assembly->aname.name, ".exe.config", NULL);
+               str = g_build_filename (domain->entry_assembly->basedir, config_suffix, NULL);
+               g_free (config_suffix);
+               domain->setup->configuration_file = mono_string_new (domain, str);
+               g_free (str);
        }
 
        /* FIXME: check signature of method */