From d915994f0bd761e81d47207bf57565d556f25d96 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Wed, 15 Oct 2014 00:00:15 -0700 Subject: [PATCH] Only load loadable assemblies --- src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs index 1a7abf2c4f..675eb87b37 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Mvc { get { - return GetCandidateLibraries().Select(Load); + return GetCandidateLibraries().SelectMany(l => l.LoadableAssemblies).Select(Load); } } @@ -47,9 +47,9 @@ namespace Microsoft.AspNet.Mvc .Where(IsCandidateLibrary); } - private static Assembly Load(ILibraryInformation library) + private static Assembly Load(AssemblyName assemblyName) { - return Assembly.Load(new AssemblyName(library.Name)); + return Assembly.Load(assemblyName); } private static bool IsCandidateLibrary(ILibraryInformation library)