* AssemblyResolver.cs (PopulateTargetFrameworkAssemblies):

Handle invalid dll, add a null check.

svn path=/trunk/mcs/; revision=158064

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
index d3568147ba47a95ae0fcbd5f0b92bd4ba5ea380e..9298ba06891dae1ae2b120c2acc759f923d2f105 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
@@ -190,8 +190,9 @@ namespace Microsoft.Build.Tasks {
                        TargetFrameworkAssemblies gac_asm = new TargetFrameworkAssemblies (directory);
                        foreach (string file in Directory.GetFiles (directory, "*.dll")) {
                                AssemblyName aname = GetAssemblyNameFromFile (file);
-                               gac_asm.NameToAssemblyNameCache [aname.Name] =
-                                       new KeyValuePair<AssemblyName, string> (aname, file);
+                               if (aname != null)
+                                       gac_asm.NameToAssemblyNameCache [aname.Name] =
+                                               new KeyValuePair<AssemblyName, string> (aname, file);
                        }
 
                        return gac_asm;

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
index 354d0dc1f908defc93c2fce7f56b1a15f7cb08fa..d74f25d7c972a3d884230ff7cc4a51224b867613 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-28  Ankit Jain  <jankit@novell.com>
+
+       * AssemblyResolver.cs (PopulateTargetFrameworkAssemblies):
+       Handle invalid dll, add a null check.
+
 2010-04-10  Ankit Jain  <jankit@novell.com>
 
        * GetFrameworkPath.cs (FrameworkVersion40Path): New.