From 8f024e81996b14a9e6a440a601d0f6c0694f7ab8 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Mon, 20 Aug 2012 11:55:05 -0400 Subject: Fully async'd xml parsing process as well as added resolver and provider priorities --- MediaBrowser.Common/Kernel/BaseKernel.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Common/Kernel') diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 15ab687f31..d3b7f6522c 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -99,8 +99,13 @@ namespace MediaBrowser.Common.Kernel IEnumerable pluginAssemblies = Directory.GetFiles(ApplicationPaths.PluginsPath, "*.dll", SearchOption.AllDirectories).Select(f => Assembly.Load(File.ReadAllBytes((f)))); var catalog = new AggregateCatalog(pluginAssemblies.Select(a => new AssemblyCatalog(a))); + + // Include composable parts in the Common assembly + // Uncomment this if it's ever needed //catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly())); - //catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly)); + + // Include composable parts in the subclass assembly + catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly)); var container = new CompositionContainer(catalog); -- cgit v1.2.3