X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Tasks%2FMicrosoft.Build.Tasks%2FAssemblyResolver.cs;h=143b005366fa1ea1bbdf9a8e6dd810b3188c1626;hb=c5c194098baf1d1478473bf3097c85288281c2f7;hp=8c21891659c4da7501ca4bccfd032dcd282257e3;hpb=92f60fbffa1187be7dedf6a9286b5c35b2082815;p=mono.git

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 8c21891659c..143b005366f 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
@@ -121,7 +121,10 @@ namespace Microsoft.Build.Tasks {
 			if (!Directory.Exists (framework_dir))
 				return null;
 			
-			AssemblyName key_aname = new AssemblyName (reference.ItemSpec);
+			AssemblyName key_aname;
+			if (!TryGetAssemblyNameFromFullName (reference.ItemSpec, out key_aname))
+				return null;
+
 			TargetFrameworkAssemblies gac_asm;
 			if (!target_framework_cache.TryGetValue (framework_dir, out gac_asm)) {
 				// fill gac_asm
@@ -160,7 +163,9 @@ namespace Microsoft.Build.Tasks {
 
 			// Try as a filename
 			string path = Path.GetFullPath (Path.Combine (directory, filename));
-			AssemblyName aname = specific_version ? new AssemblyName (reference.ItemSpec) : null;
+			AssemblyName aname = null;
+			if (specific_version && !TryGetAssemblyNameFromFullName (reference.ItemSpec, out aname))
+				return null;
 
 			ResolvedReference resolved_ref = ResolveReferenceForPath (path, reference, aname, null, SearchPath.Directory, specific_version);
 			if (resolved_ref != null)
@@ -181,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;
@@ -204,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);
 			}
@@ -215,7 +220,10 @@ namespace Microsoft.Build.Tasks {
 
 		public ResolvedReference ResolveGacReference (ITaskItem reference, bool specific_version)
 		{
-			AssemblyName name = new AssemblyName (reference.ItemSpec);
+			AssemblyName name;
+			if (!TryGetAssemblyNameFromFullName (reference.ItemSpec, out name))
+				return null;
+
 			if (!gac.ContainsKey (name.Name)) {
 				LogSearchMessage ("Considered {0}, but could not find in the GAC.",
 						reference.ItemSpec);
@@ -264,7 +272,11 @@ namespace Microsoft.Build.Tasks {
 				return null;
 			}
 
-			ResolvedReference rr = GetResolvedReference (reference, pkg.File, new AssemblyName (pkg.FullName),
+			AssemblyName aname;
+			if (!TryGetAssemblyNameFromFullName (pkg.FullName, out aname))
+				return null;
+
+			ResolvedReference rr = GetResolvedReference (reference, pkg.File, aname,
 						false, SearchPath.PkgConfig);
 			rr.FoundInSearchPathAsString = String.Format ("{{PkgConfig}} provided by package named {0}",
 							pkg.ParentPackage.Name);
@@ -291,14 +303,18 @@ namespace Microsoft.Build.Tasks {
 				return null;
 			}
 
-			return ResolveReferenceForPath (hintpath, reference, new AssemblyName (reference.ItemSpec),
+			AssemblyName aname;
+			if (!TryGetAssemblyNameFromFullName (reference.ItemSpec, out aname))
+				return null;
+
+			return ResolveReferenceForPath (hintpath, reference, aname,
 						String.Format ("File at HintPath {0}, is either an invalid assembly or the file does not exist.", hintpath),
 						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);
@@ -310,7 +326,19 @@ namespace Microsoft.Build.Tasks {
 						filename);
 			}
 
-			return aname;
+			return aname != null;
+		}
+
+		bool TryGetAssemblyNameFromFullName (string full_name, out AssemblyName aname)
+		{
+			aname = null;
+			try {
+				aname = new AssemblyName (full_name);
+			} catch (FileLoadException) {
+				LogSearchMessage ("Considered '{0}' as an assembly name, but it is invalid.", full_name);
+			}
+
+			return aname != null;
 		}
 
 		internal static bool AssemblyNamesCompatible (AssemblyName a, AssemblyName b, bool specificVersion)
@@ -341,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])