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

* Remove disposal of MemoryStream for email attachments sent using SendtokenizedBuilkEmail

* Corrected references to older site URL (dnnsoftware#3056)

* Corrected references to older site URL

* corrected typo from replacement of registered character

* Made the BuildAll task default + docs

* Fixed a typo

* Update .github/BUILD.md

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

* Update .github/BUILD.md

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

* Remove reference to empty fs npm package (dnnsoftware#3094)

fs is a core package, and the version on the npm registry is just an
empty package; this was almost certainly added accidentally

Fixes dnnsoftware#3091

* Added defensive coding to prevent memory leaks

* Updates .Net 4.7.2 warning for NL and DE languages (dnnsoftware#3032)

* Updated de-DE text

As per Sebastian Leupold translation

* Updated nl-NL warning about .Net 4.7.2

As per Timo Breumelhof translation

* DNN-29557 - Infinite while loop fix (dnnsoftware#3123)

* Update Pages.resx

SEO tip for creating a title

(cherry picked from commit 04d1ee6)

* DNN-31121 - Fix the non alphanumeric character regex (dnnsoftware#3059)

* DNN-7818: add send verification mail link in unverified message.

* Add 'fileName' to condition when checking request for logo file.

* Permissions for default folders (dnnsoftware#3024)

(cherry picked from commit e77a281)

* DNN-32978 Copying pro html module don't modify the permission

* Fixes errors with previous build scripts following PB merge

* Updates issue templates and build docs (dnnsoftware#3165)

* Updates documentation as per recent changes

* Added version information

* Removed unneeded BuildAll parameter

* Added back how to clean

* Was already clearer

* Documentation action cleanup (dnnsoftware#3171)

* Add validation method with IsNullOrWhiteSpace check.  Use method to validate RoleGroup Name. closes dnnsoftware#2927 (dnnsoftware#3170)

* OAuthClientBase now returns the correct RequestingCode instead of aborting the thread (dnnsoftware#3152)

* Created INavigationManager to replace Globals.NavigateURL (dnnsoftware#3160)

* Added INavigationManager and updated Globals to reference new INavigationManager

* Updated CreateModule to use new INavigationManager

* Deprecated NavigateURL for v11.0

* Updated viewsource to use INavigationManager

* Migrated Globals.NavigateUrl to use INavigationManager

* Updated persona bar controllers to use NavigateUrl

* Refactored NavigateURL to use new INavigationManager

* Refactored Globals.NavigateURL -> INavigationManager

* Refactored more NavigationManager usages

* Updated more references to Globals.NavigateURL to use INavigationManager

* Cleaned up mistakes that happened in config files in csproj files. These changes were auto-generated by visual studio and shouldn't have been made

* removed generated nodes from csproj

* Fixed spacing in web.config

* Updated old Globals.NavigateURL methods to use registered INavigationManager so everything will execute the same code path

* Updated INavigationManager reference to be static readonly instead of an instance property

* Aliased Constants to 'Dnn.PersonaBar.Libary.Constants' to handle ambiguity

* Added DependencyInjection to website project and updated RazorHost and Export

* Updated DotNetNuke.Website Globals.NavigateURL references to use the new INavigationManager

* Added missing using statement

* Fixing typo

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

* Removing whitespace

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

* Fix typo

* Use GetRequiredService for INavigationManager

Rather than waiting for a null reference later when it's used, there's
never a scenario where this dependency is expected to be missing, so we
want to indicate that it's expected and recieve an error right away if
there's an issue

* Added new DotNetNuke.Abstractions project for storing different common abstractions for the platform

* Updated all (non website project) classes to use INavigationManager from the new DotNetNuke.Abstractions project

* Updated Website Project to use the INavigationManager from the new DotNetNuke.Abstractions project

* Removed unnecessary attributes from NavigationManager

* Updated redirection controller tests to mock out the DependencyProvider and the INavigationManager to fix failing unit tests

* Fixed failing unit tests with mocking out INavigationManager

* Removed private fields for DependencyProvider

* Added singleton clear statements to prevent the INavigationManager from remaining in memory and conflicts between unit tests

* Reset singleton state for PortalController to reduce side-effects from other tests and stale object state from Dependency Injection

* Moved state cleanup code to teardown routine

* Fixed failing unit tests in tests.web project. Added mocks for INavigationManager so the DepenencyProvider can resolve

* Added new DotNetNuke.Abstractions.nuspec to create NuGets during build

* Added missing nuspec files to the solution file

* Updated copyright on all nuget files

* Added .NET Foundation file headers to new Abstraction files

* Resolved duplicate addition of DotNetNuke.Abstractions to sln file

* Added SetTestableInstance and Clear methods to make it easier to test Components. The new methods are internal

* Added happy path test for Navigation Manager

* Added NavigationManager tests

* Updated all INavigationManager references in .ascx.cs files to use private readonly since there should never be a child class

* Removed extra's added by visual studio to .csproj files

Build/Tools/NuGet/DotNetNuke.Abstractions.nuspec

@@ -8,7 +8,11 @@
     <owners>DNN Corp</owners>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
+<<<<<<< HEAD
     <icon>images\logo-for-nuget.png</icon>
+=======
+    <iconUrl>http://www.dnnsoftware.com/favicon.ico</iconUrl>
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
     <projectUrl>https://github.com/dnnsoftware/Dnn.Platform</projectUrl>
     <description>
       Provides common abstraction API references for the DNN Platform.
@@ -18,6 +22,9 @@
   <files>
     <file src="..\..\..\Website\bin\DotNetNuke.Abstractions.dll" target="lib\netstandard2.0" />
     <file src="..\..\..\Website\bin\DotNetNuke.Abstractions.pdb" target="lib\netstandard2.0" />
+<<<<<<< HEAD
     <file src="logo-for-nuget.png" target="images\"/>
+=======
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
   </files>
 </package>

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

@@ -5,17 +5,32 @@
 =======
 #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:
+<<<<<<< HEAD
 >>>>>>> Merges latest changes from release/9.4.x into development (#3178)
 // 
+=======
+//
+// 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
+// DEALINGS IN THE SOFTWARE.
+
+#endregion
+
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 #region Usings
 
 using System;

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

@@ -5,17 +5,32 @@
 =======
 #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:
+<<<<<<< HEAD
 >>>>>>> Merges latest changes from release/9.4.x into development (#3178)
 // 
+=======
+//
+// 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
+// DEALINGS IN THE SOFTWARE.
+
+#endregion
+
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 #region Usings
 
 using System;

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

@@ -5,17 +5,32 @@
 =======
 #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:
+<<<<<<< HEAD
 >>>>>>> Merges latest changes from release/9.4.x into development (#3178)
 // 
+=======
+//
+// 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
+// DEALINGS IN THE SOFTWARE.
+
+#endregion
+
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 #region Usings
 
 using System;

DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj

@@ -18,6 +18,7 @@
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="XCOPY &quot;$(ProjectDir)bin\$(ConfigurationName)\netstandard2.0\DotNetNuke.Abstractions*&quot; &quot;$(WebsitePath)\bin&quot; /S /Y" />
+    <Exec Command="XCOPY &quot;$(ProjectDir)bin\$(ConfigurationName)\netstandard2.0\DotNetNuke.Abstractions*&quot; &quot;..\..\Website\bin&quot; /S /Y" />
   </Target>
 
 </Project>

DNN Platform/DotNetNuke.Abstractions/INavigationManager.cs

@@ -1,8 +1,12 @@
+<<<<<<< HEAD
 // 
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
 // Licensed to the .NET Foundation under one or more agreements.
+=======
+// Licensed to the .NET Foundation under one or more agreements.
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information. 
 

DNN Platform/DotNetNuke.Abstractions/Portals/IPortalSettings.cs

@@ -1,8 +1,12 @@
+<<<<<<< HEAD
 // 
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
 // Licensed to the .NET Foundation under one or more agreements.
+=======
+// Licensed to the .NET Foundation under one or more agreements.
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information. 
 

DNN Platform/DotNetNuke.Web.Mvc/Framework/ActionResults/DnnRedirecttoRouteResult.cs

@@ -1,7 +1,31 @@
+<<<<<<< HEAD
 // 
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
+=======
+#region Copyright
+//
+// DotNetNuke® - http://www.dnnsoftware.com
+// Copyright (c) 2002-2018
+// by DNN 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
+// 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
+// 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
+// DEALINGS IN THE SOFTWARE.
+#endregion
+
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 using System.Web.Mvc;
 using System.Web.Routing;
 using Microsoft.Extensions.DependencyInjection;

DNN Platform/DotNetNuke.Web.Mvc/Routing/StandardModuleRoutingProvider.cs

@@ -1,7 +1,31 @@
+<<<<<<< HEAD
 // 
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
+=======
+#region Copyright
+//
+// DotNetNuke® - http://www.dnnsoftware.com
+// Copyright (c) 2002-2018
+// by DNN 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
+// 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
+// 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
+// DEALINGS IN THE SOFTWARE.
+#endregion
+
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 using System;
 using System.Collections.Generic;
 using System.Linq;

DNN Platform/DotNetNuke.Web.Razor/Helpers/UrlHelper.cs

@@ -1,25 +1,30 @@
+<<<<<<< HEAD
 // 
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
 <<<<<<< HEAD
 =======
+=======
+#region Copyright
+//
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 // 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
 >>>>>>> Merges latest changes from release/9.4.x into development (#3178)

DNN Platform/DotNetNuke.Web/Mvp/ProfileModuleViewBase.cs

@@ -1,25 +1,30 @@
+<<<<<<< HEAD
 // 
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
 <<<<<<< HEAD
 =======
+=======
+#region Copyright
+//
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 // 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
 

DNN Platform/DotNetNuke.Web/UI/WebControls/DnnRibbonBarTool.cs

@@ -1,25 +1,30 @@
+<<<<<<< HEAD
 // 
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // 
 <<<<<<< HEAD
 =======
+=======
+#region Copyright
+//
+>>>>>>> Merges latest changes from 9.4.x into development (#3189)
 // 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
 >>>>>>> Merges latest changes from release/9.4.x into development (#3178)