diff --git a/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/extensions/Squidex.Extensions/Squidex.Extensions.csproj
index d9b24aa1f..836716069 100644
--- a/extensions/Squidex.Extensions/Squidex.Extensions.csproj
+++ b/extensions/Squidex.Extensions/Squidex.Extensions.csproj
@@ -31,4 +31,7 @@
+
+
+
diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs
index 986c0c55c..56626e70e 100644
--- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs
+++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs
@@ -14,29 +14,13 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using Squidex.Domain.Apps.Core;
-using Squidex.Domain.Apps.Entities;
-using Squidex.Domain.Apps.Events;
-using Squidex.Infrastructure;
using Squidex.Infrastructure.Log;
using Squidex.Infrastructure.Plugins;
-using Squidex.Web;
namespace Squidex.Pipeline.Plugins
{
public static class PluginExtensions
{
- private static readonly Type[] SharedTypes =
- {
- typeof(IPlugin),
- typeof(SquidexCoreModel),
- typeof(SquidexCoreOperations),
- typeof(SquidexEntities),
- typeof(SquidexEvents),
- typeof(SquidexInfrastructure),
- typeof(SquidexWeb)
- };
-
public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration config)
{
var pluginManager = new PluginManager();
@@ -89,12 +73,7 @@ namespace Squidex.Pipeline.Plugins
{
if (candidate.Extension.Equals(".dll", StringComparison.OrdinalIgnoreCase))
{
- return PluginLoader.CreateFromAssemblyFile(candidate.FullName, SharedTypes);
- }
-
- if (candidate.Extension.Equals(".json", StringComparison.OrdinalIgnoreCase))
- {
- return PluginLoader.CreateFromConfigFile(candidate.FullName, SharedTypes);
+ return PluginLoader.CreateFromAssemblyFile(candidate.FullName, PluginLoaderOptions.PreferSharedTypes);
}
}
diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj
index 5cdd8b1bc..f7c33f443 100644
--- a/src/Squidex/Squidex.csproj
+++ b/src/Squidex/Squidex.csproj
@@ -40,7 +40,7 @@
-
+
@@ -59,6 +59,7 @@
+
@@ -69,12 +70,12 @@
-
+
-
+