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

Author: majiccode

Sdl.Web.Tridion.Templates.R2/Data/DefaultModelBuilder.cs

@@ -516,6 +516,11 @@ private EntityModelData GetEntityModelData(ComponentPresentation cp)
                     Id = $"{GetDxaIdentifier(cp.Component)}-{GetDxaIdentifier(ct)}",
                     Namespace = GetNamespace(cp.Component)
                 };
+
+                // 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
             {

Sdl.Web.Tridion.Templates.Tests/DataModelBuilderPipelineTest.cs

@@ -131,7 +131,8 @@ public void CreatePageModel_WithTargetGroupConditions_Success() // See TSI-2844
             Condition[] targetGroupConditions = targetGroupConditionsValue as Condition[];
             Assert.IsNotNull(targetGroupConditions, "targetGroupConditions");
             Assert.AreEqual(1, targetGroupConditions.Length, "targetGroupConditions.Length");
-            TrackingKeyCondition trackingKeyCondition = targetGroupConditions[0] as TrackingKeyCondition;
+            TargetGroupCondition targetGroupCondition = targetGroupConditions[0] as TargetGroupCondition;
+            TrackingKeyCondition trackingKeyCondition = targetGroupCondition.TargetGroup.Conditions[0] as TrackingKeyCondition;
             Assert.IsNotNull(trackingKeyCondition, "trackingKeyCondition");
             Assert.AreEqual("Test Keyword 2", trackingKeyCondition.TrackingKeyTitle, "trackingKeyCondition.TrackingKeyTitle");
             Assert.AreEqual(ConditionOperator.Equals, trackingKeyCondition.Operator, "trackingKeyCondition.Operator");