Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data - fixes merge issues and explicitly implements interface for entities that are not UmbracoEntity and hides other implementations from intellisense.

src/Umbraco.Core/Models/ContentBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
@@ -50,6 +51,7 @@ namespace Umbraco.Core.Models
             _contentTypeId = int.Parse(contentType.Id.ToString(CultureInfo.InvariantCulture));
             _properties = properties;
             _properties.EnsurePropertyTypes(PropertyTypes);
+            _additionalData = new Dictionary<string, object>();
         }
 
         /// <summary>
@@ -73,6 +75,7 @@ namespace Umbraco.Core.Models
 			_contentTypeId = int.Parse(contentType.Id.ToString(CultureInfo.InvariantCulture));
 			_properties = properties;
 			_properties.EnsurePropertyTypes(PropertyTypes);
+            _additionalData = new Dictionary<string, object>();
 		}
 
 	    private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<ContentBase, string>(x => x.Name);
@@ -253,6 +256,16 @@ namespace Umbraco.Core.Models
             }
         }
 
+        private readonly IDictionary<string, object> _additionalData;
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IDictionary<string, object> IUmbracoEntity.AdditionalData
+        {
+            get { return _additionalData; }
+        }
+
         /// <summary>
         /// List of PropertyGroups available on this Content object
         /// </summary>

src/Umbraco.Core/Models/ContentTypeBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
@@ -42,6 +43,7 @@ namespace Umbraco.Core.Models
             _allowedContentTypes = new List<ContentTypeSort>();
             _propertyGroups = new PropertyGroupCollection();
             _propertyTypes = new PropertyTypeCollection();
+            _additionalData = new Dictionary<string, object>();
         }
 
 		protected ContentTypeBase(IContentTypeBase parent)
@@ -52,6 +54,7 @@ namespace Umbraco.Core.Models
 			_allowedContentTypes = new List<ContentTypeSort>();
 			_propertyGroups = new PropertyGroupCollection();
             _propertyTypes = new PropertyTypeCollection();
+            _additionalData = new Dictionary<string, object>();
 		}
 
         private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Name);
@@ -314,6 +317,16 @@ namespace Umbraco.Core.Models
             }
         }
 
+        private readonly IDictionary<string, object> _additionalData;
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IDictionary<string, object> IUmbracoEntity.AdditionalData
+        {
+            get { return _additionalData; }
+        }
+
         /// <summary>
         /// Gets or sets a list of integer Ids for allowed ContentTypes
         /// </summary>

src/Umbraco.Core/Models/DataTypeDefinition.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
@@ -31,6 +33,8 @@ namespace Umbraco.Core.Models
         {
             _parentId = parentId;
             _controlId = controlId;
+            _additionalData = new Dictionary<string, object>();
+            _additionalData = new Dictionary<string, object>();
         }
 
         private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.Name);
@@ -160,9 +164,11 @@ namespace Umbraco.Core.Models
                     _trashed = value;
                     return _trashed;
                 }, _trashed, TrashedSelector);
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["Trashed"] = value;
             }
         }
-
+               
         /// <summary>
         /// Id of the DataType control
         /// </summary>
@@ -177,6 +183,8 @@ namespace Umbraco.Core.Models
                     _controlId = value;
                     return _controlId;
                 }, _controlId, ControlIdSelector);
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["ControlId"] = value;
             }
         }
 
@@ -194,9 +202,22 @@ namespace Umbraco.Core.Models
                     _databaseType = value;
                     return _databaseType;
                 }, _databaseType, DatabaseTypeSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["DatabaseType"] = value;
             }
         }
 
+         private readonly IDictionary<string, object> _additionalData;
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IDictionary<string, object> IUmbracoEntity.AdditionalData
+        {
+            get { return _additionalData; }
+        }
+
         internal override void AddingEntity()
         {
             base.AddingEntity();

src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs

@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Models.EntityBase
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.EntityBase
 {
     public interface IUmbracoEntity : IAggregateRoot
     {
@@ -41,5 +43,10 @@
         /// Not all entities support being trashed, they'll always return false.
         /// </remarks>
         bool Trashed { get; }
+
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        IDictionary<string, object> AdditionalData { get; }
     }
 }

src/Umbraco.Core/Models/UmbracoEntity.cs

@@ -44,10 +44,12 @@ namespace Umbraco.Core.Models
 
         public UmbracoEntity()
         {
+            AdditionalData = new Dictionary<string, object>();
         }
 
         public UmbracoEntity(bool trashed)
         {
+            AdditionalData = new Dictionary<string, object>();
             Trashed = trashed;
         }
 
@@ -142,6 +144,9 @@ namespace Umbraco.Core.Models
             }
         }
 
+        public IDictionary<string, object> AdditionalData { get; private set; }
+
+
         public bool HasChildren
         {
             get { return _hasChildren; }
@@ -152,6 +157,9 @@ namespace Umbraco.Core.Models
                     _hasChildren = value;
                     return _hasChildren;
                 }, _hasChildren, HasChildrenSelector);  
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["HasChildren"] = value;
             }
         }
 
@@ -164,7 +172,10 @@ namespace Umbraco.Core.Models
                 {
                     _isPublished = value;
                     return _isPublished;
-                }, _isPublished, IsPublishedSelector);  
+                }, _isPublished, IsPublishedSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["IsPublished"] = value;
             }
         }
 
@@ -178,6 +189,9 @@ namespace Umbraco.Core.Models
                     _isDraft = value;
                     return _isDraft;
                 }, _isDraft, IsDraftSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["IsDraft"] = value;
             }
         }
 
@@ -191,6 +205,9 @@ namespace Umbraco.Core.Models
                     _hasPendingChanges = value;
                     return _hasPendingChanges;
                 }, _hasPendingChanges, HasPendingChangesSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["HasPendingChanges"] = value;
             }
         }
 
@@ -204,6 +221,9 @@ namespace Umbraco.Core.Models
                     _contentTypeAlias = value;
                     return _contentTypeAlias;
                 }, _contentTypeAlias, ContentTypeAliasSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["ContentTypeAlias"] = value;
             }
         }
 
@@ -217,6 +237,9 @@ namespace Umbraco.Core.Models
                     _contentTypeIcon = value;
                     return _contentTypeIcon;
                 }, _contentTypeIcon, ContentTypeIconSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["ContentTypeIcon"] = value;
             }
         }
 
@@ -230,6 +253,9 @@ namespace Umbraco.Core.Models
                     _contentTypeThumbnail = value;
                     return _contentTypeThumbnail;
                 }, _contentTypeThumbnail, ContentTypeThumbnailSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["ContentTypeThumbnail"] = value;
             }
         }
 
@@ -242,10 +268,16 @@ namespace Umbraco.Core.Models
                 {
                     _nodeObjectTypeId = value;
                     return _nodeObjectTypeId;
-                }, _nodeObjectTypeId, NodeObjectTypeIdSelector);  
+                }, _nodeObjectTypeId, NodeObjectTypeIdSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                AdditionalData["NodeObjectTypeId"] = value;
             }
         }
 
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
         public IList<UmbracoProperty> UmbracoProperties { get; set; }
 
         internal class UmbracoProperty