fix generic bulk ByInteface problem for issue #148

src/Grace/DependencyInjection/Impl/ExportTypeSetConfiguration.cs

@@ -49,8 +49,7 @@ public ExportTypeSetConfiguration(IActivationStrategyCreator strategyCreator, IE
  _scopeConfiguration = scopeConfiguration;
  _whereFilter = new GenericFilterGroup<Type>(ShouldSkipType, ExcludeTypesFilter);
  }
-
-
+
  /// <summary>
  /// Add conditions for export
  /// </summary>
@@ -342,6 +341,11 @@ private IEnumerable<ICompiledExportStrategy> CreateExportStrategiesForTypes(Type
  {
  foreach (var type in types)
  {
+ if (!type.GetTypeInfo().DeclaredConstructors.Any(c => c.IsPublic && !c.IsStatic && !c.IsAbstract))
+ {
+ continue;
+ }
+
  var exportTypes = GetExportedTypes(type);
  var keyedExports = GetKeyedExportTypes(type);
  var names = GetExportNames(type);
@@ -576,7 +580,7 @@ private ImmutableLinkedList<Type> GetExportedInterfaceList(Type type)
  {
  if (exportInterface.GetTypeInfo().IsGenericTypeDefinition)
  {
- if (implementedInterface.GetTypeInfo().IsGenericTypeDefinition &&
+ if (implementedInterface.GetTypeInfo().IsGenericType &&
  implementedInterface.GetGenericTypeDefinition() == exportInterface)
  {
  returnList = returnList.Add(type.GetTypeInfo().IsGenericTypeDefinition ? exportInterface : implementedInterface);

tests/Grace.Tests/Classes/Simple/CommandClasses.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Grace.Tests.Classes.Simple
+{
+ public interface ICommand<T>
+ {
+ void DoSomething(T value);
+ }
+
+ public abstract class BaseCommand<T> : ICommand<T>
+ {
+ public abstract void DoSomething(T value);
+ }
+
+ public class CommandA : BaseCommand<int>
+ {
+ public override void DoSomething(int value)
+ {
+
+ }
+ }
+
+ public class CommandB : BaseCommand<string>
+ {
+ public override void DoSomething(string value)
+ {
+
+ }
+ }
+
+ public class CommandC : BaseCommand<double>
+ {
+ public override void DoSomething(double value)
+ {
+
+ }
+ }
+}

tests/Grace.Tests/DependencyInjection/Registration/ExportTypeSetTests.cs

@@ -4,6 +4,7 @@
 using Grace.DependencyInjection;
 using Grace.DependencyInjection.Exceptions;
 using Grace.DependencyInjection.Lifestyle;
+using Grace.Diagnostics;
 using Grace.Tests.Classes.Simple;
 using Grace.Tests.DependencyInjection.AddOns;
 using Xunit;
@@ -261,6 +262,21 @@ public void ExportTypeSet_ByType()
  Assert.Same(instance, instance2);
  }
 
+ [Fact]
+ public void ExportTypeSet_Commands()
+ {
+ var container = new DependencyInjectionContainer(c => c.SupportFuncType = false);
+
+ container.Configure(c =>
+ {
+ c.ExportAssemblyContaining<CommandA>().ByInterface(typeof(ICommand<>));
+ });
+
+ var exports = container.StrategyCollectionContainer.GetAllStrategies().ToList();
+
+ Assert.Equal(3, exports.Count);
+ }
+
  [Fact]
  public void ExportTypeSet_ByType_With_Filter()
  {