[xbuild] Fix assembly name comparison when resolving references.

[mono.git] / mcs / class / Microsoft.Build.Tasks / Microsoft.Build.Tasks / AssemblyResolver.cs

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 8b51d76480ddded85b94a5db8b40aab05894f86d..143b005366fa1ea1bbdf9a8e6dd810b3188c1626 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
@@ -186,8 +186,8 @@ namespace Microsoft.Build.Tasks {
                ResolvedReference ResolveReferenceForPath (string filename, ITaskItem reference, AssemblyName aname,
                                        string error_message, SearchPath spath, bool specific_version)
                {
-                       AssemblyName found_aname = GetAssemblyNameFromFile (filename);
-                       if (found_aname == null) {
+                       AssemblyName found_aname;
+                       if (!TryGetAssemblyNameFromFile (filename, out found_aname)) {
                                if (error_message != null)
                                        log.LogMessage (MessageImportance.Low, error_message);
                                return null;
@@ -209,8 +209,8 @@ namespace Microsoft.Build.Tasks {
                {
                        TargetFrameworkAssemblies gac_asm = new TargetFrameworkAssemblies (directory);
                        foreach (string file in Directory.GetFiles (directory, "*.dll")) {
-                               AssemblyName aname = GetAssemblyNameFromFile (file);
-                               if (aname != null)
+                               AssemblyName aname;
+                               if (TryGetAssemblyNameFromFile (file, out aname))
                                        gac_asm.NameToAssemblyNameCache [aname.Name] =
                                                new KeyValuePair<AssemblyName, string> (aname, file);
                        }
@@ -312,9 +312,9 @@ namespace Microsoft.Build.Tasks {
                                                SearchPath.HintPath, specific_version);
                }
 
-               public AssemblyName GetAssemblyNameFromFile (string filename)
+               public bool TryGetAssemblyNameFromFile (string filename, out AssemblyName aname)
                {
-                       AssemblyName aname = null;
+                       aname = null;
                        filename = Path.GetFullPath (filename);
                        try {
                                aname = AssemblyName.GetAssemblyName (filename);
@@ -326,7 +326,7 @@ namespace Microsoft.Build.Tasks {
                                                filename);
                        }
 
-                       return aname;
+                       return aname != null;
                }
 
                bool TryGetAssemblyNameFromFullName (string full_name, out AssemblyName aname)
@@ -369,11 +369,8 @@ namespace Microsoft.Build.Tasks {
                        bool a_is_empty = (a_bytes == null || a_bytes.Length == 0);
                        bool b_is_empty = (b_bytes == null || b_bytes.Length == 0);
 
-                       if (a_is_empty && b_is_empty)
-                               return true;
-
                        if (a_is_empty || b_is_empty)
-                               return false;
+                               return true;
 
                        for (int i = 0; i < a_bytes.Length; i++)
                                if (a_bytes [i] != b_bytes [i])