Fixes #44

Author: mikoskinen

src/Weikio.PluginFramework/Catalogs/FolderPluginCatalog.cs

@@ -189,9 +189,9 @@ private bool IsPluginAssembly(string assemblyPath)
                     return false;
                 }
 
-                if (_options.TypeFinderCriterias?.Any() != true)
+                if (_options.TypeFinderOptions?.TypeFinderCriterias?.Any() != true)
                 {
-                    // If there are no resolvers, assume that each DLL is a plugin
+                    // If there are no type finders configured, assume that each DLL is a plugin
                     return true;
                 }
 
@@ -245,9 +245,9 @@ private bool IsPluginAssembly(string assemblyPath)
 
                     var typeFinder = new TypeFinder();
 
-                    foreach (var finderCriteria in _options.TypeFinderCriterias)
+                    foreach (var finderCriteria in _options.TypeFinderOptions.TypeFinderCriterias)
                     {
-                        var typesFound = typeFinder.Find(finderCriteria.Value, readonlyAssembly, metadataPluginLoadContext);
+                        var typesFound = typeFinder.Find(finderCriteria, readonlyAssembly, metadataPluginLoadContext);
 
                         if (typesFound?.Any() == true)
                         {

tests/unit/Weikio.PluginFramework.Tests/FolderCatalogTests.cs

@@ -42,6 +42,62 @@ public async Task CanInitializeWithCriteria()
             Assert.Equal(2, pluginCount);
         }
 
+        [Fact]
+        public async Task CanUseFolderOptions()
+        {
+            var options = new FolderPluginCatalogOptions
+            {
+                TypeFinderOptions = new TypeFinderOptions()
+                {
+                    TypeFinderCriterias = new List<TypeFinderCriteria>()
+                    {
+                        TypeFinderCriteriaBuilder
+                            .Create()
+                            .HasName("SecondPlugin")
+                            .Tag("MyPlugin"),
+                    }
+                }
+            };
+
+            var catalog = new FolderPluginCatalog(_pluginFolder, options);
+
+            await catalog.Initialize();
+
+            var pluginCount = catalog.GetPlugins().Count;
+
+            Assert.Equal(1, pluginCount);
+            Assert.Equal("SecondPlugin", catalog.Single().Type.Name);
+        }
+
+        [Fact]
+        public async Task FolderOptionsAreUsedToLimitLoadedAssemblies()
+        {
+            var options = new FolderPluginCatalogOptions
+            {
+                TypeFinderOptions = new TypeFinderOptions()
+                {
+                    TypeFinderCriterias = new List<TypeFinderCriteria>()
+                    {
+                        TypeFinderCriteriaBuilder
+                            .Create()
+                            .HasName("SecondPlugin")
+                            .Tag("MyPlugin"),
+                    }
+                }
+            };
+
+            var catalog = new FolderPluginCatalog(_pluginFolder, options);
+
+            await catalog.Initialize();
+
+            var field = catalog.GetType().GetField("_catalogs", BindingFlags.Instance | BindingFlags.NonPublic);
+            // ReSharper disable once PossibleNullReferenceException
+            var loadedAssemblies = (List<AssemblyPluginCatalog>) field.GetValue(catalog);
+
+            // ReSharper disable once AssignNullToNotNullAttribute
+            Assert.Single(loadedAssemblies);
+        }
+
         [Fact]
         public async Task CanConfigureNamingOptions()
         {
@@ -61,9 +117,6 @@ public async Task CanConfigureNamingOptions()
             }
         }
 
-
-       
-
         [Fact]
         public async Task CanUseReferencedDependencies()
         {
@@ -124,7 +177,7 @@ public async Task CanUseSelectedHoststDependencies()
             Assert.Equal("3.1.2.0", loggerVersion);
             Assert.Equal("9.0.0.0", oldPluginVersion);
         }
-        
+
         [Collection(nameof(NotThreadSafeResourceCollection))]
         public class DefaultOptions : IDisposable
         {
@@ -149,15 +202,15 @@ public async Task CanConfigureDefaultNamingOptions()
                     Assert.EndsWith("Modified", plugin.Name);
                 }
             }
-        
+
             [Fact]
             public async Task DefaultAssemblyNamingOptionsDoesntAffectFolderCatalogs()
             {
                 AssemblyPluginCatalogOptions.Defaults.PluginNameOptions = new PluginNameOptions()
                 {
                     PluginNameGenerator = (nameOptions, type) => type.FullName + "ModifiedAssembly"
                 };
-                
+
                 var catalog = new FolderPluginCatalog(_pluginFolder);
                 await catalog.Initialize();
 
@@ -168,7 +221,7 @@ public async Task DefaultAssemblyNamingOptionsDoesntAffectFolderCatalogs()
                     Assert.False(plugin.Name.EndsWith("ModifiedAssembly"));
                 }
             }
-            
+
             public void Dispose()
             {
                 AssemblyPluginCatalogOptions.Defaults.PluginNameOptions = new PluginNameOptions();