[xbuild] Rename method to make it more consistent.

* Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
(GetAssemblyNameFromFile): Rename to ..
(TryGetAssemblyNameFromFile): .. this, to make it consistent with
the similar method TryGetAssemblyNameFromFullName .
Track api changes.
* Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs:
Track api changes.

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..b5d8672c580b062d17cea6dfafab545605ea6a5d 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)

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
index f83685f6b810c27695da8e65bd0a35c5dd05ac61..f1d20ab11f997140fffd714a06db897f42d67c26 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
@@ -212,8 +212,8 @@ namespace Microsoft.Build.Tasks {
                                        resolved = assembly_resolver.ResolveGacReference (item, specific_version);
                                } else if (String.Compare (spath, "{RawFileName}") == 0) {
                                        //FIXME: identify assembly names, as extract the name, and try with that?
-                                       AssemblyName aname = assembly_resolver.GetAssemblyNameFromFile (item.ItemSpec);
-                                       if (aname != null)
+                                       AssemblyName aname;
+                                       if (assembly_resolver.TryGetAssemblyNameFromFile (item.ItemSpec, out aname))
                                                resolved = assembly_resolver.GetResolvedReference (item, item.ItemSpec, aname, true,
                                                                SearchPath.RawFileName);
                                } else if (String.Compare (spath, "{CandidateAssemblyFiles}") == 0) {
@@ -280,8 +280,8 @@ namespace Microsoft.Build.Tasks {
                                LogWithPrecedingNewLine (MessageImportance.Low, "Primary Reference from AssemblyFiles {0}", item.ItemSpec);
                                string copy_local;
 
-                               AssemblyName aname = assembly_resolver.GetAssemblyNameFromFile (item.ItemSpec);
-                               if (aname == null) {
+                               AssemblyName aname;
+                               if (!assembly_resolver.TryGetAssemblyNameFromFile (item.ItemSpec, out aname)) {
                                        Log.LogWarning ("Reference '{0}' not resolved", item.ItemSpec);
                                        assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
                                        continue;