Skip to content

Commit bb06702

Browse files
committed
Enable all plugins by default, if not explicitly configured.
1 parent 5d4d694 commit bb06702

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins/PluginManager.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ bool IsPluginEnabled(string pluginName)
155155
#pragma warning restore CS0612 // Type or member is obsolete
156156
return false;
157157

158+
// if there is no explicit config, all plugins are enabled
159+
if (_options.Enabled.Count == 0)
160+
return true;
161+
158162
if (!_options.Enabled.TryGetValue(pluginName, out bool enabled))
159163
enabled = allPluginsEnabled;
160164

Hosting/test/AppCoreNet.Extensions.Hosting.Plugins.Tests/PluginFacilityResolverTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public void RegistersFacilitiesWithExtensions()
2727
{
2828
o.Assemblies.Add(PluginPaths.TestPlugin);
2929
o.Assemblies.Add(PluginPaths.TestPlugin2);
30-
o.Enabled["*"] = true;
3130
});
3231

3332
services.AddFacilitiesFrom(
@@ -67,7 +66,6 @@ public void RegistersFacilities()
6766
{
6867
o.Assemblies.Add(PluginPaths.TestPlugin);
6968
o.Assemblies.Add(PluginPaths.TestPlugin2);
70-
o.Enabled["*"] = true;
7169
});
7270

7371
services.AddFacilitiesFrom(s => s.Plugins());
@@ -93,7 +91,6 @@ public void RegistersFacilityWithServices()
9391
o =>
9492
{
9593
o.Assemblies.Add(PluginPaths.TestPlugin);
96-
o.Enabled["*"] = true;
9794
});
9895

9996
services.AddFacilitiesFrom(s => s.Plugins());

Hosting/test/AppCoreNet.Extensions.Hosting.Plugins.Tests/PluginManagerTests.cs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public void ResolveAllPublicInstancesFromPlugins()
2222
var pluginOptions = new PluginOptions
2323
{
2424
Assemblies = { PluginPaths.TestPlugin, PluginPaths.TestPlugin2 },
25-
Enabled = { { "*", true } },
2625
};
2726

2827
var manager = new PluginManager(new DefaultActivator(), Options.Create(pluginOptions));
@@ -49,7 +48,6 @@ public void ResolveAllInstancesFromPlugins()
4948
{
5049
ResolvePrivateTypes = true,
5150
Assemblies = { PluginPaths.TestPlugin, PluginPaths.TestPlugin2 },
52-
Enabled = { { "*", true } },
5351
};
5452

5553
var manager = new PluginManager(new DefaultActivator(), Options.Create(pluginOptions));
@@ -82,7 +80,6 @@ public void GetAllPlugins()
8280
var options = new PluginOptions();
8381
options.Assemblies.Add(PluginPaths.TestPlugin);
8482
options.Assemblies.Add(PluginPaths.TestPlugin2);
85-
options.Enabled["*"] = true;
8683

8784
var manager = new PluginManager(new DefaultActivator(), Options.Create(options));
8885
manager.Plugins.Select(p => p.Info)
@@ -195,6 +192,20 @@ public void DoesNotLoadExplicitlyDisabled()
195192
.HaveCount(1);
196193
}
197194

195+
[Fact]
196+
public void LoadsAllPluginsWithoutExplicitConfig()
197+
{
198+
var options = new PluginOptions();
199+
options.Assemblies.Add(PluginPaths.TestPlugin);
200+
options.Assemblies.Add(PluginPaths.TestPlugin2);
201+
202+
var manager = new PluginManager(new DefaultActivator(), Options.Create(options));
203+
manager.LoadPlugins();
204+
205+
manager.Plugins.Should()
206+
.HaveCount(2);
207+
}
208+
198209
[Fact]
199210
public void LoadsAllPlugins()
200211
{

Hosting/test/AppCoreNet.Extensions.Hosting.Plugins.Tests/PluginServiceDescriptorResolverTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public void RegistersServices()
2626
{
2727
o.Assemblies.Add(PluginPaths.TestPlugin);
2828
o.Assemblies.Add(PluginPaths.TestPlugin2);
29-
o.Enabled["*"] = true;
3029
});
3130

3231
services.TryAddEnumerableFrom<IStartupTask>(s => s.Plugins());

0 commit comments

Comments
 (0)