Browse Source

Change reverted

pull/349/head
Sebastian Stehle 8 years ago
parent
commit
cea498cf37
  1. 21
      src/Squidex/Pipeline/Plugins/PluginExtensions.cs

21
src/Squidex/Pipeline/Plugins/PluginExtensions.cs

@ -14,13 +14,29 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; 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.Log;
using Squidex.Infrastructure.Plugins; using Squidex.Infrastructure.Plugins;
using Squidex.Web;
namespace Squidex.Pipeline.Plugins namespace Squidex.Pipeline.Plugins
{ {
public static class PluginExtensions 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) public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration config)
{ {
var pluginManager = new PluginManager(); var pluginManager = new PluginManager();
@ -75,6 +91,11 @@ namespace Squidex.Pipeline.Plugins
{ {
return PluginLoader.CreateFromAssemblyFile(candidate.FullName, PluginLoaderOptions.PreferSharedTypes); return PluginLoader.CreateFromAssemblyFile(candidate.FullName, PluginLoaderOptions.PreferSharedTypes);
} }
if (candidate.Extension.Equals(".json", StringComparison.OrdinalIgnoreCase))
{
return PluginLoader.CreateFromConfigFile(candidate.FullName, SharedTypes);
}
} }
return null; return null;

Loading…
Cancel
Save