diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2004-09-09 12:36:27 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2004-09-09 12:36:27 +0400 |
| commit | c86617e74bf7da9d1d4ad326aa460fa012992170 (patch) | |
| tree | 91929e6b0d85891c9a1201d09256eebe6d1fdf50 | |
| parent | f3bd1c213621e89a9e6686c699c781c8249fbe08 (diff) | |
Merge from HEAD.
svn path=/branches/mono-1-0/mcs/; revision=33630
| -rw-r--r-- | mcs/class/corlib/System.Reflection.Emit/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog index 0f117fa51cf..1efc626a916 100644 --- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog +++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog @@ -1,3 +1,8 @@ +2004-09-09 Zoltan Varga <vargaz@freemail.hu> + + * ModuleBuilder.cs: Save the main module of the assembly even if it is + transient. + 2004-08-13 Sebastien Pouliot <sebastien@ximian.com> * AssemblyBuilder.cs: (Partly) Fix delay-signing issue (#56621) when diff --git a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs index a7d4888d6d7..eb958b22b7f 100644 --- a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs @@ -624,9 +624,8 @@ namespace System.Reflection.Emit { internal void Save () { - if (transient) + if (transient && !is_main) return; - if ((global_type != null) && (global_type_created == null)) global_type_created = global_type.CreateType (); |