Merge remote-tracking branch 'upstream/develop' into merge-980-deve

dnnsoftware · Oct 28, 2020 · 23fce15 · 23fce15
2 parents e14db38 + 9c8bdb0
commit 23fce15
Show file tree

Hide file tree

Showing 1,011 changed files with 25,307 additions and 23,206 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -42,8 +42,7 @@ Please add X in at least one of the boxes as appropriate. In order for an issue
 -->
 * [ ] 10.00.00 alpha build
 * [ ] 09.08.00 release candidate
-* [ ] 09.07.02 release candidate
-* [ ] 09.07.01 latest supported release
+* [ ] 09.07.02 latest supported release
 
 ## Affected browser
 <!-- 

diff --git a/.github/PULL_REQUEST_PROCESS.md b/.github/PULL_REQUEST_PROCESS.md
@@ -54,8 +54,6 @@ Examples of requests of this nature include technology or dependency changes tha
 ## Merging & Closing of Requests
 Once a pull request has been reviewed by two designated approvers it may be merged and the pull request closed.
 
-> This **_MUST NOT_** be done by the submitter of the Pull Request for ANY reason!  
-
 ### Execption for Build Process Pull Requests
 A special exception has been granted to reduce the number of Designed Approval reviews to 1 for all pull requests related to Build Support when incrementing versions in prepration of a release, or reconfiguration of the environment for the next version. 
 
@@ -68,4 +66,4 @@ We follow the process outlined in the [Versioning Policy](VERSIONING_POLICY.md)
 
 The review team will work to respond to all pull requests in a timely fashion.  If changes or additional information is requested a pull request will remain open allowing the submitter to update their contribution accordingly.  If a request for additional information or changes is not completed with 90 days of request the Pull Request will be closed to keep the pipeline clear.  Once the needed information has been gathered the information can be re-submitted via a new Pull Request.  
 
-For expedited processing you may reference the prior Pull Request.
+For expedited processing you may reference the prior Pull Request.
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Components/BusinessController.cs b/DNN Platform/Admin Modules/Dnn.Modules.Console/Components/BusinessController.cs
@@ -2,41 +2,33 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace Dnn.Modules.Console.Components
-{
-    using System;
+namespace Dnn.Modules.Console.Components
+{
+    using System;
 
-    using DotNetNuke.Entities.Modules;
-    using DotNetNuke.Entities.Modules.Definitions;
-    using DotNetNuke.Services.Upgrade;
+    using DotNetNuke.Entities.Modules;
 
-    /// <summary>
-    ///
-    /// </summary>
-    public class BusinessController : IUpgradeable
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        public string UpgradeModule(string version)
-        {
-            try
-            {
-                switch (version)
-                {
-                    case "08.00.00":
-
-                        break;
-                }
-
-                return "Success";
-            }
-            catch (Exception)
-            {
-                return "Failed";
-            }
-        }
-    }
-}
+    /// <summary>Implements the module's business controller interface(s).</summary>
+    public class BusinessController : IUpgradeable
+    {
+        /// <inheritdoc/>
+        public string UpgradeModule(string version)
+        {
+            try
+            {
+                switch (version)
+                {
+                    case "08.00.00":
+
+                        break;
+                }
+
+                return "Success";
+            }
+            catch (Exception)
+            {
+                return "Failed";
+            }
+        }
+    }
+}
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Components/ConsoleController.cs b/DNN Platform/Admin Modules/Dnn.Modules.Console/Components/ConsoleController.cs
@@ -3,17 +3,7 @@
 // See the LICENSE file in the project root for more information
 namespace Dnn.Modules.Console.Components
 {
-    using System;
-    using System.Collections;
     using System.Collections.Generic;
-    using System.Text;
-    using System.Xml;
-
-    using DotNetNuke.Common;
-    using DotNetNuke.Entities.Modules;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Tabs;
-    using DotNetNuke.Services.Exceptions;
 
     /// <summary>
     /// Controls the Console.

diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj b/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj
@@ -31,8 +31,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Dnn.Modules.Console.XML</DocumentationFile>
-    <NoWarn>1591</NoWarn>
+    <NoWarn>
+    </NoWarn>
     <LangVersion>7</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -42,8 +44,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Dnn.Modules.Console.XML</DocumentationFile>
-    <NoWarn>1591,1573</NoWarn>
+    <NoWarn>
+    </NoWarn>
     <LangVersion>7</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, PublicKeyToken=null">

diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Properties/AssemblyInfo.cs b/DNN Platform/Admin Modules/Dnn.Modules.Console/Properties/AssemblyInfo.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following