Author: zoltan
Date: 2007-09-14 10:49:19 -0400 (Fri, 14 Sep 2007)
New Revision: 85807

Modified:
   trunk/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
   trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog
Log:
2007-09-14  Zoltan Varga  <[EMAIL PROTECTED]>

        * AssemblyBuilder.cs (DefineVersionInfoResource): Allow the arguments 
to be
        null. Fixes #82832.


Modified: trunk/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs    
2007-09-14 14:43:29 UTC (rev 85806)
+++ trunk/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs    
2007-09-14 14:49:19 UTC (rev 85807)
@@ -521,11 +521,11 @@
                         */
 
                        version_res = new Win32VersionResource (1, 0);
-                       version_res.ProductName = product;
-                       version_res.ProductVersion = productVersion;
-                       version_res.CompanyName = company;
-                       version_res.LegalCopyright = copyright;
-                       version_res.LegalTrademarks = trademark;
+                       version_res.ProductName = product != null ? product : " 
";
+                       version_res.ProductVersion = productVersion != null ? 
productVersion : " ";
+                       version_res.CompanyName = company != null ? company : " 
";
+                       version_res.LegalCopyright = copyright != null ? 
copyright : " ";
+                       version_res.LegalTrademarks = trademark != null ? 
trademark : " ";
                }
 
                /* 

Modified: trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog     2007-09-14 
14:43:29 UTC (rev 85806)
+++ trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog     2007-09-14 
14:49:19 UTC (rev 85807)
@@ -1,3 +1,8 @@
+2007-09-14  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * AssemblyBuilder.cs (DefineVersionInfoResource): Allow the arguments 
to be
+       null. Fixes #82832.
+
 2007-09-11  Jb Evain  <[EMAIL PROTECTED]>
 
        * DynamicMethod.cs: store the owner of the DynamicMethod.

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to