Merge branch 'release/10.2.2' into data-provided-property

Author: valadas

DNN Platform/DotNetNuke.Web.Client.ResourceManager/ClientResourceController.cs

@@ -11,12 +11,16 @@ namespace DotNetNuke.Web.Client.ResourceManager
 
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Abstractions.ClientResources;
+    using DotNetNuke.Instrumentation;
 
     /// <inheritdoc />
     public class ClientResourceController : IClientResourceController
     {
+        private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ClientResourceController));
         private readonly IHostSettings hostSettings;
         private readonly IApplicationStatusInfo appStatus;
+        private readonly Guid controllerId;
+        private bool hasBegunRendering;
 
         /// <summary>Initializes a new instance of the <see cref="ClientResourceController"/> class.</summary>
         /// <param name="hostSettings">The host settings.</param>
@@ -34,6 +38,8 @@ public ClientResourceController(IHostSettings hostSettings, IApplicationStatusIn
             this.hostSettings = hostSettings;
             this.appStatus = appStatus;
             this.RegisterPathNameAlias("SharedScripts", "~/Resources/Shared/Scripts/");
+            this.controllerId = Guid.NewGuid();
+            Logger.Debug($"ClientResourceController initialized with ID {this.controllerId}");
         }
 
         private List<IFontResource> Fonts { get; set; } = [];
@@ -198,6 +204,8 @@ public void RemoveStylesheetByPath(string stylesheetPath, string pathNameAlias)
         /// <inheritdoc />
         public string RenderDependencies(ResourceType resourceType, string provider, string applicationPath)
         {
+            this.hasBegunRendering = true;
+            Logger.Debug($"Rendering dependencies for CRC id {this.controllerId} with ResourceType={resourceType}, Provider={provider}, ApplicationPath={applicationPath}. We have {this.Scripts.Count} scripts, {this.Stylesheets.Count} stylesheets and {this.Fonts.Count} fonts.");
             var sortedList = new List<IResource>();
             if (resourceType is ResourceType.Font or ResourceType.All)
             {
@@ -264,6 +272,15 @@ private List<T> AddResource<T>(List<T> resources, T resource)
             where T : IResource
         {
             resource.ResolvedPath = this.ResolvePath(resource.FilePath, resource.PathNameAlias);
+            Logger.Debug($"Adding resource {resource.ResolvedPath} to CRC id {this.controllerId} which currently has {resources.Count} resources");
+
+            if (this.hasBegunRendering)
+            {
+                Logger.Error($"Cannot add resource {resource.ResolvedPath} to CRC id {this.controllerId} because rendering has already begun");
+
+                ////throw new InvalidOperationException("Cannot add resources after rendering has begun.");
+            }
+
             resources.RemoveAll(l => string.Equals(l.ResolvedPath, resource.ResolvedPath, StringComparison.OrdinalIgnoreCase)); // remove any existing link with the same key (i.e. exactly the same resolved path)
             if (!string.IsNullOrEmpty(resource.Name))
             {

DNN Platform/DotNetNuke.Web.Mvc/Framework/DnnWebViewPage.cs

@@ -4,15 +4,33 @@
 
 namespace DotNetNuke.Web.Mvc.Framework
 {
+    using System;
     using System.Web.Mvc;
 
     using DotNetNuke.Common;
+    using DotNetNuke.Framework;
     using DotNetNuke.Web.Mvc.Helpers;
 
     using Microsoft.Extensions.DependencyInjection;
 
     public abstract class DnnWebViewPage : WebViewPage
     {
+        private readonly IServicesFramework servicesFramework;
+
+        /// <summary>Initializes a new instance of the <see cref="DnnWebViewPage"/> class.</summary>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServicesFramework. Scheduled removal in v12.0.0.")]
+        protected DnnWebViewPage()
+            : this(null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DnnWebViewPage"/> class.</summary>
+        /// <param name="servicesFramework">The web API service framework.</param>
+        protected DnnWebViewPage(IServicesFramework servicesFramework)
+        {
+            this.servicesFramework = servicesFramework ?? Globals.GetCurrentServiceProvider().GetRequiredService<IServicesFramework>();
+        }
+
         public DnnHelper<object> Dnn { get; set; }
 
         public new DnnHtmlHelper<object> Html { get; set; }
@@ -23,7 +41,7 @@ public abstract class DnnWebViewPage : WebViewPage
         public override void InitHelpers()
         {
             this.Ajax = new AjaxHelper<object>(this.ViewContext, this);
-            this.Html = new DnnHtmlHelper<object>(this.ViewContext, this);
+            this.Html = new DnnHtmlHelper<object>(this.ViewContext, this, this.servicesFramework);
             this.Url = new DnnUrlHelper(this.ViewContext);
             this.Dnn = ActivatorUtilities.CreateInstance<DnnHelper<object>>(Globals.GetCurrentServiceProvider(), this.ViewContext, this);
         }

DNN Platform/DotNetNuke.Web.Mvc/Framework/DnnWebViewPage{TModel}.cs

@@ -3,15 +3,33 @@
 // See the LICENSE file in the project root for more information
 namespace DotNetNuke.Web.Mvc.Framework
 {
+    using System;
     using System.Web.Mvc;
 
     using DotNetNuke.Common;
+    using DotNetNuke.Framework;
     using DotNetNuke.Web.Mvc.Helpers;
 
     using Microsoft.Extensions.DependencyInjection;
 
     public abstract class DnnWebViewPage<TModel> : WebViewPage<TModel>
     {
+        private readonly IServicesFramework servicesFramework;
+
+        /// <summary>Initializes a new instance of the <see cref="DnnWebViewPage{TModel}"/> class.</summary>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServicesFramework. Scheduled removal in v12.0.0.")]
+        protected DnnWebViewPage()
+            : this(null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DnnWebViewPage{TModel}"/> class.</summary>
+        /// <param name="servicesFramework">The web API service framework.</param>
+        protected DnnWebViewPage(IServicesFramework servicesFramework)
+        {
+            this.servicesFramework = servicesFramework ?? Globals.GetCurrentServiceProvider().GetRequiredService<IServicesFramework>();
+        }
+
         public DnnHelper<TModel> Dnn { get; set; }
 
         public new DnnHtmlHelper<TModel> Html { get; set; }
@@ -22,7 +40,7 @@ public abstract class DnnWebViewPage<TModel> : WebViewPage<TModel>
         public override void InitHelpers()
         {
             this.Ajax = new AjaxHelper<TModel>(this.ViewContext, this);
-            this.Html = new DnnHtmlHelper<TModel>(this.ViewContext, this);
+            this.Html = new DnnHtmlHelper<TModel>(this.ViewContext, this, this.servicesFramework);
             this.Url = new DnnUrlHelper(this.ViewContext);
             this.Dnn = ActivatorUtilities.CreateInstance<DnnHelper<TModel>>(Globals.GetCurrentServiceProvider(), this.ViewContext, this);
         }

DNN Platform/DotNetNuke.Web.Mvc/Helpers/DnnHtmlHelper.cs

@@ -11,33 +11,69 @@ namespace DotNetNuke.Web.Mvc.Helpers
     using System.Web.Mvc;
     using System.Web.Routing;
 
+    using DotNetNuke.Common;
     using DotNetNuke.Framework;
     using DotNetNuke.UI.Modules;
     using DotNetNuke.Web.Mvc.Framework.Controllers;
 
+    using Microsoft.Extensions.DependencyInjection;
+
     public class DnnHtmlHelper
     {
+        private readonly IServicesFramework servicesFramework;
+
         /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper"/> class.</summary>
         /// <param name="viewContext">The view context.</param>
         /// <param name="viewDataContainer">The ViewData container.</param>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServicesFramework. Scheduled removal in v12.0.0.")]
         public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)
-            : this(viewContext, viewDataContainer, RouteTable.Routes)
+            : this(viewContext, viewDataContainer, (IServicesFramework)null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper"/> class.</summary>
+        /// <param name="viewContext">The view context.</param>
+        /// <param name="viewDataContainer">The ViewData container.</param>
+        /// <param name="servicesFramework">The web API service framework.</param>
+        public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, IServicesFramework servicesFramework)
+            : this(viewContext, viewDataContainer, RouteTable.Routes, servicesFramework)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper"/> class.</summary>
         /// <param name="viewContext">The view context.</param>
         /// <param name="viewDataContainer">The ViewData container.</param>
         /// <param name="routeCollection">The route collection.</param>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServicesFramework. Scheduled removal in v12.0.0.")]
         public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection)
-            : this(new HtmlHelper(viewContext, viewDataContainer, routeCollection))
+            : this(viewContext, viewDataContainer, routeCollection, null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper"/> class.</summary>
+        /// <param name="viewContext">The view context.</param>
+        /// <param name="viewDataContainer">The ViewData container.</param>
+        /// <param name="routeCollection">The route collection.</param>
+        /// <param name="servicesFramework">The web API service framework.</param>
+        public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection, IServicesFramework servicesFramework)
+            : this(new HtmlHelper(viewContext, viewDataContainer, routeCollection), servicesFramework)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper"/> class.</summary>
         /// <param name="htmlHelper">The HtmlHelper to wrap.</param>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServicesFramework. Scheduled removal in v12.0.0.")]
         protected DnnHtmlHelper(HtmlHelper htmlHelper)
+            : this(htmlHelper, null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper"/> class.</summary>
+        /// <param name="htmlHelper">The HtmlHelper to wrap.</param>
+        /// <param name="servicesFramework">The web API service framework.</param>
+        protected DnnHtmlHelper(HtmlHelper htmlHelper, IServicesFramework servicesFramework)
         {
+            this.servicesFramework = servicesFramework ?? Globals.GetCurrentServiceProvider().GetRequiredService<IServicesFramework>();
             this.HtmlHelper = htmlHelper;
 
             var controller = htmlHelper.ViewContext.Controller as IDnnController;
@@ -64,10 +100,9 @@ protected DnnHtmlHelper(HtmlHelper htmlHelper)
 
         internal HtmlHelper HtmlHelper { get; set; }
 
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Breaking change")]
         public MvcHtmlString AntiForgeryToken()
         {
-            ServicesFramework.Instance.RequestAjaxAntiForgerySupport();
+            this.servicesFramework.RequestAjaxAntiForgerySupport();
             return new MvcHtmlString(string.Empty);
         }
 

DNN Platform/DotNetNuke.Web.Mvc/Helpers/DnnHtmlHelper{TModel}.cs

@@ -4,25 +4,49 @@
 
 namespace DotNetNuke.Web.Mvc.Helpers
 {
+    using System;
     using System.Web.Mvc;
     using System.Web.Routing;
 
+    using DotNetNuke.Framework;
+
     public class DnnHtmlHelper<TModel> : DnnHtmlHelper
     {
         /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper{TModel}"/> class.</summary>
         /// <param name="viewContext">The view context.</param>
         /// <param name="viewDataContainer">The ViewData container.</param>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServicesFramework. Scheduled removal in v12.0.0.")]
         public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)
-            : this(viewContext, viewDataContainer, RouteTable.Routes)
+            : this(viewContext, viewDataContainer, (IServicesFramework)null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper{TModel}"/> class.</summary>
+        /// <param name="viewContext">The view context.</param>
+        /// <param name="viewDataContainer">The ViewData container.</param>
+        /// <param name="servicesFramework">The web API service framework.</param>
+        public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, IServicesFramework servicesFramework)
+            : this(viewContext, viewDataContainer, RouteTable.Routes, servicesFramework)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper{TModel}"/> class.</summary>
         /// <param name="viewContext">The view context.</param>
         /// <param name="viewDataContainer">The ViewData container.</param>
         /// <param name="routeCollection">The route collection.</param>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServicesFramework. Scheduled removal in v12.0.0.")]
         public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection)
-            : base(new HtmlHelper<TModel>(viewContext, viewDataContainer, routeCollection))
+            : this(viewContext, viewDataContainer, routeCollection, null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DnnHtmlHelper{TModel}"/> class.</summary>
+        /// <param name="viewContext">The view context.</param>
+        /// <param name="viewDataContainer">The ViewData container.</param>
+        /// <param name="routeCollection">The route collection.</param>
+        /// <param name="servicesFramework">The web API service framework.</param>
+        public DnnHtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection, IServicesFramework servicesFramework)
+            : base(new HtmlHelper<TModel>(viewContext, viewDataContainer, routeCollection), servicesFramework)
         {
         }
 

DNN Platform/DotNetNuke.Web/UI/WebControls/DnnDropDownList.cs

@@ -31,22 +31,25 @@ public class DnnDropDownList : Panel, INamingContainer
 
         private readonly Lazy<DnnDropDownListOptions> options = new Lazy<DnnDropDownListOptions>(() => new DnnDropDownListOptions());
         private readonly IClientResourceController clientResourceController;
+        private readonly IServicesFramework servicesFramework;
 
         private DnnGenericHiddenField<DnnDropDownListState> stateControl;
         private HtmlAnchor selectedValue;
 
         /// <summary>Initializes a new instance of the <see cref="DnnDropDownList"/> class.</summary>
         [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IClientResourceController. Scheduled removal in v12.0.0.")]
         public DnnDropDownList()
-            : this(null)
+            : this(null, null)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="DnnDropDownList"/> class.</summary>
         /// <param name="clientResourceController">The client resource controller.</param>
-        public DnnDropDownList(IClientResourceController clientResourceController)
+        /// <param name="servicesFramework">The web API service framework.</param>
+        public DnnDropDownList(IClientResourceController clientResourceController, IServicesFramework servicesFramework)
         {
             this.clientResourceController = clientResourceController ?? Globals.GetCurrentServiceProvider().GetRequiredService<IClientResourceController>();
+            this.servicesFramework = servicesFramework ?? Globals.GetCurrentServiceProvider().GetRequiredService<IServicesFramework>();
         }
 
         /// <summary>Occurs when the selection from the list control changes between posts to the server.</summary>
@@ -261,7 +264,7 @@ protected override void OnInit(EventArgs e)
         {
             base.OnInit(e);
             this.StateControl.Value = string.Empty; // for state persistence (stateControl)
-            ServicesFramework.Instance.RequestAjaxAntiForgerySupport();
+            this.servicesFramework.RequestAjaxAntiForgerySupport();
         }
 
         /// <inheritdoc />

DNN Platform/DotNetNuke.Web/UI/WebControls/DnnFileDropDownList.cs

@@ -13,6 +13,7 @@ namespace DotNetNuke.Web.UI.WebControls
     using DotNetNuke.Abstractions.ClientResources;
     using DotNetNuke.Common;
     using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Framework;
     using DotNetNuke.Services.FileSystem;
     using DotNetNuke.Services.Localization;
     using DotNetNuke.Web.Common;
@@ -27,14 +28,15 @@ public class DnnFileDropDownList : DnnDropDownList
         /// <summary>Initializes a new instance of the <see cref="DnnFileDropDownList"/> class.</summary>
         [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IClientResourceController. Scheduled removal in v12.0.0.")]
         public DnnFileDropDownList()
-            : this(Globals.GetCurrentServiceProvider().GetRequiredService<IClientResourceController>())
+            : this(Globals.GetCurrentServiceProvider().GetRequiredService<IClientResourceController>(), Globals.GetCurrentServiceProvider().GetRequiredService<IServicesFramework>())
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="DnnFileDropDownList"/> class.</summary>
         /// <param name="clientResourceController">The client resource controller.</param>
-        public DnnFileDropDownList(IClientResourceController clientResourceController)
-            : base(clientResourceController)
+        /// <param name="servicesFramework">The web API service framework.</param>
+        public DnnFileDropDownList(IClientResourceController clientResourceController, IServicesFramework servicesFramework)
+            : base(clientResourceController, servicesFramework)
         {
         }