Fixed ProviderNotFoundException when referencing providers in referen…

…ced packages in projects targeting .NET Core
sweetlandj · Feb 19, 2018 · 064e082 · 064e082
1 parent e0bc721
commit 064e082
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 12 deletions.
diff --git a/Source/Platibus/Config/ReflectionService.cs b/Source/Platibus/Config/ReflectionService.cs
@@ -20,12 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using Microsoft.Extensions.DependencyModel;
+using Platibus.Diagnostics;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using Platibus.Diagnostics;
 
 namespace Platibus.Config
 {
@@ -44,6 +45,48 @@ public ReflectionService(IDiagnosticService diagnosticService)
         }
 
         public IEnumerable<Type> FindConcreteSubtypes<TBase>()
+        {
+            var appDomain = AppDomain.CurrentDomain;
+            var assemblyNames = GetAssemblyNames(appDomain);
+            var subtypes = new List<Type>();
+            foreach (var assemblyName in assemblyNames)
+            {
+                try
+                {
+                    var assembly = appDomain.GetAssemblies()
+                        .FirstOrDefault(a => a.GetName() == assemblyName)
+                        ?? appDomain.Load(assemblyName);
+
+                    subtypes.AddRange(assembly.GetTypes()
+                        .Where(typeof(TBase).IsAssignableFrom)
+                        .Where(t => !t.IsInterface && !t.IsAbstract));
+                }
+                catch (Exception ex)
+                {
+                    _diagnosticService.Emit(new DiagnosticEventBuilder(this, DiagnosticEventType.TypeLoadFailed)
+                    {
+                        Detail = $"Error loading assembly {assemblyName}",
+                        Exception = ex
+                    }.Build());
+                }
+            }
+            return subtypes;
+        }
+
+        public IEnumerable<AssemblyName> GetAssemblyNames(AppDomain appDomain)
+        {
+            return GetDefaultAssemblyNames()
+                .Union(GetAppDomainBaseDirectoryAssemblyNames(appDomain))
+                .Distinct(new AssemblyNameEqualityComparer());
+        }
+
+        public IEnumerable<AssemblyName> GetDefaultAssemblyNames()
+        {
+            var dependencyContext = DependencyContext.Default;
+            return dependencyContext?.GetDefaultAssemblyNames() ?? Enumerable.Empty<AssemblyName>();
+        }
+
+        public IEnumerable<AssemblyName> GetAppDomainBaseDirectoryAssemblyNames(AppDomain appDomain)
         {
             var appDomainBaseDirectory = AppDomain.CurrentDomain.BaseDirectory;
             var directories = new[]
@@ -62,20 +105,13 @@ public IEnumerable<Type> FindConcreteSubtypes<TBase>()
                 .Where(dir => dir.Directory.Exists)
                 .SelectMany(x => x.Directory.GetFiles(x.FilenamePattern, SearchOption.TopDirectoryOnly));
 
-            var subtypes = new List<Type>();
+            var assemblyNames = new List<AssemblyName>();
             foreach (var assemblyFile in assemblyFiles)
             {
                 try
                 {
                     var assemblyName = AssemblyName.GetAssemblyName(assemblyFile.FullName);
-                    var appDomain = AppDomain.CurrentDomain;
-                    var assembly = appDomain.GetAssemblies()
-                        .FirstOrDefault(a => a.GetName() == assemblyName)
-                        ?? appDomain.Load(assemblyName);
-
-                    subtypes.AddRange(assembly.GetTypes()
-                        .Where(typeof(TBase).IsAssignableFrom)
-                        .Where(t => !t.IsInterface && !t.IsAbstract));
+                    assemblyNames.Add(assemblyName);
                 }
                 catch (Exception ex)
                 {
@@ -84,9 +120,23 @@ public IEnumerable<Type> FindConcreteSubtypes<TBase>()
                         Detail = $"Error loading assembly file {assemblyFile.FullName}",
                         Exception = ex
                     }.Build());
-                }
+                } 
+            }
+
+            return assemblyNames;
+        }
+
+        private class AssemblyNameEqualityComparer : IEqualityComparer<AssemblyName>
+        {
+            public bool Equals(AssemblyName x, AssemblyName y)
+            {
+                return Equals(x.Name, y.Name);
+            }
+
+            public int GetHashCode(AssemblyName obj)
+            {
+                return obj?.Name.GetHashCode() ?? 0;
             }
-            return subtypes;
         }
     }
 }
diff --git a/Source/Platibus/Platibus.csproj b/Source/Platibus/Platibus.csproj
@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461'">