Index: Core/Common/src/Core.Common.Assembly/AssemblyResolver.cs
===================================================================
diff -u -re4bbd6f5b02cc85ae3e715c35dd9de399072c2b1 -r7de32ec6e74184506339e3482ddb41f713079835
--- Core/Common/src/Core.Common.Assembly/AssemblyResolver.cs	(.../AssemblyResolver.cs)	(revision e4bbd6f5b02cc85ae3e715c35dd9de399072c2b1)
+++ Core/Common/src/Core.Common.Assembly/AssemblyResolver.cs	(.../AssemblyResolver.cs)	(revision 7de32ec6e74184506339e3482ddb41f713079835)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace Core.Common.Assembly
 {
@@ -148,19 +147,14 @@
         {
             string[] assemblies = Directory.GetFiles(assemblyDirectory, assemblySearchPattern);
 
-            if (!assemblies.Any())
+            foreach (string directory in Directory.GetDirectories(assemblyDirectory))
             {
-                foreach (string directory in Directory.GetDirectories(assemblyDirectory))
-                {
-                    InitializeAssemblyLookup(directory);
-                }
+                InitializeAssemblyLookup(directory);
             }
-            else
+
+            foreach (string assembly in assemblies)
             {
-                foreach (string assembly in assemblies)
-                {
-                    assemblyLookup[Path.GetFileNameWithoutExtension(assembly)] = assembly;
-                }
+                assemblyLookup[Path.GetFileNameWithoutExtension(assembly)] = assembly;
             }
         }