- added RuntimeAssemblies

Author: eben-roux

Shuttle.Core.Reflection/.build/package.nuspec

@@ -16,6 +16,7 @@
     <tags>shuttle reflection</tags>
     <dependencies>
       <dependency id="Shuttle.Core.Logging" version="{Shuttle.Core.Logging-version}" />
+      <dependency id="Microsoft.Extensions.DependencyModel" version="{Microsoft.Extensions.DependencyModel-version}" />
     </dependencies>
   </metadata>
 </package>

Shuttle.Core.Reflection/IReflectionService.cs

@@ -13,6 +13,7 @@ public interface IReflectionService
 		IEnumerable<Assembly> GetAssemblies();
         IEnumerable<Assembly> GetMatchingAssemblies(string regex, string folder);
 		IEnumerable<Assembly> GetMatchingAssemblies(string regex);
+		IEnumerable<Assembly> RuntimeAssemblies();
 		IEnumerable<Type> GetTypes<T>();
 		IEnumerable<Type> GetTypes(Type type);
 		IEnumerable<Type> GetTypes(Assembly assembly);

Shuttle.Core.Reflection/Properties/AssemblyInfo.cs

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

Shuttle.Core.Reflection/ReflectionService.cs

@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using Microsoft.DotNet.PlatformAbstractions;
+using Microsoft.Extensions.DependencyModel;
 using Shuttle.Core.Contract;
 using Shuttle.Core.Logging;
 
@@ -35,7 +37,7 @@ public string AssemblyPath(Assembly assembly)
 
 		public Assembly GetAssembly(string assemblyPath)
 		{
-            var result = AppDomain.CurrentDomain.GetAssemblies()
+            var result = RuntimeAssemblies()
                 .FirstOrDefault(assembly => AssemblyPath(assembly)
                     .Equals(assemblyPath, StringComparison.InvariantCultureIgnoreCase));
 
@@ -102,7 +104,7 @@ public Assembly FindAssemblyNamed(string name)
                 hasFileExtension = true;
             }
 
-            var result = AppDomain.CurrentDomain.GetAssemblies()
+            var result = RuntimeAssemblies()
                 .FirstOrDefault(assembly => assembly.GetName()
                     .Name.Equals(assemblyName, StringComparison.InvariantCultureIgnoreCase));
 
@@ -186,9 +188,7 @@ private IEnumerable<Assembly> GetMatchingAssemblies(Regex expression, string fol
 
         public IEnumerable<Assembly> GetMatchingAssemblies(string regex)
         {
-            var expression = new Regex(regex, RegexOptions.IgnoreCase);
-            var assemblies = new List<Assembly>(AppDomain.CurrentDomain.GetAssemblies()
-                .Where(assembly => expression.IsMatch(assembly.FullName)));
+            var assemblies = new List<Assembly>(RuntimeAssemblies());
 
 			foreach (
 				var assembly in
@@ -215,7 +215,19 @@ var assembly in
 			return assemblies;
 		}
 
-		public IEnumerable<Type> GetTypes<T>()
+	    public IEnumerable<Assembly> RuntimeAssemblies()
+	    {
+	        var result = new List<Assembly>();
+
+	        foreach (var runtimeAssemblyName in DependencyContext.Default.GetRuntimeAssemblyNames(RuntimeEnvironment.GetRuntimeIdentifier()))
+	        {
+	            result.Add(Assembly.Load(runtimeAssemblyName));
+	        }
+
+	        return result;
+	    }
+
+	    public IEnumerable<Type> GetTypes<T>()
 		{
 			return GetTypes(typeof(T));
 		}

Shuttle.Core.Reflection/Shuttle.Core.Reflection.csproj

@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
     <PackageReference Include="Shuttle.Core.Logging" Version="10.0.1" />
   </ItemGroup>