Merge remote-tracking branch 'origin/v8/8.5' into v8/dev

# Conflicts:
#	src/SolutionInfo.cs

src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs

@@ -7,7 +7,7 @@ namespace Umbraco.ModelsBuilder.Embedded
     /// </summary>
     /// <remarks>And therefore it should not be generated.</remarks>
     [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
-    public sealed class ImplementPropertyTypeAttribute : Attribute
+    public class ImplementPropertyTypeAttribute : Attribute
     {
         public ImplementPropertyTypeAttribute(string alias)
         {

src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs

@@ -17,7 +17,7 @@ namespace Umbraco.Web
         /// <summary>
         /// Gets the value of a property.
         /// </summary>
-        public static TValue Value<TModel, TValue>(this TModel model, Expression<Func<TModel, TValue>> property, string culture = null, string segment = null, Fallback fallback = default, TValue defaultValue = default)
+        public static TValue ValueFor<TModel, TValue>(this TModel model, Expression<Func<TModel, TValue>> property, string culture = null, string segment = null, Fallback fallback = default, TValue defaultValue = default)
             where TModel : IPublishedElement
         {
             var alias = GetAlias(model, property);
@@ -45,7 +45,7 @@ namespace Umbraco.Web
             var attribute = member.GetCustomAttribute<ImplementPropertyTypeAttribute>();
             if (attribute == null)
                 throw new InvalidOperationException("Property is not marked with ImplementPropertyType attribute.");
-            
+
             return attribute.Alias;
         }
     }

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -429,4 +429,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
+</Project>