Merge remote-tracking branch 'Stash/release/2.0' into release/2.0

majiccode · majiccode · commit 361fca1a0261 · 2019-12-10T14:42:46.000Z
diff --git a/Sdl.Web.Tridion.Templates.R2/Data/DefaultModelBuilder.cs b/Sdl.Web.Tridion.Templates.R2/Data/DefaultModelBuilder.cs
@@ -440,6 +440,11 @@ private EntityModelData GetEntityModelData(ComponentPresentation cp)
                 {
                     Id = $"{GetDxaIdentifier(cp.Component)}-{GetDxaIdentifier(ct)}"
                 };
+
+                // This property is internal so have to set it via reflection. This prevents the
+                // publishing package containing an empty DCP
+                childRenderedItem.GetType().GetProperty("IsRenderedCompletely")
+                    .SetValue(childRenderedItem, false, null);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,11 @@ private EntityModelData GetEntityModelData(ComponentPresentation cp)`
`440`	`440`	`{`
`441`	`441`	`Id = $"{GetDxaIdentifier(cp.Component)}-{GetDxaIdentifier(ct)}"`
`442`	`442`	`};`
	`443`	`+`
	`444`	`+ // This property is internal so have to set it via reflection. This prevents the`
	`445`	`+ // publishing package containing an empty DCP`
	`446`	`+ childRenderedItem.GetType().GetProperty("IsRenderedCompletely")`
	`447`	`+ .SetValue(childRenderedItem, false, null);`
`443`	`448`	`}`
`444`	`449`	`else`
`445`	`450`	`{`