From 44caa0cf057a5b9bd57c7c17c31ea21303f54b77 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@barend.se>
Date: Wed, 14 Jul 2021 10:31:58 +0200
Subject: [PATCH] Obsolete AddPropertyGroup without specifying alias

---
 src/Umbraco.Core/Models/ContentTypeBase.cs    | 22 ++++---------------
 .../Models/ContentTypeCompositionBase.cs      |  5 +++--
 src/Umbraco.Core/Models/IContentTypeBase.cs   |  7 +++---
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index e2dcfce756..ef5eb3dfc3 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -297,26 +297,12 @@ namespace Umbraco.Core.Models
         /// <returns>Returns <c>True</c> if a PropertyType with the passed in alias exists, otherwise <c>False</c></returns>
         public abstract bool PropertyTypeExists(string propertyTypeAlias);
 
-        /// <summary>
-        /// Adds a property group with the alias based on the name.
-        /// This method will also check if a group already exists with the same alias.
-        /// </summary>
-        /// <param name="groupName">Name of the PropertyGroup to add</param>
-        /// <returns>
-        /// Returns <c>True</c> if a PropertyGroup with the passed in name was added, otherwise <c>False</c>
-        /// </returns>
+        /// <inheritdoc />
+        [Obsolete("Use AddPropertyGroup(name, alias) instead to explicitly set the alias.")]
         public abstract bool AddPropertyGroup(string groupName);
 
-        /// <summary>
-        /// Adds a PropertyGroup.
-        /// This method will also check if a group already exists with the same name and link it to the parent.
-        /// </summary>
-        /// <param name="groupName">Name of the PropertyGroup to add</param>
-        /// <param name="alias">The alias.</param>
-        /// <returns>
-        /// Returns <c>True</c> if a PropertyGroup with the passed in name was added, otherwise <c>False</c>
-        /// </returns>
-        public abstract bool AddPropertyGroup(string groupName, string alias);
+        /// <inheritdoc />
+        public abstract bool AddPropertyGroup(string name, string alias);
 
         /// <summary>
         /// Adds a PropertyType to a specific PropertyGroup
diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
index 26150c0eae..67ec52a8b0 100644
--- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
@@ -206,15 +206,16 @@ namespace Umbraco.Core.Models
         }
 
         /// <inheritdoc />
+        [Obsolete("Use AddPropertyGroup(name, alias) instead to explicitly set the alias.")]
         public override bool AddPropertyGroup(string groupName)
         {
             return AddAndReturnPropertyGroup(groupName, groupName.ToSafeAlias(true)) != null;
         }
 
         /// <inheritdoc />
-        public override bool AddPropertyGroup(string groupName, string alias)
+        public override bool AddPropertyGroup(string name, string alias)
         {
-            return AddAndReturnPropertyGroup(groupName, alias) != null;
+            return AddAndReturnPropertyGroup(name, alias) != null;
         }
 
         private PropertyGroup AddAndReturnPropertyGroup(string name, string alias)
diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index 4570202bc7..c489139970 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -154,12 +154,13 @@ namespace Umbraco.Core.Models
         /// <remarks>
         /// This method will also check if a group already exists with the same alias.
         /// </remarks>
+        [Obsolete("Use AddPropertyGroup(name, alias) instead to explicitly set the alias.")]
         bool AddPropertyGroup(string groupName);
 
         /// <summary>
-        /// Adds a property group with the specified <paramref name="groupName" /> and <paramref name="alias" />.
+        /// Adds a property group with the specified <paramref name="name" /> and <paramref name="alias" />.
         /// </summary>
-        /// <param name="groupName">Name of the group.</param>
+        /// <param name="name">Name of the group.</param>
         /// <param name="alias">The alias.</param>
         /// <returns>
         /// Returns <c>true</c> if a property group with specified <paramref name="alias" /> was added; otherwise, <c>false</c>.
@@ -167,7 +168,7 @@ namespace Umbraco.Core.Models
         /// <remarks>
         /// This method will also check if a group already exists with the same alias.
         /// </remarks>
-        bool AddPropertyGroup(string groupName, string alias);
+        bool AddPropertyGroup(string name, string alias);
 
         /// <summary>
         /// Moves a PropertyType to a specified PropertyGroup