Raise minimum dnn support 9.11

Libraries/Hotcakes.Commerce.Dnn/App.Config

@@ -59,6 +59,18 @@
         <assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

Libraries/Hotcakes.Commerce.Dnn/DnnAccountService.cs

@@ -25,21 +25,25 @@
 #endregion
 
 using System;
+using DotNetNuke.Abstractions.Portals;
 using DotNetNuke.Application;
+using DotNetNuke.Entities.Modules;
 using DotNetNuke.Entities.Portals;
 using DotNetNuke.Services.Analytics.Config;
 using Hotcakes.Commerce.Accounts;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Hotcakes.Commerce.Dnn
 {
     [Serializable]
     public class DnnAccountService : AccountService
     {
         #region Constructor
-
+        private readonly IPortalAliasService _portalAliasService;
         public DnnAccountService(HccRequestContext context)
             : base(context)
         {
+            _portalAliasService = DependencyProvider.GetRequiredService<IPortalAliasService>();
         }
 
         #endregion
@@ -57,11 +61,11 @@ public PortalSettings CurrentPortalSettings
 
         public override Store GetStoreByUrl(string url)
         {
-            var aliasInfo = PortalAliasController.Instance.GetPortalAlias(url);
+            var aliasInfo = _portalAliasService.GetPortalAlias(url);
             if (aliasInfo != null)
             {
                 var portalController = new PortalController();
-                var portalInfo = portalController.GetPortal(aliasInfo.PortalID);
+                var portalInfo = portalController.GetPortal(aliasInfo.PortalId);
                 if (portalInfo != null)
                 {
                     return Stores.FindByStoreGuid(portalInfo.GUID);

Libraries/Hotcakes.Commerce.Dnn/DnnEventLog.cs

@@ -24,19 +24,31 @@
 #endregion
 
 using System;
+using DotNetNuke.Abstractions.Logging;
 using DotNetNuke.Common.Utilities;
+using DotNetNuke.Entities.Modules;
 using DotNetNuke.Entities.Portals;
 using DotNetNuke.Services.Exceptions;
 using DotNetNuke.Services.Log.EventLog;
 using Hotcakes.Web.Logging;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Hotcakes.Commerce.Dnn
 {
     [Serializable]
-    public class DnnEventLog : ILogger
+    public class DnnEventLog : PortalModuleBase, ILogger
     {
         private const string LOGTYPE_MESSAGE = "HOTCAKES_INFO";
         private const string LOGTYPE_EXCEPTION = "HOTCAKES_EXCEPTION";
+        private readonly IEventLogger eventLogger;
+        private readonly LogInfo LogInfo;
+        private ILogInfo logInfo => LogInfo;
+
+        public DnnEventLog()
+        {
+            eventLogger = DependencyProvider.GetRequiredService<IEventLogger>();
+            LogInfo = new LogInfo();          
+        }
 
         public void LogMessage(string message)
         {
@@ -50,27 +62,23 @@ public void LogException(Exception ex)
 
         public void LogMessage(string source, string message, EventLogSeverity severity)
         {
-            var logInfo = new LogInfo();
             var user = DnnUserController.Instance.GetCurrentUserInfo();
-
-            logInfo.LogUserID = user != null ? user.UserID : -1;
-            logInfo.LogPortalID = PortalSettings.Current != null ? PortalSettings.Current.PortalId : -1;
+            logInfo.LogUserId = user != null ? user.UserID : -1;
+            logInfo.LogPortalId = PortalSettings.Current != null ? PortalSettings.Current.PortalId : -1;
             logInfo.LogTypeKey = LOGTYPE_MESSAGE;
             logInfo.AddProperty("Severity", severity.ToString());
             logInfo.LogProperties.Add(new LogDetailInfo("Source", source));
             logInfo.LogProperties.Add(new LogDetailInfo("Message", message));
 
-            var log = new EventLogController();
-            log.AddLog(logInfo);
+            eventLogger.AddLog(logInfo);
         }
 
         public void LogException(Exception ex, EventLogSeverity severity)
         {
-            var logInfo = new LogInfo();
             var user = DnnUserController.Instance.GetCurrentUserInfo();
 
-            logInfo.LogUserID = user != null ? user.UserID : -1;
-            logInfo.LogPortalID = DnnGlobal.Instance.GetPortalId();
+            logInfo.LogUserId = user != null ? user.UserID : -1;
+            logInfo.LogPortalId = DnnGlobal.Instance.GetPortalId();
             logInfo.LogTypeKey = LOGTYPE_EXCEPTION;
             logInfo.AddProperty("Severity", severity.ToString());
 
@@ -97,8 +105,7 @@ public void LogException(Exception ex, EventLogSeverity severity)
             logInfo.LogProperties.Add(new LogDetailInfo("Message", exception4.Message));
             logInfo.LogProperties.Add(new LogDetailInfo("Source", exception4.Source));
 
-            var log = new EventLogController();
-            log.AddLog(logInfo);
+            eventLogger.AddLog(logInfo);
         }
 
         public static void InstallLogTypes()
@@ -117,7 +124,7 @@ private static void RegisterLogType(string logTypeKey, string logTypeFriendlyNam
                 var logTypeInfo = controller.GetLogTypeInfoDictionary()[logTypeKey];
                 logTypeInfo.LogTypeFriendlyName = logTypeFriendlyName;
                 logTypeInfo.LogTypeDescription = string.Empty;
-                logTypeInfo.LogTypeCSSClass = cssClass;
+                ((ILogTypeInfo)logTypeInfo).LogTypeCssClass = cssClass;
                 logTypeInfo.LogTypeOwner = "Hotcakes.Logging.EventLogType";
                 controller.UpdateLogType(logTypeInfo);
             }
@@ -129,9 +136,9 @@ private static void RegisterLogType(string logTypeKey, string logTypeFriendlyNam
                     LogTypeKey = logTypeKey,
                     LogTypeFriendlyName = logTypeFriendlyName,
                     LogTypeDescription = string.Empty,
-                    LogTypeCSSClass = cssClass,
                     LogTypeOwner = "Hotcakes.Logging.EventLogType"
                 };
+                ((ILogTypeInfo)logTypeInfo).LogTypeCssClass = cssClass;
                 controller.AddLogType(logTypeInfo);
 
                 //Add LogType
@@ -145,9 +152,8 @@ private static void RegisterLogType(string logTypeKey, string logTypeFriendlyNam
                     NotificationThresholdTimeType = LogTypeConfigInfo.NotificationThresholdTimeTypes.Seconds,
                     MailFromAddress = Null.NullString,
                     MailToAddress = Null.NullString,
-                    LogTypePortalID = "*"
                 };
-
+                ((ILogTypeConfigInfo)logTypeConf).LogTypePortalId = "*";
                 controller.AddLogTypeConfigInfo(logTypeConf);
             }
         }

Libraries/Hotcakes.Commerce.Dnn/DnnGlobal.cs

@@ -26,6 +26,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using DotNetNuke.Abstractions.Portals;
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Data;
 using DotNetNuke.Entities.Portals;
@@ -109,7 +110,7 @@ public Locale GetLocale(string code)
             public CultureInfo GetPageLocale()
             {
                 var portalSettings = Instance.GetCurrentPortalSettings();
-                return Localization.GetPageLocale(portalSettings);
+                return Localization.GetPageLocale((IPortalSettings)portalSettings);
             }
         }
     }

Libraries/Hotcakes.Commerce.Dnn/DnnHostSettingsProvider.cs

@@ -26,14 +26,24 @@
 
 using System;
 using System.Collections.Generic;
+using DotNetNuke.Abstractions.Application;
 using DotNetNuke.Entities.Controllers;
 using DotNetNuke.Entities.Host;
+using DotNetNuke.Entities.Modules;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Hotcakes.Commerce.Dnn
 {
     [Serializable]
-    public class DnnHostSettingsProvider : IHostSettingsProvider
+    public class DnnHostSettingsProvider : PortalModuleBase, IHostSettingsProvider
     {
+        private readonly IHostSettingsService _hostSettingsService;
+
+        public DnnHostSettingsProvider()
+        {
+            _hostSettingsService = DependencyProvider.GetRequiredService<IHostSettingsService>();
+        }
+
         public IEnumerable<string> GetAllowedExtensions()
         {
             return Host.AllowedExtensionWhitelist.AllowedExtensions;
@@ -66,7 +76,7 @@ public T GetSettingValue<T>(string key, T defVal)
 
         protected object GetSettingValue(string key)
         {
-            return HostController.Instance.GetString(key);
+            return _hostSettingsService.GetString(key);
         }
     }
 }

Libraries/Hotcakes.Commerce.Dnn/DnnLocalizationHelper.cs

@@ -29,25 +29,30 @@
 using System.Threading;
 using System.Web.Hosting;
 using System.Xml.XPath;
+using DotNetNuke.Abstractions;
+using DotNetNuke.Abstractions.Application;
 using DotNetNuke.Collections.Internal;
 using DotNetNuke.Common;
 using DotNetNuke.Common.Utilities;
+using DotNetNuke.Entities.Modules;
 using DotNetNuke.Entities.Portals;
 using DotNetNuke.Instrumentation;
 using DotNetNuke.Services.Cache;
 using DotNetNuke.Services.Localization;
 using Hotcakes.Commerce.Globalization;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Hotcakes.Commerce.Dnn
 {
     [Serializable]
-    public class DnnLocalizationHelper : ILocalizationHelper
+    public class DnnLocalizationHelper : PortalModuleBase, ILocalizationHelper
     {
         private readonly string _resourceFile;
-
+        private readonly IApplicationStatusInfo _applicationStatusInfo;
         public DnnLocalizationHelper(string resourcefile)
         {
             _resourceFile = resourcefile;
+            _applicationStatusInfo = DependencyProvider.GetRequiredService<IApplicationStatusInfo>();
         }
 
         public string GetString(string key)
@@ -133,7 +138,7 @@ private Dictionary<string, string> GetResourceDictionary(string resourceFileRoot
             Locale userLocale = null;
             try
             {
-                if (Globals.Status != Globals.UpgradeStatus.Install)
+                if (_applicationStatusInfo.Status != UpgradeStatus.Install)
                 {
                     //Get Fallback language, but not when we are installing (because we may not have a database yet)
                     userLocale = LocaleController.Instance.GetLocale(userLanguage);
@@ -407,7 +412,7 @@ private static bool TryGetFromResourceFile(string key, string resourceFile, int
             return bFound;
         }
 
-        private static bool TryGetStringInternal(string key, string userLanguage, string resourceFile,
+        private bool TryGetStringInternal(string key, string userLanguage, string resourceFile,
             PortalSettings portalSettings, ref string resourceValue)
         {
             var defaultLanguage = Null.NullString;
@@ -435,7 +440,7 @@ private static bool TryGetStringInternal(string key, string userLanguage, string
             Locale userLocale = null;
             try
             {
-                if (Globals.Status != Globals.UpgradeStatus.Install)
+                if (_applicationStatusInfo.Status != UpgradeStatus.Install)
                 {
                     //Get Fallback language, but not when we are installing (because we may not have a database yet)
                     userLocale = LocaleController.Instance.GetLocale(userLanguage);

Libraries/Hotcakes.Commerce.Dnn/DnnStoreSettingsProvider.cs

@@ -27,14 +27,22 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using DotNetNuke.Entities.Controllers;
+using DotNetNuke.Abstractions.Application;
+using DotNetNuke.Entities.Modules;
 using DotNetNuke.Services.Localization;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Hotcakes.Commerce.Dnn
 {
     [Serializable]
-    public class DnnStoreSettingsProvider : IStoreSettingsProvider
+    public class DnnStoreSettingsProvider : PortalModuleBase, IStoreSettingsProvider
     {
+        private readonly IHostSettingsService _hostSettingsService;
+
+        public DnnStoreSettingsProvider()
+        {
+            _hostSettingsService = DependencyProvider.GetRequiredService<IHostSettingsService>();
+        }
         public T GetSettingValue<T>(string key, T defVal)
         {
             var val = GetSettingValue(key);
@@ -85,7 +93,7 @@ public string GetDefaultLocale()
 
         protected object GetSettingValue(string key)
         {
-            return HostController.Instance.GetString(key);
+            return _hostSettingsService.GetString(key);
         }
 
         protected HccLocale ConvertLocale(Locale locale)