From 041b1d32a31d00c576a50485a2db4ef0b64a2e4b Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Mon, 25 Mar 2019 20:15:46 +0100
Subject: [PATCH] Extensions

---
 .../Squidex.Extensions.csproj                 |  3 +++
 .../Pipeline/Plugins/PluginExtensions.cs      | 23 +------------------
 src/Squidex/Squidex.csproj                    |  7 +++---
 3 files changed, 8 insertions(+), 25 deletions(-)

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 @@
   <ItemGroup>
     <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
 </Project>
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 @@
     <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
     <ProjectReference Include="..\Squidex.Web\Squidex.Web.csproj" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="2.0.1" />
     <PackageReference Include="EventStore.ClientAPI.NetCore" Version="4.1.0.23" />
@@ -59,6 +59,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" />
     <PackageReference Include="Microsoft.OData.Core" Version="7.5.4" />
@@ -69,12 +70,12 @@
     <PackageReference Include="MongoDB.Driver" Version="2.8.0" />
     <PackageReference Include="NJsonSchema" Version="9.13.27" />
     <PackageReference Include="NSwag.AspNetCore" Version="12.0.17" />
-    <PackageReference Include="OpenCover" Version="4.7.922" />
+    <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" />
     <PackageReference Include="Orleans.Providers.MongoDB" Version="2.3.1" />
     <PackageReference Include="Orleans.WebHostCompatibilityLayer" Version="2.3.0" />
     <PackageReference Include="OrleansDashboard" Version="2.3.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="ReportGenerator" Version="4.0.15" />
+    <PackageReference Include="ReportGenerator" Version="4.0.15" PrivateAssets="all" />
     <PackageReference Include="Squidex.ClientLibrary" Version="2.8.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
     <PackageReference Include="System.Linq" Version="4.3.0" />