TerribleDev/Varanus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:tparnell8/NOCQ

Browse Source
This commit is contained in:
Norm MacLennan
2014-05-07 10:54:17 -07:00
parent b45ef9f86d 5dddd90911
commit 757a010f5a
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/NOCQ/Extensability/Catalog.cs
View File

@@ -1,14 +1,15 @@
using System.ComponentModel.Composition.Hosting; using System.ComponentModel.Composition.Hosting;
using System.ComponentModel.Composition; using System.ComponentModel.Composition;
using System.Reflection;
namespace NOCQ namespace NOCQ
{ {
public class Catalog public class Catalog
{ {
DirectoryCatalog dcatalog = new DirectoryCatalog("plugins", "*.dll"); static DirectoryCatalog dcatalog = new DirectoryCatalog("plugins", "*.dll");
AssemblyCatalog acatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly()); static AssemblyCatalog acatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly());
AggregateCatalog catalog = new AggregateCatalog(dcatalog, acatalog); static AggregateCatalog catalog = new AggregateCatalog(dcatalog, acatalog);
public CompositionContainer Container = new CompositionContainer(catalog); static public CompositionContainer Container = new CompositionContainer(catalog);
public Catalog() public Catalog()
{ {
Container.ComposeParts(this); Container.ComposeParts(this);

2
src/NOCQ/Imports/IDataImportHook.cs
View File

@@ -3,7 +3,7 @@ using System.ComponentModel.Composition;
namespace NOCQ namespace NOCQ
{ {
[Export(typeof(IDataImportHook))] [InheritedExport]
public interface IDataImportHook public interface IDataImportHook
{ {
string Name { get; set; } string Name { get; set; }

6
src/NOCQ/NOCQ.csproj
View File

@@ -33,6 +33,9 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="csredis">
<HintPath>..\..\packages\csredis.1.4.7.1\lib\net40\csredis.dll</HintPath>
</Reference>
<Reference Include="System.Composition.AttributedModel"> <Reference Include="System.Composition.AttributedModel">
<HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath> <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
</Reference> </Reference>
@@ -51,9 +54,6 @@
<Reference Include="AE.Net.Mail"> <Reference Include="AE.Net.Mail">
<HintPath>..\..\packages\AE.Net.Mail.1.7.9.1\lib\net45\AE.Net.Mail.dll</HintPath> <HintPath>..\..\packages\AE.Net.Mail.1.7.9.1\lib\net45\AE.Net.Mail.dll</HintPath>
</Reference> </Reference>
<Reference Include="csredis">
<HintPath>..\..\packages\csredis.1.4.7.1\lib\net40\csredis.dll</HintPath>
</Reference>
<Reference Include="System.Core" /> <Reference Include="System.Core" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>