Update deprecations for 9.13.1

bdukes · bdukes · commit c70a8ba90f68 · 2023-10-24T15:48:27.000-05:00
Deprecate SkinPackageInfo.Skins, rename list to SkinPackageInfo.SkinsList
diff --git a/DNN Platform/Library/UI/Skins/SkinController.cs b/DNN Platform/Library/UI/Skins/SkinController.cs
@@ -39,7 +39,7 @@ public partial class SkinController : ISkinService
         private static readonly Regex LdirRegex = new Regex("\\[l]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         /// <inheritdoc cref="ISkinService.RootSkin" />
-        [Obsolete($"Deprecated in DotNetNuke 10.0.0. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]
+        [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]
         public static string RootSkin
         {
             get
@@ -49,7 +49,7 @@ public static string RootSkin
         }
 
         /// <inheritdoc cref="ISkinService.RootContainer" />
-        [Obsolete($"Deprecated in DotNetNuke 10.0.0. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]
+        [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]
         public static string RootContainer
         {
             get
@@ -59,21 +59,21 @@ public static string RootContainer
         }
 
         /// <inheritdoc cref="ISkinService.AddSkin" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkin)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkin)} instead.")]
         public static partial int AddSkin(int skinPackageID, string skinSrc)
         {
             return DataProvider.Instance().AddSkin(skinPackageID, skinSrc);
         }
 
         /// <inheritdoc cref="ISkinService.AddSkinPackage" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkinPackage)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkinPackage)} instead.")]
         public static partial int AddSkinPackage(SkinPackageInfo skinPackage)
         {
             return AddSkinPackage((ISkinPackageInfo)skinPackage);
         }
 
         /// <inheritdoc cref="ISkinService.CanDeleteSkinFolder" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.CanDeleteSkinFolder)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.CanDeleteSkinFolder)} instead.")]
         public static partial bool CanDeleteSkin(string folderPath, string portalHomeDirMapPath)
         {
             string skinType;
@@ -126,14 +126,14 @@ public static partial bool CanDeleteSkin(string folderPath, string portalHomeDir
         }
 
         /// <inheritdoc cref="ISkinService.DeleteSkin" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkin)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkin)} instead.")]
         public static partial void DeleteSkin(int skinID)
         {
             DataProvider.Instance().DeleteSkin(skinID);
         }
 
         /// <inheritdoc cref="ISkinService.DeleteSkinPackage" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkinPackage)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkinPackage)} instead.")]
         public static partial void DeleteSkinPackage(SkinPackageInfo skinPackage)
         {
             DeleteSkinPackage((ISkinPackageInfo)skinPackage);
@@ -167,7 +167,7 @@ public static string FormatMessage(string title, string body, int level, bool is
         }
 
         /// <inheritdoc cref="ISkinService.FormatSkinPath" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinPath)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinPath)} instead.")]
         public static partial string FormatSkinPath(string skinSrc)
         {
             string strSkinSrc = skinSrc;
@@ -180,7 +180,7 @@ public static partial string FormatSkinPath(string skinSrc)
         }
 
         /// <inheritdoc cref="ISkinService.FormatSkinSrc" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinSrc)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinSrc)} instead.")]
         public static partial string FormatSkinSrc(string skinSrc, PortalSettings portalSettings)
         {
             return FormatSkinSrc(skinSrc, (IPortalSettings)portalSettings);
@@ -192,7 +192,7 @@ public static partial string FormatSkinSrc(string skinSrc, PortalSettings portal
         /// To get the default admin container for the portal use <see cref="IPortalSettings.DefaultAdminContainer"/> instead.
         /// </remarks>
         /// <returns>The global default admin container.</returns>
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
         public static partial string GetDefaultAdminContainer()
         {
             SkinDefaults defaultContainer = SkinDefaults.GetSkinDefaults(SkinDefaultType.ContainerInfo);
@@ -205,7 +205,7 @@ public static partial string GetDefaultAdminContainer()
         /// To get the default admin skin for the portal use <see cref="IPortalSettings.DefaultAdminSkin"/> instead.
         /// </remarks>
         /// <returns>The global default admin skin.</returns>
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
         public static partial string GetDefaultAdminSkin()
         {
             SkinDefaults defaultSkin = SkinDefaults.GetSkinDefaults(SkinDefaultType.SkinInfo);
@@ -218,7 +218,7 @@ public static partial string GetDefaultAdminSkin()
         /// To get the default skin for the portal use <see cref="IPortalSettings.DefaultPortalSkin"/> instead.
         /// </remarks>
         /// <returns>The global default skin.</returns>
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
         public static partial string GetDefaultPortalContainer()
         {
             SkinDefaults defaultContainer = SkinDefaults.GetSkinDefaults(SkinDefaultType.ContainerInfo);
@@ -231,36 +231,36 @@ public static partial string GetDefaultPortalContainer()
         /// To get the default skin for the portal use <see cref="IPortalSettings.DefaultPortalSkin"/> instead.
         /// </remarks>
         /// <returns>The global default skin.</returns>
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]
         public static partial string GetDefaultPortalSkin()
         {
             SkinDefaults defaultSkin = SkinDefaults.GetSkinDefaults(SkinDefaultType.SkinInfo);
             return "[G]" + RootSkin + defaultSkin.Folder + defaultSkin.DefaultName;
         }
 
         /// <inheritdoc cref="ISkinService.GetSkinByPackageID" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackageById)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackageById)} instead.")]
         public static partial SkinPackageInfo GetSkinByPackageID(int packageID)
         {
             return CBO.FillObject<SkinPackageInfo>(DataProvider.Instance().GetSkinByPackageID(packageID));
         }
 
         /// <inheritdoc cref="ISkinService.GetSkinPackage" />]
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackage)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackage)} instead.")]
         public static partial SkinPackageInfo GetSkinPackage(int portalId, string skinName, string skinType)
         {
             return CBO.FillObject<SkinPackageInfo>(DataProvider.Instance().GetSkinPackage(portalId, skinName, skinType));
         }
 
         /// <inheritdoc cref="ISkinService.GetSkinsInFolder" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]
         public static partial List<KeyValuePair<string, string>> GetSkins(PortalInfo portalInfo, string skinRoot, SkinScope scope)
         {
             return GetSkins((IPortalInfo)portalInfo, skinRoot, scope);
         }
 
         /// <inheritdoc cref="ISkinService.GetSkinsInFolder" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]
         public static partial List<KeyValuePair<string, string>> GetSkins(IPortalInfo portalInfo, string skinRoot, SkinScope scope)
         {
             var skins = new List<KeyValuePair<string, string>>();
@@ -282,14 +282,14 @@ public static partial List<KeyValuePair<string, string>> GetSkins(IPortalInfo po
         }
 
         /// <inheritdoc cref="ISkinService.IsGlobalSkin" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.IsGlobalSkin)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.IsGlobalSkin)} instead.")]
         public static partial bool IsGlobalSkin(string skinSrc)
         {
             return skinSrc.Contains(Globals.HostPath);
         }
 
         /// <inheritdoc cref="ISkinService.SetSkin" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.SetSkin)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.SetSkin)} instead.")]
         public static partial void SetSkin(string skinRoot, int portalId, SkinType skinType, string skinSrc)
         {
             var selectedCultureCode = LocaleController.Instance.GetCurrentLocale(portalId).Code;
@@ -351,14 +351,14 @@ public static partial void SetSkin(string skinRoot, int portalId, SkinType skinT
         }
 
         /// <inheritdoc cref="ISkinService.UpdateSkin" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]
         public static partial void UpdateSkin(int skinID, string skinSrc)
         {
             DataProvider.Instance().UpdateSkin(skinID, skinSrc);
         }
 
         /// <inheritdoc cref="ISkinService.UpdateSkinPackage" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]
+        [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]
         public static partial void UpdateSkinPackage(SkinPackageInfo skinPackage)
         {
             UpdateSkinPackage((ISkinPackageInfo)skinPackage);
diff --git a/DNN Platform/Library/UI/Skins/SkinInfo.cs b/DNN Platform/Library/UI/Skins/SkinInfo.cs
@@ -6,7 +6,6 @@ namespace DotNetNuke.UI.Skins
     using System;
 
     using DotNetNuke.Abstractions.Skins;
-    using DotNetNuke.Internal.SourceGenerators;
 
     /// Project  : DotNetNuke
     /// Class    : SkinInfo
diff --git a/DNN Platform/Library/UI/Skins/SkinPackageInfo.cs b/DNN Platform/Library/UI/Skins/SkinPackageInfo.cs
@@ -24,53 +24,57 @@ namespace DotNetNuke.UI.Skins
     [Serializable]
     public class SkinPackageInfo : BaseEntityInfo, IHydratable, ISkinPackageInfo
     {
-        private int packageID = Null.NullInteger;
-        private int portalID = Null.NullInteger;
+        private int packageId = Null.NullInteger;
+        private int portalId = Null.NullInteger;
         private string skinName;
-        private int skinPackageID = Null.NullInteger;
+        private int skinPackageId = Null.NullInteger;
         private string skinType;
-        private List<SkinInfo> skins = new List<SkinInfo>();
+        private Dictionary<int, string> skins = new Dictionary<int, string>();
+        private List<SkinInfo> skinsList = new List<SkinInfo>();
         private AbstractionList<ISkinInfo, SkinInfo> abstractSkins;
 
         /// <inheritdoc cref="ISkinPackageInfo.PackageId"/>
+        [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.PackageId)} instead. Scheduled for removal in v11.0.0.")]
         public int PackageID
         {
             get
             {
-                return this.packageID;
+                return ((ISkinPackageInfo)this).PackageId;
             }
 
             set
             {
-                this.packageID = value;
+                ((ISkinPackageInfo)this).PackageId = value;
             }
         }
 
         /// <inheritdoc cref="ISkinPackageInfo.SkinPackageId"/>
+        [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.SkinPackageId)} instead. Scheduled for removal in v11.0.0.")]
         public int SkinPackageID
         {
             get
             {
-                return this.skinPackageID;
+                return ((ISkinPackageInfo)this).SkinPackageId;
             }
 
             set
             {
-                this.skinPackageID = value;
+                ((ISkinPackageInfo)this).SkinPackageId = value;
             }
         }
 
         /// <inheritdoc cref="ISkinPackageInfo.PortalId"/>
+        [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.PortalId)} instead. Scheduled for removal in v11.0.0.")]
         public int PortalID
         {
             get
             {
-                return this.portalID;
+                return ((ISkinPackageInfo)this).PortalId;
             }
 
             set
             {
-                this.portalID = value;
+                ((ISkinPackageInfo)this).PortalId = value;
             }
         }
 
@@ -88,10 +92,11 @@ public string SkinName
             }
         }
 
-        /// <inheritdoc cref="ISkinPackageInfo.Skins"/>
+        /// <summary>Gets or sets a dictionary mapping from <see cref="SkinInfo.SkinId"/> to <see cref="SkinInfo.SkinSrc"/>.</summary>
         [XmlIgnore]
         [JsonIgnore]
-        public List<SkinInfo> Skins
+        [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.Skins)} instead. Scheduled for removal in v11.0.0.")]
+        public Dictionary<int, string> Skins
         {
             get
             {
@@ -104,6 +109,22 @@ public List<SkinInfo> Skins
             }
         }
 
+        /// <inheritdoc cref="ISkinPackageInfo.Skins"/>
+        [XmlIgnore]
+        [JsonIgnore]
+        public List<SkinInfo> SkinsList
+        {
+            get
+            {
+                return this.skinsList;
+            }
+
+            set
+            {
+                this.skinsList = value;
+            }
+        }
+
         /// <inheritdoc cref="ISkinPackageInfo.SkinType"/>
         public string SkinType
         {
@@ -123,12 +144,12 @@ public int KeyID
         {
             get
             {
-                return this.SkinPackageID;
+                return ((ISkinPackageInfo)this).SkinPackageId;
             }
 
             set
             {
-                this.SkinPackageID = value;
+                ((ISkinPackageInfo)this).SkinPackageId = value;
             }
         }
 
@@ -137,17 +158,17 @@ public int KeyID
         [JsonIgnore]
         int ISkinPackageInfo.PackageId
         {
-            get => this.PackageID;
-            set => this.PackageID = value;
+            get => this.packageId;
+            set => this.packageId = value;
         }
 
         /// <inheritdoc/>
         [XmlIgnore]
         [JsonIgnore]
         int ISkinPackageInfo.SkinPackageId
         {
-            get => this.SkinPackageID;
-            set => this.SkinPackageID = value;
+            get => this.skinPackageId;
+            set => this.skinPackageId = value;
         }
 
         /// <inheritdoc/>
@@ -157,7 +178,7 @@ IObjectList<ISkinInfo> ISkinPackageInfo.Skins
         {
             get
             {
-                return this.abstractSkins ??= new AbstractionList<ISkinInfo, SkinInfo>(this.Skins);
+                return this.abstractSkins ??= new AbstractionList<ISkinInfo, SkinInfo>(this.SkinsList);
             }
         }
 
@@ -175,16 +196,17 @@ SkinPackageType ISkinPackageInfo.SkinType
         [JsonIgnore]
         int ISkinPackageInfo.PortalId
         {
-            get => this.PortalID;
-            set => this.PortalID = value;
+            get => this.portalId;
+            set => this.portalId = value;
         }
 
         /// <inheritdoc/>
         public void Fill(IDataReader dr)
         {
-            this.SkinPackageID = Null.SetNullInteger(dr["SkinPackageID"]);
-            this.PackageID = Null.SetNullInteger(dr["PackageID"]);
-            this.SkinName = Null.SetNullString(dr["SkinName"]);
+            var @this = (ISkinPackageInfo)this;
+            @this.SkinPackageId = Null.SetNullInteger(dr["SkinPackageID"]);
+            @this.PackageId = Null.SetNullInteger(dr["PackageID"]);
+            @this.SkinName = Null.SetNullString(dr["SkinName"]);
             this.SkinType = Null.SetNullString(dr["SkinType"]);
 
             // Call the base classes fill method to populate base class properties
@@ -194,15 +216,17 @@ public void Fill(IDataReader dr)
             {
                 while (dr.Read())
                 {
-                    int skinID = Null.SetNullInteger(dr["SkinID"]);
-                    if (skinID > Null.NullInteger)
+                    int skinId = Null.SetNullInteger(dr["SkinID"]);
+                    if (skinId > Null.NullInteger)
                     {
-                        this.skins.Add(new SkinInfo
+                        var skinSrc = Null.SetNullString(dr["SkinSrc"]);
+                        this.skins[skinId] = skinSrc;
+                        this.skinsList.Add(new SkinInfo
                         {
-                            SkinId = skinID,
-                            SkinSrc = Null.SetNullString(dr["SkinSrc"]),
-                            SkinPackageId = this.SkinPackageID,
-                            PortalId = this.PortalID,
+                            SkinId = skinId,
+                            SkinSrc = skinSrc,
+                            SkinPackageId = @this.SkinPackageId,
+                            PortalId = @this.PortalId,
                             SkinRoot = SkinUtils.FromDatabaseName(this.SkinType) switch
                             {
                                 SkinPackageType.Container => SkinController.RootContainer,

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public partial class SkinController : ISkinService`
`39`	`39`	`private static readonly Regex LdirRegex = new Regex("\\[l]", RegexOptions.IgnoreCase \| RegexOptions.Compiled);`
`40`	`40`
`41`	`41`	`/// <inheritdoc cref="ISkinService.RootSkin" />`
`42`		`- [Obsolete($"Deprecated in DotNetNuke 10.0.0. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]`
	`42`	`+ [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]`
`43`	`43`	`public static string RootSkin`
`44`	`44`	`{`
`45`	`45`	`get`
`@@ -49,7 +49,7 @@ public static string RootSkin`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/// <inheritdoc cref="ISkinService.RootContainer" />`
`52`		`- [Obsolete($"Deprecated in DotNetNuke 10.0.0. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]`
	`52`	`+ [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(SkinType)}.{nameof(ISkinService.GetFolderName)} instead. Scheduled removal in v12.0.0.")]`
`53`	`53`	`public static string RootContainer`
`54`	`54`	`{`
`55`	`55`	`get`
`@@ -59,21 +59,21 @@ public static string RootContainer`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/// <inheritdoc cref="ISkinService.AddSkin" />`
`62`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkin)} instead.")]`
	`62`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkin)} instead.")]`
`63`	`63`	`public static partial int AddSkin(int skinPackageID, string skinSrc)`
`64`	`64`	`{`
`65`	`65`	`return DataProvider.Instance().AddSkin(skinPackageID, skinSrc);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/// <inheritdoc cref="ISkinService.AddSkinPackage" />`
`69`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkinPackage)} instead.")]`
	`69`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.AddSkinPackage)} instead.")]`
`70`	`70`	`public static partial int AddSkinPackage(SkinPackageInfo skinPackage)`
`71`	`71`	`{`
`72`	`72`	`return AddSkinPackage((ISkinPackageInfo)skinPackage);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/// <inheritdoc cref="ISkinService.CanDeleteSkinFolder" />`
`76`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.CanDeleteSkinFolder)} instead.")]`
	`76`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.CanDeleteSkinFolder)} instead.")]`
`77`	`77`	`public static partial bool CanDeleteSkin(string folderPath, string portalHomeDirMapPath)`
`78`	`78`	`{`
`79`	`79`	`string skinType;`
`@@ -126,14 +126,14 @@ public static partial bool CanDeleteSkin(string folderPath, string portalHomeDir`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/// <inheritdoc cref="ISkinService.DeleteSkin" />`
`129`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkin)} instead.")]`
	`129`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkin)} instead.")]`
`130`	`130`	`public static partial void DeleteSkin(int skinID)`
`131`	`131`	`{`
`132`	`132`	`DataProvider.Instance().DeleteSkin(skinID);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/// <inheritdoc cref="ISkinService.DeleteSkinPackage" />`
`136`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkinPackage)} instead.")]`
	`136`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.DeleteSkinPackage)} instead.")]`
`137`	`137`	`public static partial void DeleteSkinPackage(SkinPackageInfo skinPackage)`
`138`	`138`	`{`
`139`	`139`	`DeleteSkinPackage((ISkinPackageInfo)skinPackage);`
`@@ -167,7 +167,7 @@ public static string FormatMessage(string title, string body, int level, bool is`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/// <inheritdoc cref="ISkinService.FormatSkinPath" />`
`170`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinPath)} instead.")]`
	`170`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinPath)} instead.")]`
`171`	`171`	`public static partial string FormatSkinPath(string skinSrc)`
`172`	`172`	`{`
`173`	`173`	`string strSkinSrc = skinSrc;`
`@@ -180,7 +180,7 @@ public static partial string FormatSkinPath(string skinSrc)`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/// <inheritdoc cref="ISkinService.FormatSkinSrc" />`
`183`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinSrc)} instead.")]`
	`183`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.FormatSkinSrc)} instead.")]`
`184`	`184`	`public static partial string FormatSkinSrc(string skinSrc, PortalSettings portalSettings)`
`185`	`185`	`{`
`186`	`186`	`return FormatSkinSrc(skinSrc, (IPortalSettings)portalSettings);`
`@@ -192,7 +192,7 @@ public static partial string FormatSkinSrc(string skinSrc, PortalSettings portal`
`192`	`192`	`/// To get the default admin container for the portal use <see cref="IPortalSettings.DefaultAdminContainer"/> instead.`
`193`	`193`	`/// </remarks>`
`194`	`194`	`/// <returns>The global default admin container.</returns>`
`195`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
	`195`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
`196`	`196`	`public static partial string GetDefaultAdminContainer()`
`197`	`197`	`{`
`198`	`198`	`SkinDefaults defaultContainer = SkinDefaults.GetSkinDefaults(SkinDefaultType.ContainerInfo);`
`@@ -205,7 +205,7 @@ public static partial string GetDefaultAdminContainer()`
`205`	`205`	`/// To get the default admin skin for the portal use <see cref="IPortalSettings.DefaultAdminSkin"/> instead.`
`206`	`206`	`/// </remarks>`
`207`	`207`	`/// <returns>The global default admin skin.</returns>`
`208`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
	`208`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
`209`	`209`	`public static partial string GetDefaultAdminSkin()`
`210`	`210`	`{`
`211`	`211`	`SkinDefaults defaultSkin = SkinDefaults.GetSkinDefaults(SkinDefaultType.SkinInfo);`
`@@ -218,7 +218,7 @@ public static partial string GetDefaultAdminSkin()`
`218`	`218`	`/// To get the default skin for the portal use <see cref="IPortalSettings.DefaultPortalSkin"/> instead.`
`219`	`219`	`/// </remarks>`
`220`	`220`	`/// <returns>The global default skin.</returns>`
`221`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
	`221`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
`222`	`222`	`public static partial string GetDefaultPortalContainer()`
`223`	`223`	`{`
`224`	`224`	`SkinDefaults defaultContainer = SkinDefaults.GetSkinDefaults(SkinDefaultType.ContainerInfo);`
`@@ -231,36 +231,36 @@ public static partial string GetDefaultPortalContainer()`
`231`	`231`	`/// To get the default skin for the portal use <see cref="IPortalSettings.DefaultPortalSkin"/> instead.`
`232`	`232`	`/// </remarks>`
`233`	`233`	`/// <returns>The global default skin.</returns>`
`234`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
	`234`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetDefaultSkinSrc)} instead.")]`
`235`	`235`	`public static partial string GetDefaultPortalSkin()`
`236`	`236`	`{`
`237`	`237`	`SkinDefaults defaultSkin = SkinDefaults.GetSkinDefaults(SkinDefaultType.SkinInfo);`
`238`	`238`	`return "[G]" + RootSkin + defaultSkin.Folder + defaultSkin.DefaultName;`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`/// <inheritdoc cref="ISkinService.GetSkinByPackageID" />`
`242`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackageById)} instead.")]`
	`242`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackageById)} instead.")]`
`243`	`243`	`public static partial SkinPackageInfo GetSkinByPackageID(int packageID)`
`244`	`244`	`{`
`245`	`245`	`return CBO.FillObject<SkinPackageInfo>(DataProvider.Instance().GetSkinByPackageID(packageID));`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`/// <inheritdoc cref="ISkinService.GetSkinPackage" />]`
`249`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackage)} instead.")]`
	`249`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinPackage)} instead.")]`
`250`	`250`	`public static partial SkinPackageInfo GetSkinPackage(int portalId, string skinName, string skinType)`
`251`	`251`	`{`
`252`	`252`	`return CBO.FillObject<SkinPackageInfo>(DataProvider.Instance().GetSkinPackage(portalId, skinName, skinType));`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`/// <inheritdoc cref="ISkinService.GetSkinsInFolder" />`
`256`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]`
	`256`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]`
`257`	`257`	`public static partial List<KeyValuePair<string, string>> GetSkins(PortalInfo portalInfo, string skinRoot, SkinScope scope)`
`258`	`258`	`{`
`259`	`259`	`return GetSkins((IPortalInfo)portalInfo, skinRoot, scope);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`/// <inheritdoc cref="ISkinService.GetSkinsInFolder" />`
`263`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]`
	`263`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.GetSkinsInFolder)} instead.")]`
`264`	`264`	`public static partial List<KeyValuePair<string, string>> GetSkins(IPortalInfo portalInfo, string skinRoot, SkinScope scope)`
`265`	`265`	`{`
`266`	`266`	`var skins = new List<KeyValuePair<string, string>>();`
`@@ -282,14 +282,14 @@ public static partial List<KeyValuePair<string, string>> GetSkins(IPortalInfo po`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`/// <inheritdoc cref="ISkinService.IsGlobalSkin" />`
`285`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.IsGlobalSkin)} instead.")]`
	`285`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.IsGlobalSkin)} instead.")]`
`286`	`286`	`public static partial bool IsGlobalSkin(string skinSrc)`
`287`	`287`	`{`
`288`	`288`	`return skinSrc.Contains(Globals.HostPath);`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`/// <inheritdoc cref="ISkinService.SetSkin" />`
`292`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.SetSkin)} instead.")]`
	`292`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.SetSkin)} instead.")]`
`293`	`293`	`public static partial void SetSkin(string skinRoot, int portalId, SkinType skinType, string skinSrc)`
`294`	`294`	`{`
`295`	`295`	`var selectedCultureCode = LocaleController.Instance.GetCurrentLocale(portalId).Code;`
`@@ -351,14 +351,14 @@ public static partial void SetSkin(string skinRoot, int portalId, SkinType skinT`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`/// <inheritdoc cref="ISkinService.UpdateSkin" />`
`354`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]`
	`354`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]`
`355`	`355`	`public static partial void UpdateSkin(int skinID, string skinSrc)`
`356`	`356`	`{`
`357`	`357`	`DataProvider.Instance().UpdateSkin(skinID, skinSrc);`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`/// <inheritdoc cref="ISkinService.UpdateSkinPackage" />`
`361`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]`
	`361`	`+ [DnnDeprecated(9, 13, 1, $"Use {nameof(ISkinService)}.{nameof(ISkinService.UpdateSkin)} instead.")]`
`362`	`362`	`public static partial void UpdateSkinPackage(SkinPackageInfo skinPackage)`
`363`	`363`	`{`
`364`	`364`	`UpdateSkinPackage((ISkinPackageInfo)skinPackage);`
Original file line number	Diff line number	Diff line change
`@@ -24,53 +24,57 @@ namespace DotNetNuke.UI.Skins`
`24`	`24`	`[Serializable]`
`25`	`25`	`public class SkinPackageInfo : BaseEntityInfo, IHydratable, ISkinPackageInfo`
`26`	`26`	`{`
`27`		`- private int packageID = Null.NullInteger;`
`28`		`- private int portalID = Null.NullInteger;`
	`27`	`+ private int packageId = Null.NullInteger;`
	`28`	`+ private int portalId = Null.NullInteger;`
`29`	`29`	`private string skinName;`
`30`		`- private int skinPackageID = Null.NullInteger;`
	`30`	`+ private int skinPackageId = Null.NullInteger;`
`31`	`31`	`private string skinType;`
`32`		`- private List<SkinInfo> skins = new List<SkinInfo>();`
	`32`	`+ private Dictionary<int, string> skins = new Dictionary<int, string>();`
	`33`	`+ private List<SkinInfo> skinsList = new List<SkinInfo>();`
`33`	`34`	`private AbstractionList<ISkinInfo, SkinInfo> abstractSkins;`
`34`	`35`
`35`	`36`	`/// <inheritdoc cref="ISkinPackageInfo.PackageId"/>`
	`37`	`+ [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.PackageId)} instead. Scheduled for removal in v11.0.0.")]`
`36`	`38`	`public int PackageID`
`37`	`39`	`{`
`38`	`40`	`get`
`39`	`41`	`{`
`40`		`- return this.packageID;`
	`42`	`+ return ((ISkinPackageInfo)this).PackageId;`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`set`
`44`	`46`	`{`
`45`		`- this.packageID = value;`
	`47`	`+ ((ISkinPackageInfo)this).PackageId = value;`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`/// <inheritdoc cref="ISkinPackageInfo.SkinPackageId"/>`
	`52`	`+ [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.SkinPackageId)} instead. Scheduled for removal in v11.0.0.")]`
`50`	`53`	`public int SkinPackageID`
`51`	`54`	`{`
`52`	`55`	`get`
`53`	`56`	`{`
`54`		`- return this.skinPackageID;`
	`57`	`+ return ((ISkinPackageInfo)this).SkinPackageId;`
`55`	`58`	`}`
`56`	`59`
`57`	`60`	`set`
`58`	`61`	`{`
`59`		`- this.skinPackageID = value;`
	`62`	`+ ((ISkinPackageInfo)this).SkinPackageId = value;`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`
`63`	`66`	`/// <inheritdoc cref="ISkinPackageInfo.PortalId"/>`
	`67`	`+ [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.PortalId)} instead. Scheduled for removal in v11.0.0.")]`
`64`	`68`	`public int PortalID`
`65`	`69`	`{`
`66`	`70`	`get`
`67`	`71`	`{`
`68`		`- return this.portalID;`
	`72`	`+ return ((ISkinPackageInfo)this).PortalId;`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`set`
`72`	`76`	`{`
`73`		`- this.portalID = value;`
	`77`	`+ ((ISkinPackageInfo)this).PortalId = value;`
`74`	`78`	`}`
`75`	`79`	`}`
`76`	`80`
`@@ -88,10 +92,11 @@ public string SkinName`
`88`	`92`	`}`
`89`	`93`	`}`
`90`	`94`
`91`		`- /// <inheritdoc cref="ISkinPackageInfo.Skins"/>`
	`95`	`+ /// <summary>Gets or sets a dictionary mapping from <see cref="SkinInfo.SkinId"/> to <see cref="SkinInfo.SkinSrc"/>.</summary>`
`92`	`96`	`[XmlIgnore]`
`93`	`97`	`[JsonIgnore]`
`94`		`- public List<SkinInfo> Skins`
	`98`	`+ [Obsolete($"Deprecated in DotNetNuke 9.13.1. Use {nameof(ISkinPackageInfo)}.{nameof(ISkinPackageInfo.Skins)} instead. Scheduled for removal in v11.0.0.")]`
	`99`	`+ public Dictionary<int, string> Skins`
`95`	`100`	`{`
`96`	`101`	`get`
`97`	`102`	`{`
`@@ -104,6 +109,22 @@ public List<SkinInfo> Skins`
`104`	`109`	`}`
`105`	`110`	`}`
`106`	`111`
	`112`	`+ /// <inheritdoc cref="ISkinPackageInfo.Skins"/>`
	`113`	`+ [XmlIgnore]`
	`114`	`+ [JsonIgnore]`
	`115`	`+ public List<SkinInfo> SkinsList`
	`116`	`+ {`
	`117`	`+ get`
	`118`	`+ {`
	`119`	`+ return this.skinsList;`
	`120`	`+ }`
	`121`	`+`
	`122`	`+ set`
	`123`	`+ {`
	`124`	`+ this.skinsList = value;`
	`125`	`+ }`
	`126`	`+ }`
	`127`	`+`
`107`	`128`	`/// <inheritdoc cref="ISkinPackageInfo.SkinType"/>`
`108`	`129`	`public string SkinType`
`109`	`130`	`{`
`@@ -123,12 +144,12 @@ public int KeyID`
`123`	`144`	`{`
`124`	`145`	`get`
`125`	`146`	`{`
`126`		`- return this.SkinPackageID;`
	`147`	`+ return ((ISkinPackageInfo)this).SkinPackageId;`
`127`	`148`	`}`
`128`	`149`
`129`	`150`	`set`
`130`	`151`	`{`
`131`		`- this.SkinPackageID = value;`
	`152`	`+ ((ISkinPackageInfo)this).SkinPackageId = value;`
`132`	`153`	`}`
`133`	`154`	`}`
`134`	`155`
`@@ -137,17 +158,17 @@ public int KeyID`
`137`	`158`	`[JsonIgnore]`
`138`	`159`	`int ISkinPackageInfo.PackageId`
`139`	`160`	`{`
`140`		`- get => this.PackageID;`
`141`		`- set => this.PackageID = value;`
	`161`	`+ get => this.packageId;`
	`162`	`+ set => this.packageId = value;`
`142`	`163`	`}`
`143`	`164`
`144`	`165`	`/// <inheritdoc/>`
`145`	`166`	`[XmlIgnore]`
`146`	`167`	`[JsonIgnore]`
`147`	`168`	`int ISkinPackageInfo.SkinPackageId`
`148`	`169`	`{`
`149`		`- get => this.SkinPackageID;`
`150`		`- set => this.SkinPackageID = value;`
	`170`	`+ get => this.skinPackageId;`
	`171`	`+ set => this.skinPackageId = value;`
`151`	`172`	`}`
`152`	`173`
`153`	`174`	`/// <inheritdoc/>`
`@@ -157,7 +178,7 @@ IObjectList<ISkinInfo> ISkinPackageInfo.Skins`
`157`	`178`	`{`
`158`	`179`	`get`
`159`	`180`	`{`
`160`		`- return this.abstractSkins ??= new AbstractionList<ISkinInfo, SkinInfo>(this.Skins);`
	`181`	`+ return this.abstractSkins ??= new AbstractionList<ISkinInfo, SkinInfo>(this.SkinsList);`
`161`	`182`	`}`
`162`	`183`	`}`
`163`	`184`
`@@ -175,16 +196,17 @@ SkinPackageType ISkinPackageInfo.SkinType`
`175`	`196`	`[JsonIgnore]`
`176`	`197`	`int ISkinPackageInfo.PortalId`
`177`	`198`	`{`
`178`		`- get => this.PortalID;`
`179`		`- set => this.PortalID = value;`
	`199`	`+ get => this.portalId;`
	`200`	`+ set => this.portalId = value;`
`180`	`201`	`}`
`181`	`202`
`182`	`203`	`/// <inheritdoc/>`
`183`	`204`	`public void Fill(IDataReader dr)`
`184`	`205`	`{`
`185`		`- this.SkinPackageID = Null.SetNullInteger(dr["SkinPackageID"]);`
`186`		`- this.PackageID = Null.SetNullInteger(dr["PackageID"]);`
`187`		`- this.SkinName = Null.SetNullString(dr["SkinName"]);`
	`206`	`+ var @this = (ISkinPackageInfo)this;`
	`207`	`+ @this.SkinPackageId = Null.SetNullInteger(dr["SkinPackageID"]);`
	`208`	`+ @this.PackageId = Null.SetNullInteger(dr["PackageID"]);`
	`209`	`+ @this.SkinName = Null.SetNullString(dr["SkinName"]);`
`188`	`210`	`this.SkinType = Null.SetNullString(dr["SkinType"]);`
`189`	`211`
`190`	`212`	`// Call the base classes fill method to populate base class properties`
`@@ -194,15 +216,17 @@ public void Fill(IDataReader dr)`
`194`	`216`	`{`
`195`	`217`	`while (dr.Read())`
`196`	`218`	`{`
`197`		`- int skinID = Null.SetNullInteger(dr["SkinID"]);`
`198`		`- if (skinID > Null.NullInteger)`
	`219`	`+ int skinId = Null.SetNullInteger(dr["SkinID"]);`
	`220`	`+ if (skinId > Null.NullInteger)`
`199`	`221`	`{`
`200`		`- this.skins.Add(new SkinInfo`
	`222`	`+ var skinSrc = Null.SetNullString(dr["SkinSrc"]);`
	`223`	`+ this.skins[skinId] = skinSrc;`
	`224`	`+ this.skinsList.Add(new SkinInfo`
`201`	`225`	`{`
`202`		`- SkinId = skinID,`
`203`		`- SkinSrc = Null.SetNullString(dr["SkinSrc"]),`
`204`		`- SkinPackageId = this.SkinPackageID,`
`205`		`- PortalId = this.PortalID,`
	`226`	`+ SkinId = skinId,`
	`227`	`+ SkinSrc = skinSrc,`
	`228`	`+ SkinPackageId = @this.SkinPackageId,`
	`229`	`+ PortalId = @this.PortalId,`
`206`	`230`	`SkinRoot = SkinUtils.FromDatabaseName(this.SkinType) switch`
`207`	`231`	`{`
`208`	`232`	`SkinPackageType.Container => SkinController.RootContainer,`