Merge branch 'v8/feature/block-editor-list' of https://github.com/umbraco/Umbraco-CMS into v8/feature/block-editor-list

src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs

@@ -194,9 +194,6 @@ namespace Umbraco.Core.Migrations.Upgrade
 
 
             To<MissingDictionaryIndex>("{a78e3369-8ea3-40ec-ad3f-5f76929d2b20}");
-
-            // to 8.7.0...
-            To<StackedContentToBlockList>("{DFA35FA2-BFBB-433F-84E5-BD75940CDDF6}");
             //FINAL
         }
     }

src/Umbraco.Core/Umbraco.Core.csproj

@@ -131,7 +131,6 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_7_0\StackedContentToBlockList.cs" />
     <Compile Include="Models\Blocks\IBlockEditorDataHelper.cs" />
     <Compile Include="Models\InstallLog.cs" />
     <Compile Include="Persistence\Repositories\IInstallationRepository.cs" />

src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml

@@ -1,5 +1,4 @@
 @inherits UmbracoViewPage<BlockListModel>
-@using ContentModels = Umbraco.Web.PublishedModels;
 @using Umbraco.Core.Models.Blocks
 @{
     if (Model?.Layout == null || !Model.Layout.Any()) { return; }
@@ -9,6 +8,13 @@
     {
         if (layout?.Udi == null) { continue; }
         var data = layout.Data;
-        @Html.Partial("BlockList/" + data.ContentType.Alias, layout)
+        try
+        {
+            @Html.Partial("BlockList/Components/" + data.ContentType.Alias, (data, layout.Settings))
+        }
+        catch (Exception ex)
+        {
+            global::Umbraco.Core.Composing.Current.Logger.Error(typeof(BlockListModel), ex, "Could not display block list component for content type {0}", data?.ContentType?.Alias);
+        }
     }
 </div>