Merge branch 'v8/8.17' into v9/feature/merge_v8.17-rc

src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasic.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 
@@ -32,12 +33,22 @@ namespace Umbraco.Cms.Core.Models.ContentEditing
         [DataMember(Name = "id")]
         public int Id { get; set; }
 
-        [DataMember(Name = "sortOrder")]
-        public int SortOrder { get; set; }
+        [DataMember(Name = "key")]
+        public Guid Key { get; set; }
+
+        [DataMember(Name = "type")]
+        public PropertyGroupType Type { get; set; }
 
         [Required]
         [DataMember(Name = "name")]
         public string Name { get; set; }
+
+        [Required]
+        [DataMember(Name = "alias")]
+        public string Alias { get; set; }
+
+        [DataMember(Name = "sortOrder")]
+        public int SortOrder { get; set; }
     }
 
     [DataContract(Name = "propertyGroup", Namespace = "")]
@@ -52,4 +63,10 @@ namespace Umbraco.Cms.Core.Models.ContentEditing
         [DataMember(Name = "properties")]
         public IEnumerable<TPropertyType> Properties { get; set; }
     }
+
+    internal static class PropertyGroupBasicExtensions
+    {
+        public static string GetParentAlias(this PropertyGroupBasic propertyGroup)
+            => PropertyGroupExtensions.GetParentAlias(propertyGroup.Alias);
+    }
 }