diff --git a/src/Umbraco.Core/Dynamics/PropertyResult.cs b/src/Umbraco.Core/Dynamics/PropertyResult.cs index bb2165d184..97d93a653e 100644 --- a/src/Umbraco.Core/Dynamics/PropertyResult.cs +++ b/src/Umbraco.Core/Dynamics/PropertyResult.cs @@ -13,17 +13,15 @@ namespace Umbraco.Core.Dynamics Alias = source.Alias; Value = source.Value; - Version = source.Version; PropertyType = type; } - internal PropertyResult(string alias, object value, Guid version, PropertyResultType type) + internal PropertyResult(string alias, object value, PropertyResultType type) { if (alias == null) throw new ArgumentNullException("alias"); if (value == null) throw new ArgumentNullException("value"); Alias = alias; Value = value; - Version = version; PropertyType = type; } @@ -44,9 +42,6 @@ namespace Umbraco.Core.Dynamics } } - public Guid Version { get; private set; } - - /// /// The Id of the document for which this property belongs to /// diff --git a/src/Umbraco.Core/Models/IPublishedContentProperty.cs b/src/Umbraco.Core/Models/IPublishedContentProperty.cs index 6361c29683..1651e12f04 100644 --- a/src/Umbraco.Core/Models/IPublishedContentProperty.cs +++ b/src/Umbraco.Core/Models/IPublishedContentProperty.cs @@ -5,7 +5,6 @@ namespace Umbraco.Core.Models public interface IPublishedContentProperty { string Alias { get; } - object Value { get; } - Guid Version { get; } + object Value { get; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/PublishedContentExtensions.cs b/src/Umbraco.Core/PublishedContentExtensions.cs index 83e5c53402..9888363f45 100644 --- a/src/Umbraco.Core/PublishedContentExtensions.cs +++ b/src/Umbraco.Core/PublishedContentExtensions.cs @@ -112,7 +112,7 @@ namespace Umbraco.Core } //cache this lookup in a new custom (hidden) property - publishedContent.Properties.Add(new PropertyResult("__recursive__" + fieldname, contentValue, Guid.Empty, PropertyResultType.CustomProperty)); + publishedContent.Properties.Add(new PropertyResult("__recursive__" + fieldname, contentValue, PropertyResultType.CustomProperty)); return contentValue; } diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs index c6ce668a40..57a37ec5e3 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs @@ -140,8 +140,8 @@ namespace Umbraco.Tests.PublishedContent Properties = new Collection( new List() { - new PropertyResult("property1", "value" + indexVals, Guid.NewGuid(), PropertyResultType.UserProperty), - new PropertyResult("property2", "value" + (indexVals + 1), Guid.NewGuid(), PropertyResultType.UserProperty) + new PropertyResult("property1", "value" + indexVals, PropertyResultType.UserProperty), + new PropertyResult("property2", "value" + (indexVals + 1), PropertyResultType.UserProperty) }), Children = new List() }; @@ -157,11 +157,11 @@ namespace Umbraco.Tests.PublishedContent if (!createChildren) { //create additional columns, used to test the different columns for child nodes - d.Properties.Add(new PropertyResult("property4", "value" + (indexVals + 2), Guid.NewGuid(), PropertyResultType.UserProperty)); + d.Properties.Add(new PropertyResult("property4", "value" + (indexVals + 2), PropertyResultType.UserProperty)); } else { - d.Properties.Add(new PropertyResult("property3", "value" + (indexVals + 2), Guid.NewGuid(), PropertyResultType.UserProperty)); + d.Properties.Add(new PropertyResult("property3", "value" + (indexVals + 2), PropertyResultType.UserProperty)); } return d; } diff --git a/src/Umbraco.Web/ExamineExtensions.cs b/src/Umbraco.Web/ExamineExtensions.cs index e24cf1c9b0..cd309fe180 100644 --- a/src/Umbraco.Web/ExamineExtensions.cs +++ b/src/Umbraco.Web/ExamineExtensions.cs @@ -30,7 +30,7 @@ namespace Umbraco.Web var doc = cache.GetById(result.Id); if (doc == null) continue; //skip if this doesn't exist in the cache doc.Properties.Add( - new PropertyResult("examineScore", result.Score.ToString(), Guid.Empty, PropertyResultType.CustomProperty)); + new PropertyResult("examineScore", result.Score.ToString(), PropertyResultType.CustomProperty)); list.Add(doc); } return list; diff --git a/src/Umbraco.Web/Models/DynamicPublishedContent.cs b/src/Umbraco.Web/Models/DynamicPublishedContent.cs index 3ff0732f99..07a8f42c96 100644 --- a/src/Umbraco.Web/Models/DynamicPublishedContent.cs +++ b/src/Umbraco.Web/Models/DynamicPublishedContent.cs @@ -411,7 +411,7 @@ namespace Umbraco.Web.Models return !attempt.Success ? null - : new PropertyResult(alias, attempt.Result, Guid.Empty, PropertyResultType.ReflectedProperty) + : new PropertyResult(alias, attempt.Result, PropertyResultType.ReflectedProperty) { DocumentTypeAlias = content.DocumentTypeAlias, DocumentId = content.Id diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs index c0f156de87..43f3f5cdc9 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs @@ -514,8 +514,8 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache { //this is taken from examine _properties.Add(i.Key.InvariantStartsWith("__") - ? new PropertyResult(i.Key, i.Value, Guid.Empty, PropertyResultType.CustomProperty) - : new PropertyResult(i.Key, i.Value, Guid.Empty, PropertyResultType.UserProperty)); + ? new PropertyResult(i.Key, i.Value, PropertyResultType.CustomProperty) + : new PropertyResult(i.Key, i.Value, PropertyResultType.UserProperty)); } } diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicBackingItem.cs b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicBackingItem.cs index 179998201a..0362095d4f 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicBackingItem.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicBackingItem.cs @@ -146,7 +146,7 @@ namespace umbraco.MacroEngines } if (result != null) { - return new PropertyResult(alias, string.Format("{0}", result), Guid.Empty) { ContextAlias = content.NodeTypeAlias, ContextId = content.Id }; + return new PropertyResult(alias, string.Format("{0}", result)) { ContextAlias = content.NodeTypeAlias, ContextId = content.Id }; } } } @@ -188,7 +188,7 @@ namespace umbraco.MacroEngines } if (result != null) { - return new PropertyResult(alias, string.Format("{0}", result), Guid.Empty) { ContextAlias = content.NodeTypeAlias, ContextId = content.Id }; + return new PropertyResult(alias, string.Format("{0}", result)) { ContextAlias = content.NodeTypeAlias, ContextId = content.Id }; } } } diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/ExamineBackedMedia.cs b/src/umbraco.MacroEngines/RazorDynamicNode/ExamineBackedMedia.cs index 92c2f84323..f6351623ff 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/ExamineBackedMedia.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/ExamineBackedMedia.cs @@ -141,7 +141,7 @@ namespace umbraco.MacroEngines } Values.Add(result.Current.Name, value); propertyExists = true; - return new PropertyResult(alias, value, Guid.Empty); + return new PropertyResult(alias, value); } } } @@ -376,7 +376,7 @@ namespace umbraco.MacroEngines return Values .Where(kvp => !internalProperties.Contains(kvp.Key)) .ToList() - .ConvertAll(kvp => new PropertyResult(kvp.Key, kvp.Value, Guid.Empty)) + .ConvertAll(kvp => new PropertyResult(kvp.Key, kvp.Value)) .Cast() .ToList(); } @@ -473,7 +473,7 @@ namespace umbraco.MacroEngines || Values.TryGetValue(alias, out value)) { propertyExists = true; - return new PropertyResult(alias, value, Guid.Empty); + return new PropertyResult(alias, value); } propertyExists = false; diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs b/src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs index 76fb729cec..6d9696e836 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs @@ -12,7 +12,6 @@ namespace umbraco.MacroEngines { private string _alias; private string _value; - private Guid _version; public PropertyResult(IProperty source) { @@ -20,20 +19,17 @@ namespace umbraco.MacroEngines { this._alias = source.Alias; this._value = source.Value; - this._version = source.Version; } } - public PropertyResult(string alias, string value, Guid version) + public PropertyResult(string alias, string value) { this._alias = alias; this._value = value; - this._version = version; } public PropertyResult(Property source) { this._alias = source.PropertyType.Alias; this._value = string.Format("{0}", source.Value); - this._version = source.VersionId; } public string Alias { @@ -44,12 +40,7 @@ namespace umbraco.MacroEngines { get { return _value; } } - - public Guid Version - { - get { return _version; } - } - + public bool IsNull() { return Value == null; diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs b/src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs index 1dabc444ac..1b52810943 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs @@ -20,7 +20,7 @@ namespace umbraco.MacroEngines.Library internal static IProperty ConvertToNodeProperty(this IPublishedContentProperty prop) { - return new PropertyResult(prop.Alias, prop.Value.ToString(), prop.Version); + return new PropertyResult(prop.Alias, prop.Value.ToString()); } internal static INode ConvertToNode(this IPublishedContent doc) diff --git a/src/umbraco.interfaces/IProperty.cs b/src/umbraco.interfaces/IProperty.cs index 78ce237916..ce4188cd06 100644 --- a/src/umbraco.interfaces/IProperty.cs +++ b/src/umbraco.interfaces/IProperty.cs @@ -6,7 +6,6 @@ namespace umbraco.interfaces { string Alias { get; } string Value { get; } - Guid Version { get; } string ToString(); } } \ No newline at end of file