[MMP] Allow resolving assemblies to the ones passed in command line args

This reverts the recursive directory search commit and allows resolving assemblies from the ones passed.
xamarin · Feb 22, 2018 · 8aafb2e · 8aafb2e
1 parent afd33cb
commit 8aafb2e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/tools/common/Application.cs b/tools/common/Application.cs
@@ -524,10 +524,10 @@ public void RunRegistrar ()
 			var resolver = new PlatformResolver () {
 				FrameworkDirectory = Driver.GetPlatformFrameworkDirectory (this),
 				RootDirectory = Path.GetDirectoryName (RootAssembly),
-			};
 #if MMP
-			resolver.RecursiveSearchDirectories.AddRange (Driver.RecursiveSearchDirectories);
+				CommandLineAssemblies = RootAssemblies,
 #endif
+			};
 
 			if (Platform == ApplePlatform.iOS || Platform == ApplePlatform.MacOSX) {
 				if (Is32Build) {

diff --git a/tools/common/CoreResolver.cs b/tools/common/CoreResolver.cs
@@ -102,17 +102,17 @@ public virtual AssemblyDefinition Load (string fileName)
 			return assembly;
 		}
 
-		protected AssemblyDefinition SearchDirectory (string name, string directory, string extension = ".dll", bool recursive = false)
+		protected AssemblyDefinition SearchDirectory (string name, string directory, string extension = ".dll")
 		{
-			var file = DirectoryGetFile (directory, name + extension, recursive);
+			var file = DirectoryGetFile (directory, name + extension);
 			if (file.Length > 0)
 				return Load (file);
 			return null;
 		}
 
-		static string DirectoryGetFile (string directory, string file, bool recursive)
+		static string DirectoryGetFile (string directory, string file)
 		{
-			var files = Directory.GetFiles (directory, file, recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
+			var files = Directory.GetFiles (directory, file);
 			if (files != null && files.Length > 0) {
 				if (files.Length > 1) {
 					ErrorHelper.Warning (133, "Found more than 1 assembly matching '{0}', choosing first:{1}{2}", file, Environment.NewLine, string.Join ("\n", files));

diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs
@@ -83,7 +83,6 @@ public static partial class Driver {
 		static string app_name;
 		static bool generate_plist;
 		public static RegistrarMode Registrar { get { return App.Registrar; } private set { App.Registrar = value; } }
-		public static List<string> RecursiveSearchDirectories { get; } = new List<string> ();
 		static bool no_executable;
 		static bool embed_mono = true;
 		static bool? profiling = false;
@@ -312,10 +311,6 @@ static void Main2 (string [] args)
 						}
 					}
 				},
-				{ "recursive-directories:", "Specify extra recursive search directories to use when probing assemblies", v => {
-						RecursiveSearchDirectories.AddRange (v.Split (Path.PathSeparator));
-					}
-				},
 				{ "sdk=", "Specifies the SDK version to compile against (version, for example \"10.9\")",
 					v => {
 						try {

diff --git a/tools/mmp/resolver.cs b/tools/mmp/resolver.cs
@@ -87,12 +87,6 @@ public override AssemblyDefinition Resolve (AssemblyNameReference reference, Rea
 			if (assembly != null)
 				return assembly;
 
-			foreach (var directory in RecursiveSearchDirectories) {
-				assembly = SearchDirectory (name, directory, recursive: true);
-				if (assembly != null)
-					return assembly;
-			}
-
 			return null;
 		}
 	}