Revert "Merges latest changes from 9.4.x into development (#3189)"

This reverts commit 697a54e.

Platform/DotNetNuke.Web.Mvc/Framework/ActionResults/DnnRedirecttoRouteResult.cs
Platform/DotNetNuke.Website.Deprecated/DotNetNuke.Website.Deprecated.csproj
Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/AddModule.ascx.cs
Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/AddPage.ascx.cs
Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/ControlBar.ascx.cs
Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/UpdatePage.ascx.cs
Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/WebUpload.ascx.cs
Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj
Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/StandardFolderProviderTests.cs
Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/RedirectionControllerTests.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoDto.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/AuthSystemPackageEditor.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/CoreLanguagePackageEditor.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ExtensionLanguagePackageEditor.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/ExtensionsController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Converters.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/SiteSettingsController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserDetailDto.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ExtensionMenuController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ThemeMenuController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/LanguagesController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/PagesController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SeoController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/packages.config
Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Containers/PersonaBarContainer.cs
Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj
Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/MenuControllers/LinkMenuController.cs

Build/Tools/NuGet/DotNetNuke.Bundle.nuspec

@@ -13,7 +13,7 @@
     <description>
       This package is a metapackage that automatically includes all other available DNN Packages, this should only be used in situations where support for ALL types of development are truly needed.
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Core" version="$version$" />
       <dependency id="DotNetNuke.Instrumentation" version="$version$" />

Build/Tools/NuGet/DotNetNuke.Core.nuspec

@@ -13,7 +13,7 @@
     <description>
       Provides basic references to the DotNetNuke.dll to develop extensions for the DNN Platform.  For MVC or WebAPI please see other packages available as well
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
 	<dependencies>
       <dependency id="DotNetNuke.DependencyInjection" version="$version$" />
     </dependencies>

Build/Tools/NuGet/DotNetNuke.DependencyInjection.nuspec

@@ -13,7 +13,7 @@
     <description>
       Provides API references needed to use Dependency Injection for the DNN Platform.
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="Microsoft.Extensions.DependencyInjection" version="2.1.1" />
     </dependencies>

Build/Tools/NuGet/DotNetNuke.Instrumentation.nuspec

@@ -13,7 +13,7 @@
     <description>
       Provides references to enhanced logging and instrumentation available within DNN Platform for extension developers. Including access to Log4Net
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Core" version="$version$" />
     </dependencies>

Build/Tools/NuGet/DotNetNuke.Providers.FolderProviders.nuspec

@@ -13,7 +13,7 @@
     <description>
       Provides API references needed to develop custom folder providers, or to consume folder providers
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DotNetNuke is copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Core" version="$version$" />
     </dependencies>

Build/Tools/NuGet/DotNetNuke.SiteExportImport.nuspec

@@ -13,7 +13,7 @@
     <description>
       This package contains components required for developing extensiong to utilize site export/import features.
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Core" version="$version$" />
       <dependency id="DotNetNuke.Instrumentation" version="$version$" />

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

@@ -13,7 +13,7 @@
     <description>
       Provides API references for usage of the Client Dependency Framework (CDF) for the inclusion of CSS and JS files within DNN Platform
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Core" version="$version$" />
     </dependencies>

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

@@ -13,7 +13,7 @@
     <description>
       	Provides API references for deprecated items removed from the primary API's, such as DNN's Telerik component.  These elements may not be distributed with DNN in the future
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Web" version="$version$" />
     </dependencies>

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

@@ -13,7 +13,7 @@
     <description>
       Provides API references needed to develop ASP.MVC extensions for DNN Platform
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Web" version="$version$" />
       <dependency id="DotNetNuke.Web.Client" version="$version$" />

Build/Tools/NuGet/DotNetNuke.Web.nuspec

@@ -13,7 +13,7 @@
     <description>
       Provides references to core components such as Caching, Security and other security-related items for DNN Platform
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="DotNetNuke.Core" version="$version$" />
     </dependencies>

Build/Tools/NuGet/DotNetNuke.WebApi.nuspec

@@ -13,7 +13,7 @@
     <description>
       This package contains components required for developing WebAPI based services for DNN Platform.
     </description>
-    <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
+    <copyright>DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved.</copyright>
     <dependencies>
       <dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />
       <dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.3" />

DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj

@@ -50,12 +50,6 @@
       <HintPath>..\..\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -109,10 +103,6 @@
     <Content Include="ViewConsole.ascx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\DotNetNuke.Abstractions\DotNetNuke.Abstractions.csproj">
-      <Project>{6928A9B1-F88A-4581-A132-D3EB38669BB0}</Project>
-      <Name>DotNetNuke.Abstractions</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\DotNetNuke.Instrumentation\DotNetNuke.Instrumentation.csproj">
       <Project>{3cd5f6b8-8360-4862-80b6-f402892db7dd}</Project>
       <Name>DotNetNuke.Instrumentation</Name>
@@ -144,9 +134,6 @@
   <ItemGroup>
     <Content Include="web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

DNN Platform/Admin Modules/Dnn.Modules.Console/ViewConsole.ascx.cs

@@ -1,22 +1,22 @@
 #region Copyright
 
-//
+// 
 // DotNetNuke® - https://www.dnnsoftware.com
 // Copyright (c) 2002-2018
 // by DotNetNuke Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation 
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and 
 // to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// 
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions 
 // of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED 
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
 
 #endregion
@@ -29,14 +29,15 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Web.UI;
 using System.Web.UI.WebControls;
-using Microsoft.Extensions.DependencyInjection;
 using Dnn.Modules.Console.Components;
-using DotNetNuke.Abstractions;
+using DotNetNuke.Common;
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Entities.Modules;
 using DotNetNuke.Entities.Tabs;
 using DotNetNuke.Entities.Users;
+using DotNetNuke.Framework;
 using DotNetNuke.Framework.JavaScriptLibraries;
 using DotNetNuke.Instrumentation;
 using DotNetNuke.Security.Permissions;
@@ -52,18 +53,12 @@ namespace Dnn.Modules.Console
 {
 	public partial class ViewConsole : PortalModuleBase
 	{
-        private readonly INavigationManager _navigationManager;
 		private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof (ViewConsole));
 	    private ConsoleController _consoleCtrl;
 		private string _defaultSize = string.Empty;
 		private string _defaultView = string.Empty;
 	    private int _groupTabID = -1;
-		private IList<TabInfo> _tabs;
-
-        public ViewConsole()
-        {
-            _navigationManager = DependencyProvider.GetRequiredService<INavigationManager>();
-        }
+		private IList<TabInfo> _tabs; 
 
         #region Public Properties
 
@@ -79,7 +74,7 @@ public bool AllowViewChange
 
 	    public bool IncludeHiddenPages
 	    {
-            get { return Settings.ContainsKey("IncludeHiddenPages") && bool.Parse(Settings["IncludeHiddenPages"].ToString()); }
+            get { return Settings.ContainsKey("IncludeHiddenPages") && bool.Parse(Settings["IncludeHiddenPages"].ToString()); }	        
 	    }
 
         public ConsoleController ConsoleCtrl
@@ -382,7 +377,7 @@ protected override void OnLoad(EventArgs e)
                 }
                 IconSize.SelectedValue = DefaultSize;
                 View.SelectedValue = DefaultView;
-
+                
                 if ((!IsPostBack))
                 {
                     Console.Attributes["class"] = Console.Attributes["class"] + " " + Mode.ToLower(CultureInfo.InvariantCulture);
@@ -419,7 +414,7 @@ protected override void OnLoad(EventArgs e)
 							{
 								tabIdList.Add(tab.TabID);
 							}
-							_tabs.Add(tab);
+							_tabs.Add(tab);  
 						}
 					}
 
@@ -508,12 +503,12 @@ protected string GetHtml(TabInfo tab)
 			    var tabUrl = tab.FullUrl;
                 if (ProfileUserId > -1)
                 {
-                    tabUrl = _navigationManager.NavigateURL(tab.TabID, "", "UserId=" + ProfileUserId.ToString(CultureInfo.InvariantCulture));
+                    tabUrl = Globals.NavigateURL(tab.TabID, "", "UserId=" + ProfileUserId.ToString(CultureInfo.InvariantCulture));
                 }
 
                 if (GroupId > -1)
                 {
-                    tabUrl = _navigationManager.NavigateURL(tab.TabID, "", "GroupId=" + GroupId.ToString(CultureInfo.InvariantCulture));
+                    tabUrl = Globals.NavigateURL(tab.TabID, "", "GroupId=" + GroupId.ToString(CultureInfo.InvariantCulture));
                 }
 
 				returnValue += string.Format(sb.ToString(),

DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/CreateModule.ascx.cs

@@ -1,22 +1,22 @@
 #region Copyright
 
-//
+// 
 // DotNetNuke® - https://www.dnnsoftware.com
 // Copyright (c) 2002-2012
 // by DotNetNuke Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation 
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and 
 // to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// 
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions 
 // of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED 
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
 
 #endregion
@@ -40,20 +40,14 @@
 using DotNetNuke.Entities.Controllers;
 using DotNetNuke.Entities.Content.Taxonomy;
 using DotNetNuke.Services.Log.EventLog;
-using DotNetNuke.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
+
 #endregion
 
 namespace Dnn.Module.ModuleCreator
 {
 
     public partial class CreateModule : PortalModuleBase
     {
-        private readonly INavigationManager _navigationManager;
-        public CreateModule()
-        {
-            _navigationManager = DependencyProvider.GetRequiredService<INavigationManager>();
-        }
 
         #region Private Methods
 
@@ -153,7 +147,7 @@ private string CreateModuleControl()
                 sourceCode = sourceCode.Replace("_CONTROL_", GetControl());
                 sourceCode = sourceCode.Replace("_YEAR_", DateTime.Now.Year.ToString());
 
-                //get filename
+                //get filename 
                 fileName = Path.GetFileName(filePath);
                 fileName = fileName.Replace("template", GetControl());
                 fileName = fileName.Replace("_OWNER_", GetOwner());
@@ -331,7 +325,7 @@ private bool CreateModuleDefinition()
                         var objModuleDefinition = new ModuleDefinitionInfo();
                         objModuleDefinition.ModuleDefID = Null.NullInteger;
                         objModuleDefinition.DesktopModuleID = objDesktopModule.DesktopModuleID;
-                        // need core enhancement to have a unique DefinitionName
+                        // need core enhancement to have a unique DefinitionName  
                         objModuleDefinition.FriendlyName = GetClassName();
                         //objModuleDefinition.FriendlyName = txtModule.Text;
                         //objModuleDefinition.DefinitionName = GetClassName();
@@ -444,7 +438,7 @@ protected void cmdCreate_Click(object sender, EventArgs e)
                     HostController.Instance.Update("Owner", txtOwner.Text, false);
                     if (CreateModuleDefinition())
                     {
-                        Response.Redirect(_navigationManager.NavigateURL(), true);
+                        Response.Redirect(Globals.NavigateURL(), true);
                     }
                 }
                 else