diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-20 11:55:05 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-20 11:55:05 -0400 |
| commit | 8f024e81996b14a9e6a440a601d0f6c0694f7ab8 (patch) | |
| tree | b7bb10bde396608e11c0bac9c4ed706508f1a003 /MediaBrowser.Common/Kernel/BaseKernel.cs | |
| parent | 19a4dd83c21db931edf14a0ef547219ef93cdc84 (diff) | |
Fully async'd xml parsing process as well as added resolver and provider priorities
Diffstat (limited to 'MediaBrowser.Common/Kernel/BaseKernel.cs')
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 15ab687f3..d3b7f6522 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -99,8 +99,13 @@ namespace MediaBrowser.Common.Kernel IEnumerable<Assembly> 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);
|