Merge branch 'develop' into token-provider4

# Conflicts:
#	DNN Platform/DotNetNuke.Web/Common/DotNetNukeHttpApplication.cs
#	DNN Platform/Library/Services/Tokens/BaseCustomTokenReplace.cs
#	DNN Platform/Library/Services/Tokens/BaseTokenReplace.cs
#	DNN Platform/Library/Services/Tokens/TokenReplace.cs
#	DNN Platform/Tests/App.config
#	DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Tokens/TokenReplaceTests.cs

.github/ISSUE_TEMPLATE/bug-report.md

@@ -40,7 +40,8 @@ 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.00.00 alpha build (in development)
+* [ ] 10.00.00 alpha build
+* [ ] 09.06.02 release candidate
 * [ ] 09.06.01 latest supported release
 
 ## Affected browser

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.01" >
+    <package name="DotNetNuke_Symbols" type="Library" version="09.06.02" >
       <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/Components/BusinessController.cs

@@ -2,20 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-using System;
-using DotNetNuke.Entities.Modules;
-using DotNetNuke.Entities.Modules.Definitions;
-using DotNetNuke.Services.Upgrade;
-
 namespace Dnn.Modules.Console.Components
 {
+    using System;
+
+    using DotNetNuke.Entities.Modules;
+    using DotNetNuke.Entities.Modules.Definitions;
+    using DotNetNuke.Services.Upgrade;
+
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public class BusinessController : IUpgradeable
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="version"></param>
         /// <returns></returns>
@@ -29,6 +30,7 @@ public string UpgradeModule(string version)
 
                         break;
                 }
+
                 return "Success";
             }
             catch (Exception)

DNN Platform/Admin Modules/Dnn.Modules.Console/Components/ConsoleController.cs

@@ -1,34 +1,29 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
-
-#region Usings
-
-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;
-
-#endregion
-
 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
+    /// Controls the Console.
     /// </summary>
     public class ConsoleController
     {
         /// <summary>
         /// Gets the size values.
         /// </summary>
-        /// <returns>A list with different icon types</returns>
+        /// <returns>A list with different icon types.</returns>
         public static IList<string> GetSizeValues()
         {
             IList<string> returnValue = new List<string>();
@@ -41,7 +36,7 @@ public static IList<string> GetSizeValues()
         /// <summary>
         /// Gets the view values.
         /// </summary>
-        /// <returns>Show or Hide</returns>
+        /// <returns>Show or Hide.</returns>
         public static IList<string> GetViewValues()
         {
             IList<string> returnValue = new List<string>();

DNN Platform/Admin Modules/Dnn.Modules.Console/Properties/AssemblyInfo.cs

@@ -6,14 +6,14 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Dnn.Modules.Console")]
 [assembly: AssemblyDescription("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]