- added type fixture

Author: eben-roux

Shuttle.Core.Reflection.Tests/ReflectionServiceFixture.cs

@@ -0,0 +1,22 @@
+using System.Linq;
+using NUnit.Framework;
+
+namespace Shuttle.Core.Reflection.Tests
+{
+    [TestFixture]
+    public class ReflectionServiceFixture
+    {
+        [Test]
+        public void Should_be_able_to_get_runtime_assemblies()
+        {
+            Assert.That(new ReflectionService().GetRuntimeAssemblies().Count(), Is.GreaterThan(0));
+        }
+
+        [Test]
+        public void Should_be_able_to_get_types()
+        {
+            Assert.That(new ReflectionService().GetTypesAssignableTo<SomeClass>().Count(), Is.EqualTo(1));
+            Assert.That(new ReflectionService().GetTypesAssignableTo<ISomeClass>().Count(), Is.EqualTo(1));
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

Shuttle.Core.Reflection/IReflectionService.cs

@@ -13,11 +13,11 @@ 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);
-		IEnumerable<Type> GetTypes<T>(Assembly assembly);
-		IEnumerable<Type> GetTypes(Type type, Assembly assembly);
+		IEnumerable<Assembly> GetRuntimeAssemblies();
+		IEnumerable<Type> GetTypesAssignableTo<T>();
+		IEnumerable<Type> GetTypesAssignableTo(Type type);
+		IEnumerable<Type> GetTypesAssignableTo(Assembly assembly);
+		IEnumerable<Type> GetTypesAssignableTo<T>(Assembly assembly);
+		IEnumerable<Type> GetTypesAssignableTo(Type type, Assembly assembly);
     }
 }

Shuttle.Core.Reflection/Properties/AssemblyInfo.cs

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

Shuttle.Core.Reflection/ReflectionService.cs

@@ -4,10 +4,12 @@
 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;
+#if (NETCOREAPP2_0 || NETSTANDARD2_0)
+using Microsoft.DotNet.PlatformAbstractions;
+using Microsoft.Extensions.DependencyModel;
+#endif
 
 namespace Shuttle.Core.Reflection
 {
@@ -37,7 +39,7 @@ public string AssemblyPath(Assembly assembly)
 
 		public Assembly GetAssembly(string assemblyPath)
 		{
-            var result = RuntimeAssemblies()
+            var result = GetRuntimeAssemblies()
                 .FirstOrDefault(assembly => AssemblyPath(assembly)
                     .Equals(assemblyPath, StringComparison.InvariantCultureIgnoreCase));
 
@@ -104,7 +106,7 @@ public Assembly FindAssemblyNamed(string name)
                 hasFileExtension = true;
             }
 
-            var result = RuntimeAssemblies()
+            var result = GetRuntimeAssemblies()
                 .FirstOrDefault(assembly => assembly.GetName()
                     .Name.Equals(assemblyName, StringComparison.InvariantCultureIgnoreCase));
 
@@ -188,7 +190,7 @@ private IEnumerable<Assembly> GetMatchingAssemblies(Regex expression, string fol
 
         public IEnumerable<Assembly> GetMatchingAssemblies(string regex)
         {
-            var assemblies = new List<Assembly>(RuntimeAssemblies());
+            var assemblies = new List<Assembly>(GetRuntimeAssemblies());
 
 			foreach (
 				var assembly in
@@ -215,30 +217,34 @@ var assembly in
 			return assemblies;
 		}
 
-	    public IEnumerable<Assembly> RuntimeAssemblies()
+	    public IEnumerable<Assembly> GetRuntimeAssemblies()
 	    {
-	        var result = new List<Assembly>();
+#if (!NETCOREAPP2_0 && !NETSTANDARD2_0)
+	        return AppDomain.CurrentDomain.GetAssemblies();
+#else
+            var result = new List<Assembly>();
 
 	        foreach (var runtimeAssemblyName in DependencyContext.Default.GetRuntimeAssemblyNames(RuntimeEnvironment.GetRuntimeIdentifier()))
 	        {
 	            result.Add(Assembly.Load(runtimeAssemblyName));
 	        }
 
 	        return result;
-	    }
+#endif
+        }
 
-	    public IEnumerable<Type> GetTypes<T>()
+        public IEnumerable<Type> GetTypesAssignableTo<T>()
 		{
-			return GetTypes(typeof(T));
+			return GetTypesAssignableTo(typeof(T));
 		}
 
-		public IEnumerable<Type> GetTypes(Type type)
+		public IEnumerable<Type> GetTypesAssignableTo(Type type)
 		{
 			var result = new List<Type>();
 
 			foreach (var assembly in GetAssemblies())
 			{
-				GetTypes(type, assembly)
+				GetTypesAssignableTo(type, assembly)
 					.Where(candidate => result.Find(existing => existing == candidate) == null)
 					.ToList()
 					.ForEach(add => result.Add(add));
@@ -247,20 +253,20 @@ public IEnumerable<Type> GetTypes(Type type)
 			return result;
 		}
 
-		public IEnumerable<Type> GetTypes<T>(Assembly assembly)
+		public IEnumerable<Type> GetTypesAssignableTo<T>(Assembly assembly)
 		{
-			return GetTypes(typeof(T), assembly);
+			return GetTypesAssignableTo(typeof(T), assembly);
 		}
 
-		public IEnumerable<Type> GetTypes(Type type, Assembly assembly)
+		public IEnumerable<Type> GetTypesAssignableTo(Type type, Assembly assembly)
 		{
 			Guard.AgainstNull(type, nameof(type));
 			Guard.AgainstNull(assembly, nameof(assembly));
 
-			return GetTypes(assembly).Where(candidate => candidate.IsAssignableTo(type) && candidate != type).ToList();
+			return GetTypesAssignableTo(assembly).Where(candidate => candidate.IsAssignableTo(type) && !(candidate.IsInterface && candidate == type)).ToList();
 		}
 
-		public IEnumerable<Type> GetTypes(Assembly assembly)
+		public IEnumerable<Type> GetTypesAssignableTo(Assembly assembly)
 		{
 			Type[] types;