Merge branch temp8 into temp8-di2690

2018-11-29 12:38:44 +01:00
parent eb0d2464aa ec3fd890ec
commit 146bbcec4b
46 changed files with 827 additions and 4208 deletions
--- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
@@ -121,8 +121,7 @@ namespace Umbraco.Web.Runtime
            composition.ConfigureForWeb();

            composition
-                .ComposeMvcControllers(GetType().Assembly)
-                .ComposeApiControllers(GetType().Assembly);
+                .ComposeUmbracoControllers(GetType().Assembly);

            composition.WithCollectionBuilder<SearchableTreeCollectionBuilder>()
                .Add(() => composition.TypeLoader.GetTypes<ISearchableTree>()); // fixme which searchable trees?!