yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Stephan
2018-12-07 13:24:25 +01:00
parent 3df1c242c4
commit ed222510f0
11 changed files with 2598 additions and 2636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/Composing/Composers/ControllersComposer.cs
View File

@@ -59,13 +59,13 @@ namespace Umbraco.Web.Composing.Composers
composition.RegisterControllers(umbracoWebControllers);
// scan and register every PluginController in everything (PluginController is IDiscoverable and IController)
var nonUmbracoWebPluginController = composition.TypeLoader
.GetTypes<PluginController>().Where(x => x.Assembly != umbracoWebAssembly)
.Union(composition.TypeLoader
.GetTypes<RenderMvcController>().Where(x => x.Assembly != umbracoWebAssembly)
);
var nonUmbracoWebPluginController = composition.TypeLoader.GetTypes<PluginController>().Where(x => x.Assembly != umbracoWebAssembly);
composition.RegisterControllers(nonUmbracoWebPluginController);
// can and register every IRenderMvcController in everything (IRenderMvcController is IDiscoverable)
var renderMvcControllers = composition.TypeLoader.GetTypes<IRenderMvcController>().Where(x => x.Assembly != umbracoWebAssembly);
composition.RegisterControllers(renderMvcControllers);
// scan and register every IHttpController in Umbraco.Web
var umbracoWebHttpControllers = composition.TypeLoader.GetTypes<IHttpController>(specificAssemblies: new[] { umbracoWebAssembly });
//foreach (var controller in umbracoWebControllers.Where(x => !typeof(UmbracoApiController).IsAssignableFrom(x)))