- v10.0.4

Author: eben-roux

Shuttle.Core.Reflection/Properties/AssemblyInfo.cs

@@ -29,10 +29,10 @@
 [assembly: AssemblyTitle(".NET Standard 2.0")]
 #endif
 
-[assembly: AssemblyVersion("10.0.3.0")]
+[assembly: AssemblyVersion("10.0.4.0")]
 [assembly: AssemblyCopyright("Copyright © Eben Roux 2017")]
 [assembly: AssemblyProduct("Shuttle.Core.Reflection")]
 [assembly: AssemblyCompany("Shuttle")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyInformationalVersion("10.0.3")]
+[assembly: AssemblyInformationalVersion("10.0.4")]
 [assembly: ComVisible(false)]

Shuttle.Core.Reflection/ReflectionService.cs

@@ -160,7 +160,11 @@ public IEnumerable<Assembly> GetAssemblies()
 
         public IEnumerable<Assembly> GetMatchingAssemblies(string regex, string folder)
         {
-            var expression = new Regex(regex, RegexOptions.IgnoreCase);
+            return GetMatchingAssemblies(new Regex(regex, RegexOptions.IgnoreCase), folder);
+		}
+
+        private IEnumerable<Assembly> GetMatchingAssemblies(Regex expression, string folder)
+        {
             var result = new List<Assembly>();
 
             if (Directory.Exists(folder))
@@ -175,14 +179,16 @@ public IEnumerable<Assembly> GetMatchingAssemblies(string regex, string folder)
                         .Where(file => expression.IsMatch(Path.GetFileNameWithoutExtension(file)))
                         .Select(GetAssembly)
                         .Where(assembly => assembly != null));
-			}
+            }
 
-			return result;
-		}
+            return result;
+        }
 
         public IEnumerable<Assembly> GetMatchingAssemblies(string regex)
         {
-            var assemblies = new List<Assembly>(AppDomain.CurrentDomain.GetAssemblies());
+            var expression = new Regex(regex, RegexOptions.IgnoreCase);
+            var assemblies = new List<Assembly>(AppDomain.CurrentDomain.GetAssemblies()
+                .Where(assembly => expression.IsMatch(assembly.FullName)));
 
 			foreach (
 				var assembly in