Merge pull request #3759 from dnnsoftware/release/9.6.1

Release/9.6.1

.github/ISSUE_TEMPLATE/bug-report.md

@@ -7,7 +7,7 @@ assignees: dnnsoftware/triage
 <!-- 
   If you need community support or would like to solicit a Request for Comments (RFC), please post to the DNN Community forums at https://dnncommunity.org/forums for now.  In the future, we are planning to implement a more robust solution for cultivating new ideas and nuturing these from concept to creation.  We will update this template when this solution is generally available.  In the meantime, we appreciate your patience as we endeavor to streamline our GitHub focus and efforts.
   
-  Please read the CONTRIBUTING guidelines at https://github.com/dnnsoftware/Dnn.Platform/blob/development/CONTRIBUTING.md prior to submitting an issue.
+  Please read the CONTRIBUTING guidelines at https://github.com/dnnsoftware/Dnn.Platform/blob/develop/CONTRIBUTING.md prior to submitting an issue.
 
   Any potential security issues SHOULD NOT be posted on GitHub.  Instead, please send an email to [email protected].
 -->
@@ -40,10 +40,9 @@ Provide any additional context that may be helpful in understanding and/or resol
 <!-- 
 Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
 -->
-* [ ] 10.0.0 alpha build
-* [ ]  9.5.1 alpha build
-* [ ]  9.5.0 latest supported release
-* [ ]  9.4.4 
+* [ ] 10.00.00 alpha build
+* [ ] 09.06.01 release candidate
+* [ ] 09.06.00 latest supported release
 
 ## Affected browser
 <!-- 

.github/ISSUE_TEMPLATE/enhancement-request.md

@@ -7,7 +7,7 @@ assignees: dnnsoftware/triage
 <!-- 
   If you need community support or would like to solicit a Request for Comments (RFC), please post to the DNN Community forums at https://dnncommunity.org/forums for now.  In the future, we are planning to implement a more robust solution for cultivating new ideas and nuturing these from concept to creation.  We will update this template when this solution is generally available.  In the meantime, we appreciate your patience as we endeavor to streamline our GitHub focus and efforts.
   
-  Please read the CONTRIBUTING guidelines at https://github.com/dnnsoftware/Dnn.Platform/blob/development/CONTRIBUTING.md prior to submitting an issue.
+  Please read the CONTRIBUTING guidelines at https://github.com/dnnsoftware/Dnn.Platform/blob/develop/CONTRIBUTING.md prior to submitting an issue.
 
   Any potential security issues SHOULD NOT be posted on GitHub.  Instead, please send an email to [email protected].
 -->

.github/workflows/image-actions.yml

@@ -6,9 +6,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
 
       - name: Compress Images
-        uses: calibreapp/image-actions@master
+        uses: calibreapp/image-actions@1.1.0
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/updateVersions.yml

@@ -0,0 +1,36 @@
+name: Update Versions
+on: create
+
+# Sets the manifest and other files version upon creation of a release branch
+jobs:
+  updateVersions:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Get the release branch version
+      if: ${{ github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/') }}
+      uses: valadas/get-release-branch-version@v1
+      id: branchVersion
+
+    - name: Set versions
+      uses: valadas/set-dnn-manifest-versions@v1
+      with:
+        version: ${{ steps.branchVersion.outputs.manifestSafeVersionString }}
+        skipFile: './Build/Cake/unversionedManifests.txt'
+        includeSolutionInfo: true
+        includeIssueTemplates: true
+        includePackageJson: true
+        includeDnnReactCommon: true
+    - name: Create Pull Request
+      uses: peter-evans/[email protected]
+      with:
+        commit-message: Updates versions as per release candidate creation
+        title: Updates versions as per release candidate creation
+        body: This is a release managemnt task and we are self-approving it for that reason.
+        # A comma separated list of labels.
+        labels: 'Type: Build/Release'
+        # The pull request branch name.
+        branch: update-versions/patch
+        # The branch suffix type.
+        branch-suffix: short-commit-hash

Build/Cake/unversionedManifests.txt

@@ -0,0 +1,4 @@
+DNN Platform/Components/Microsoft.*/**/*.dnn
+DNN Platform/Components/Newtonsoft/*.dnn
+DNN Platform/JavaScript Libraries/**/*.dnn
+Temp/**/*.dnn

Build/Cake/version.cake

@@ -6,12 +6,7 @@ var buildId = EnvironmentVariable("BUILD_BUILDID") ?? "0";
 var buildNumber = "";
 var productVersion = "";
 
-var unversionedManifests = new string[] {
-  "DNN Platform/Components/Microsoft.*/**/*.dnn",
-  "DNN Platform/Components/Newtonsoft/*.dnn",
-  "DNN Platform/JavaScript Libraries/**/*.dnn",
-  "Temp/**/*.dnn"
-};
+var unversionedManifests = FileReadLines("./Build/Cake/unversionedManifests.txt");
 
 Task("BuildServerSetVersion")
   .IsDependentOn("SetVersion")

Build/Symbols/DotNetNuke_Symbols.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke_Symbols" type="Library" version="09.06.00" >
+    <package name="DotNetNuke_Symbols" type="Library" version="09.06.01" >
       <friendlyName>DNN Platform Symbols</friendlyName>
       <description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
       <owner>

DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.Console" type="Module" version="09.06.00">
+        <package name="DotNetNuke.Console" type="Module" version="09.06.01">
             <friendlyName>Console</friendlyName>
             <description>Display children pages as icon links for navigation.</description>
             <iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>

DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/dnn_ModuleCreator.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.Module Creator" type="Module" version="09.06.00">
+        <package name="DotNetNuke.Module Creator" type="Module" version="09.06.01">
             <friendlyName>Module Creator</friendlyName>
             <description>Development of modules.</description>
             <iconFile>~/Icons/Sigma/ModuleCreator_32x32.png</iconFile>

DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.06.00">
+    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.06.01">
       <friendlyName>DotNetNuke Telerik Web Components</friendlyName>
       <description>Provides Telerik Components for DotNetNuke.</description>
       <dependencies/>

DNN Platform/Connectors/Azure/AzureConnector.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.06.00">
+        <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.06.01">
             <friendlyName>Dnn Azure Connector</friendlyName>
             <description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
             <iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>

DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.06.00">
+        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.06.01">
             <friendlyName>Google Analytics Connector</friendlyName>
             <description>Configure your sites Google Analytics settings.</description>
             <iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>

DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNNJWT" type="Provider" version="09.06.00">
+    <package name="DNNJWT" type="Provider" version="09.06.01">
       <friendlyName>DNN JWT Auth Handler</friendlyName>
       <description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
       <dependencies/>

DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.06.00">
+    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.06.01">
       <friendlyName>DNN Deprecated Web Controls Library</friendlyName>
       <description>DNN Deprecated Web Controls library for legacy Telerik depepndency</description>
       <dependencies/>

DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.ClientAPI" type="Library" version="09.06.00" >
+        <package name="DotNetNuke.ClientAPI" type="Library" version="09.06.01" >
             <friendlyName>DotNetNuke ClientAPI</friendlyName>
             <description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
             <dependencies/>

DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.06.00">
+    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.06.01">
       <friendlyName>DNN Deprecated Website Codebehind files</friendlyName>
       <description>DNN Deprecated Website Codebehind files for backward compability.</description>
       <dependencies/>

DNN Platform/JavaScript Libraries/jQuery/jQuery.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="jQuery" type="JavaScript_Library" version="03.05.00" isSystem="true">
+    <package name="jQuery" type="JavaScript_Library" version="03.05.01" isSystem="true">
       <friendlyName>jQuery JavaScript Library</friendlyName>
       <description>jQuery is a JavaScript library that is used to manipulate the Document Object Model (DOM).</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
@@ -19,7 +19,7 @@
             <libraryName>jQuery</libraryName>
             <fileName>jquery.js</fileName>
             <objectName>jQuery</objectName>
-            <CDNPath>https://code.jquery.com/jquery-3.5.0.min.js</CDNPath>
+            <CDNPath>https://code.jquery.com/jquery-3.5.1.min.js</CDNPath>
           </javaScriptLibrary>
         </component>
         <component type="JavaScriptFile">

DNN Platform/Library/Services/Scheduling/ProcessGroup.cs

@@ -8,8 +8,9 @@
 using System.Reflection;
 using System.Threading;
 using System.Web.Compilation;
-
+using DotNetNuke.Common;
 using DotNetNuke.Instrumentation;
+using Microsoft.Extensions.DependencyInjection;
 
 #endregion
 
@@ -61,12 +62,14 @@ private static int GetProcessesInQueue
 
         public void Run(ScheduleHistoryItem objScheduleHistoryItem)
         {
+            IServiceScope serviceScope = null;
             SchedulerClient Process = null;
             try
             {
                 //This is called from RunPooledThread()
                 ticksElapsed = Environment.TickCount - ticksElapsed;
-                Process = GetSchedulerClient(objScheduleHistoryItem.TypeFullName, objScheduleHistoryItem);
+                serviceScope = Globals.DependencyProvider.CreateScope();
+                Process = GetSchedulerClient(serviceScope.ServiceProvider, objScheduleHistoryItem.TypeFullName, objScheduleHistoryItem);
                 Process.ScheduleHistoryItem = objScheduleHistoryItem;
 
 				//Set up the handlers for the CoreScheduler
@@ -147,29 +150,21 @@ public void Run(ScheduleHistoryItem objScheduleHistoryItem)
             }
             finally
             {
+                serviceScope?.Dispose();
+
                 //Track how many processes have completed for
                 //this instanciation of the ProcessGroup
                 numberOfProcessesInQueue -= 1;
                 processesCompleted += 1;
             }
         }
 
-        private SchedulerClient GetSchedulerClient(string strProcess, ScheduleHistoryItem objScheduleHistoryItem)
+        private SchedulerClient GetSchedulerClient(IServiceProvider services, string strProcess, ScheduleHistoryItem objScheduleHistoryItem)
         {
             //This is a method to encapsulate returning
             //an object whose class inherits SchedulerClient.
             Type t = BuildManager.GetType(strProcess, true, true);
-            var param = new ScheduleHistoryItem[1];
-            param[0] = objScheduleHistoryItem;
-            var types = new Type[1];
-
-			//Get the constructor for the Class
-            types[0] = typeof (ScheduleHistoryItem);
-            ConstructorInfo objConstructor;
-            objConstructor = t.GetConstructor(types);
-
-			//Return an instance of the class as an object
-            return (SchedulerClient) objConstructor.Invoke(param);
+            return (SchedulerClient)ActivatorUtilities.CreateInstance(services, t, objScheduleHistoryItem);
         }
 
         //This subroutine is callback for Threadpool.QueueWorkItem.  This is the necessary

DNN Platform/Library/Startup.cs

@@ -2,6 +2,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
+
 using DotNetNuke.Common;
 using DotNetNuke.Abstractions;
 using DotNetNuke.DependencyInjection;
@@ -19,6 +20,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<WebFormsModuleControlFactory>();
             services.AddSingleton<Html5ModuleControlFactory>();
             services.AddSingleton<ReflectedModuleControlFactory>();
+
             services.AddTransient(x => PortalController.Instance);
             services.AddTransient<INavigationManager, NavigationManager>();
         }

DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.06.00">
+    <package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.06.01">
       <friendlyName>Message Center</friendlyName>      
       <description>Core Messaging module allows users to message each other.</description>
       <iconFile>~/DesktopModules/CoreMessaging/Images/messaging_32X32.png</iconFile>

DNN Platform/Modules/DDRMenu/DDRMenu.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
 	<packages>
-		<package name="DDRMenu" type="Module" version="09.06.00">
+		<package name="DDRMenu" type="Module" version="09.06.01">
 			<friendlyName>DDR Menu</friendlyName>
 			<description>DotNetNuke Navigation Provider.</description>
 			<owner>

DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DigitalAssetsManagement" type="Module" isSystem="true" version="09.06.00">
+    <package name="DigitalAssetsManagement" type="Module" isSystem="true" version="09.06.01">
       <friendlyName>Digital Asset Management</friendlyName>
       <description>DotNetNuke Corporation Digital Asset Management module</description>
       <iconFile>Images/Files_32x32_Standard.png</iconFile>

DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="SiteExportImport" type="Library" isSystem="false" version="09.06.00">
+    <package name="SiteExportImport" type="Library" isSystem="false" version="09.06.01">
       <friendlyName>Site Export Import</friendlyName>
       <description>DotNetNuke Corporation Site Export Import Library</description>
       <iconFile>Images/Files_32x32_Standard.png</iconFile>

DNN Platform/Modules/Groups/SocialGroups.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Social Groups" type="Module" isSystem="true" version="09.06.00">
+    <package name="Social Groups" type="Module" isSystem="true" version="09.06.01">
       <friendlyName>Social Groups</friendlyName>
       <description>DotNetNuke Corporation Social Groups module</description>
       <iconFile>~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png</iconFile>

DNN Platform/Modules/HTML/dnn_HTML.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_HTML" type="Module" version="09.06.00">
+    <package name="DNN_HTML" type="Module" version="09.06.01">
       <friendlyName>HTML</friendlyName>
       <description>This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version.</description>
       <iconFile>DesktopModules\HTML\Images\html.png</iconFile>

DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.06.00" >
+    <package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.06.01" >
       <friendlyName>Html Editor Management</friendlyName>
       <iconFile>Images/HtmlEditorManager_Standard_32x32.png</iconFile>
       <description>A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider.</description>

DNN Platform/Modules/Journal/Journal.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Journal" type="Module" isSystem="true" version="09.06.00">
+        <package name="Journal" type="Module" isSystem="true" version="09.06.01">
             <friendlyName>Journal</friendlyName>
             <description>DotNetNuke Corporation Journal module</description>
             <iconFile>DesktopModules/Journal/Images/journal_32X32.png</iconFile>

DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DotNetNuke.Modules.MemberDirectory" type="Module"  isSystem="true" version="09.06.00">
+    <package name="DotNetNuke.Modules.MemberDirectory" type="Module"  isSystem="true" version="09.06.01">
       <friendlyName>Member Directory</friendlyName>      
       <description>The Member Directory module displays a list of Members based on role, profile property or relationship.</description>
       <iconFile>~/DesktopModules/MemberDirectory/Images/member_list_32X32.png</iconFile>

DNN Platform/Modules/RazorHost/Manifest.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="{0}" type="Module"  isSystem="true" version="09.06.00">
+    <package name="{0}" type="Module"  isSystem="true" version="09.06.01">
       <friendlyName>{0}</friendlyName>
       <description>{1}</description>
       <owner>

DNN Platform/Modules/RazorHost/RazorHost.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNNCorp.RazorHost" type="Module" version="09.06.00" >
+    <package name="DNNCorp.RazorHost" type="Module" version="09.06.01" >
       <friendlyName>Razor Host</friendlyName>
       <description>The Razor Host module allows developers to host Razor Scripts.</description>
       <owner>

DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_FacebookAuthentication" type="Auth_System" version="09.06.00" >
+    <package name="DNN_FacebookAuthentication" type="Auth_System" version="09.06.01" >
       <friendlyName>DotNetNuke Facebook Authentication Project</friendlyName>
       <description>The DotNetNuke Facebook Authentication Project is an Authentication provider for DotNetNuke that uses 
         Facebook authentication to authenticate users.

DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_GoogleAuthentication" type="Auth_System" version="09.06.00" >
+    <package name="DNN_GoogleAuthentication" type="Auth_System" version="09.06.01" >
       <friendlyName>DotNetNuke Google Authentication Project</friendlyName>
       <description>The DotNetNuke Google Authentication Project is an Authentication provider for DotNetNuke that uses 
         Google authentication to authenticate users.