Merge branch 'feature/mvc-pipeline-old' into ModuleControl

# Conflicts:
#	DNN Platform/DotNetNuke.Web.MvcPipeline/Containers/SkinHelpers.Content.cs
#	DNN Platform/DotNetNuke.Web.MvcPipeline/Controllers/ModuleSettingsController.cs
#	DNN Platform/DotNetNuke.Web.MvcPipeline/Controllers/ModuleSettingsViewController.cs
#	DNN Platform/DotNetNuke.Web.MvcPipeline/Framework/JavascriptLibraries/MvcJavaScript.cs
#	DNN Platform/DotNetNuke.Web.MvcPipeline/Modules/ModuleHelpers.cs
#	DNN Platform/DotNetNuke.Web.MvcWebsite/Controls/ModuleActionsControl.cs
#	DNN Platform/Library/Entities/Modules/ControlInfo.cs
#	DNN Platform/Library/Services/Upgrade/Upgrade.cs
#	DNN Platform/Modules/HTML/Controllers/DNN_HTMLController.cs
#	DNN Platform/Modules/HTML/Controllers/MyWorkViewController.cs
#	DNN Platform/Modules/HTML/Controls/EditHTMLControl.cs

Author: sachatrauwaen

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -72,7 +72,7 @@ body:
         **NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._
       multiple: true
       options:
-        - 10.1.0 (latest v10 release)
+        - 10.1.2 (latest v10 release)
         - Current development branch (unreleased)
     validations:
       required: true

.github/images/PoweredByNDepend.png

@@ -6,6 +6,7 @@ on:
       - "**.jpeg"
       - "**.png"
       - "**.webp"
+      - "**.avif"
   push:
     branches:
       - development # merging PRs from other forks (will open a new PR)
@@ -26,7 +27,7 @@ jobs:
 
       - name: Compress Images
         id: compress_images
-        uses: calibreapp/image-actions@1.3.0
+        uses: calibreapp/image-actions@1.4.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           compressOnly: ${{ github.event_name != 'pull_request' }} # For non-Pull Requests, run in compressOnly mode and we'll PR after.

.github/workflows/image-actions.yml

@@ -1,3 +1,5 @@
 compressionLevel: mixed
 
 nodeLinker: node-modules
+
+npmMinimalAgeGate: 1440

.yarnrc.yml

@@ -21,6 +21,8 @@
   <files>
     <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.dll" target="lib\net48\" />
     <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.pdb" target="lib\net48\" />
+    <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.ResourceManager.dll" target="lib\netstandard2.0" />
+    <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.ResourceManager.pdb" target="lib\netstandard2.0" />
     <file src="logo-for-nuget.png" target="images\"/>
   </files>
 </package>

Build/Tools/NuGet/DotNetNuke.Web.Client.nuspec

@@ -14,6 +14,7 @@ namespace Dnn.Modules.Console
 
     using Dnn.Modules.Console.Components;
     using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.ClientResources;
     using DotNetNuke.Common.Utilities;
     using DotNetNuke.Entities.Modules;
     using DotNetNuke.Entities.Tabs;
@@ -22,10 +23,10 @@ namespace Dnn.Modules.Console
     using DotNetNuke.Instrumentation;
     using DotNetNuke.Security.Permissions;
     using DotNetNuke.Security.Roles;
+    using DotNetNuke.Services.ClientDependency;
     using DotNetNuke.Services.Exceptions;
     using DotNetNuke.Services.Localization;
     using DotNetNuke.Services.Personalization;
-    using DotNetNuke.Web.Client.ClientResourceManagement;
     using Microsoft.Extensions.DependencyInjection;
 
     /// <summary>Implements the module view logic.</summary>
@@ -34,6 +35,7 @@ public partial class ViewConsole : PortalModuleBase
         private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ViewConsole));
         private readonly INavigationManager navigationManager;
         private readonly IJavaScriptLibraryHelper javaScript;
+        private readonly IClientResourceController clientResourceController;
 
         private string defaultSize = string.Empty;
         private string defaultView = string.Empty;
@@ -42,17 +44,19 @@ public partial class ViewConsole : PortalModuleBase
 
         /// <summary>Initializes a new instance of the <see cref="ViewConsole"/> class.</summary>
         public ViewConsole()
-            : this(null, null)
+            : this(null, null, null)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="ViewConsole"/> class.</summary>
         /// <param name="navigationManager">The navigation manager.</param>
         /// <param name="javaScript">The JavaScript library helper.</param>
-        public ViewConsole(INavigationManager navigationManager, IJavaScriptLibraryHelper javaScript)
+        /// <param name="clientResourceController">The client resources controller.</param>
+        public ViewConsole(INavigationManager navigationManager, IJavaScriptLibraryHelper javaScript, IClientResourceController clientResourceController)
         {
             this.navigationManager = navigationManager ?? this.DependencyProvider.GetRequiredService<INavigationManager>();
             this.javaScript = javaScript ?? this.DependencyProvider.GetRequiredService<IJavaScriptLibraryHelper>();
+            this.clientResourceController = clientResourceController ?? this.DependencyProvider.GetRequiredService<IClientResourceController>();
         }
 
         /// <summary>Gets a value indicating whether the module settings allow size change.</summary>
@@ -213,7 +217,7 @@ protected override void OnInit(EventArgs e)
             {
                 this.javaScript.RequestRegistration(CommonJs.jQuery);
 
-                ClientResourceManager.RegisterScript(this.Page, "~/desktopmodules/admin/console/scripts/jquery.console.js");
+                this.clientResourceController.RegisterScript("~/desktopmodules/admin/console/scripts/jquery.console.js");
 
                 this.DetailView.ItemDataBound += this.RepeaterItemDataBound;