Merge origin/dev-v7.6 into dev-v8-zbwip (builds, not tested)

src/Umbraco.Core/Models/PublishedContent/IPublishedContentModelFactory.cs

@@ -12,5 +12,21 @@
         /// <returns>The strongly-typed model representing the published content, or the published content
         /// itself it the factory has no model for that content type.</returns>
         IPublishedContent CreateModel(IPublishedContent content);
+
+        T CreateModel<T>(IPublishedFragment content);
+
+        // fixme
+        // and we'd need a
+        // PublishedContentModel = ContentModel : ContentWrapper
+        // PublishedFragmentModel = FragmentModel : FragmentWrapper
+        //
+        // ModelFactory.Meta.Model("thing").ClrType (find the our post?)
+        //
+        // then
+        // make a plan to get NestedContent in
+        // and an equivalent of Vorto with different syntax
+        //
+        // then
+        // VARIANTS ARCHITECTURE FFS!
     }
 }

src/Umbraco.Core/Models/PublishedContent/NoopPublishedContentModelFactory.cs

@@ -6,5 +6,10 @@
         {
             return content;
         }
+
+        public T CreateModel<T>(IPublishedFragment content)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }

src/Umbraco.Core/Models/PublishedContent/PublishedContentModelFactory.cs

@@ -81,5 +81,10 @@ namespace Umbraco.Core.Models.PublishedContent
                 ? constructor(content)
                 : content;
         }
+
+        public T CreateModel<T>(IPublishedFragment content)
+        {
+            throw new NotImplementedException();
+        }
     }
 }