Author: msierad
Date: 2007-01-02 10:36:38 -0500 (Tue, 02 Jan 2007)
New Revision: 70367

Modified:
   
trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/AssemblyLoadInfo.cs
   trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/ChangeLog
Log:
2007-01-02  Marek Sieradzki  <[EMAIL PROTECTED]>

        * AssemblyLoadInfo.cs: Used AssemblyName constructor instead of
        parsing it here.



Modified: 
trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/AssemblyLoadInfo.cs
===================================================================
--- 
trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/AssemblyLoadInfo.cs
 2007-01-02 15:07:35 UTC (rev 70366)
+++ 
trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/AssemblyLoadInfo.cs
 2007-01-02 15:36:38 UTC (rev 70367)
@@ -47,37 +47,9 @@
                
                public AssemblyLoadInfo (string assemblyName, string className)
                {
-                       string name, version, culture, publicKeyToken;
-                       string[] whole, versionArr, cultureArr, 
publicKeyTokenArr;
-                       name = null;
-                       version = null;
-                       culture = null;
-                       publicKeyToken = null;
-               
-                       whole = assemblyName.Split (',');
-                       
-                       if (whole.Length < 4)
-                               throw new ArgumentException ("Invalid assembly 
name string.");
-                       
-                       name = whole [0].Trim ();
-                       
-                       versionArr = (whole [1].Trim ()).Split ('=');
-                       if (versionArr.Length != 2)
-                               throw new ArgumentException ("Invalid 
version.");
-                       version = versionArr [1];
-
-                       cultureArr = (whole [2].Trim ()).Split ('=');
-                       if (cultureArr.Length != 2)
-                               throw new ArgumentException ("Invalid 
culture.");
-                       culture = cultureArr [1];
-
-                       publicKeyTokenArr = (whole [1].Trim ()).Split ('=');
-                       if (publicKeyTokenArr.Length != 2)
-                               throw new ArgumentException ("Invalid public 
key token.");
-                       publicKeyToken = publicKeyTokenArr [1];
-                       
-                       
-                       SetAssemblyName (LoadInfoType.AssemblyName, null, name, 
version, culture, publicKeyToken, className);
+                       this.assemblyName = new AssemblyName (assemblyName);
+                       this.className = className;
+                       infoType = LoadInfoType.AssemblyName;
                }
                
                public AssemblyLoadInfo (LoadInfoType loadInfoType, string 
filename, string name,

Modified: 
trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/ChangeLog   
2007-01-02 15:07:35 UTC (rev 70366)
+++ trunk/mcs/class/Microsoft.Build.Framework/Mono.XBuild.Framework/ChangeLog   
2007-01-02 15:36:38 UTC (rev 70367)
@@ -1,3 +1,8 @@
+2007-01-02  Marek Sieradzki  <[EMAIL PROTECTED]>
+
+       * AssemblyLoadInfo.cs: Used AssemblyName constructor instead of
+       parsing it here.
+
 2006-12-18  Marek Sieradzki  <[EMAIL PROTECTED]>
 
        * AssemblyLoadInfo.cs: Added note why this file shouldn't be included

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

Reply via email to