Merge remote-tracking branch 'origin/temp8-4742-no-assembly-scanning-for-dashboards' into netcore/netcore

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntimeComposer.cs

src/Umbraco.Core/CompositionExtensions.cs

@@ -1,4 +1,5 @@
 using Umbraco.Core.Composing;
+using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Actions;
 using Umbraco.Web.ContentApps;
@@ -94,7 +95,18 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static DashboardCollectionBuilder Dashboards(this Composition composition)
-            => composition.WithCollectionBuilder<DashboardCollectionBuilder>();
+            => composition.WithCollectionBuilder<DashboardCollectionBuilder>()
+                .Add<ContentDashboard>()
+                .Add<ExamineDashboard>()
+                .Add<FormsDashboard>()
+                .Add<HealthCheckDashboard>()
+                .Add<ManifestDashboard>()
+                .Add<MediaDashboard>()
+                .Add<MembersDashboard>()
+                .Add<ProfilerDashboard>()
+                .Add<PublishedStatusDashboard>()
+                .Add<RedirectUrlDashboard>()
+                .Add<SettingsDashboard>();
 
 
         /// <summary>

src/Umbraco.Core/Dashboards/IDashboard.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Dashboards
     /// <summary>
     /// Represents a dashboard.
     /// </summary>
-    public interface IDashboard : IDashboardSlim, IDiscoverable
+    public interface IDashboard : IDashboardSlim
     {
         /// <summary>
         /// Gets the aliases of sections/applications where this dashboard appears.

src/Umbraco.Core/Dashboards/ProfilerDashboard.cs

@@ -5,7 +5,7 @@ using Umbraco.Core.Dashboards;
 namespace Umbraco.Web.Dashboards
 {
     [Weight(60)]
-    public class ProfilerDashboardDashboard : IDashboard
+    public class ProfilerDashboard : IDashboard
     {
         public string Alias => "settingsProfiler";