diff --git a/Build/Build.csproj b/Build/Build.csproj index 06b3aecd4ba..5659c6aa218 100644 --- a/Build/Build.csproj +++ b/Build/Build.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Build/Tasks/PackageMicrosoftWebInfrastructure.cs b/Build/Tasks/PackageMicrosoftWebInfrastructure.cs index 42894164302..16e721dcc96 100644 --- a/Build/Tasks/PackageMicrosoftWebInfrastructure.cs +++ b/Build/Tasks/PackageMicrosoftWebInfrastructure.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information namespace DotNetNuke.Build.Tasks; + using System.Diagnostics; using System.Linq; using System.Xml; 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 index f532c7b4b30..3567d8acc02 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj @@ -168,8 +168,8 @@ - - + + 10.0 diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config b/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config index cd13450a8cc..0e16679d953 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config @@ -3,7 +3,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj b/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj index cdf4959c188..30b9256ecc2 100644 --- a/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj +++ b/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj @@ -160,8 +160,8 @@ - - + + diff --git a/DNN Platform/Connectors/Azure/packages.config b/DNN Platform/Connectors/Azure/packages.config index fc980b101fe..1e2c076b015 100644 --- a/DNN Platform/Connectors/Azure/packages.config +++ b/DNN Platform/Connectors/Azure/packages.config @@ -6,7 +6,8 @@ - + + diff --git a/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj b/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj index 50263c6e470..32a9906fa2b 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj +++ b/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj @@ -148,8 +148,8 @@ - - + + diff --git a/DNN Platform/Connectors/GoogleAnalytics/packages.config b/DNN Platform/Connectors/GoogleAnalytics/packages.config index a0566a89fde..c8e11797d7c 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/packages.config +++ b/DNN Platform/Connectors/GoogleAnalytics/packages.config @@ -4,7 +4,8 @@ - + + diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj b/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj index 162b6f125de..fd9cf7caf53 100644 --- a/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj +++ b/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj @@ -115,10 +115,6 @@ - - - - @@ -135,8 +131,8 @@ - - + + diff --git a/DNN Platform/Connectors/GoogleAnalytics4/packages.config b/DNN Platform/Connectors/GoogleAnalytics4/packages.config index a0566a89fde..c8e11797d7c 100644 --- a/DNN Platform/Connectors/GoogleAnalytics4/packages.config +++ b/DNN Platform/Connectors/GoogleAnalytics4/packages.config @@ -4,7 +4,8 @@ - + + diff --git a/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj b/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj index cc60da1575b..7e0241dde29 100644 --- a/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj +++ b/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj @@ -152,8 +152,8 @@ - - + + diff --git a/DNN Platform/Connectors/GoogleTagManager/packages.config b/DNN Platform/Connectors/GoogleTagManager/packages.config index a0566a89fde..c8e11797d7c 100644 --- a/DNN Platform/Connectors/GoogleTagManager/packages.config +++ b/DNN Platform/Connectors/GoogleTagManager/packages.config @@ -4,7 +4,8 @@ - + + diff --git a/DNN Platform/Controls/CountryListBox/CountryListBox.csproj b/DNN Platform/Controls/CountryListBox/CountryListBox.csproj index 6dd1e6c0eb3..b721e729587 100644 --- a/DNN Platform/Controls/CountryListBox/CountryListBox.csproj +++ b/DNN Platform/Controls/CountryListBox/CountryListBox.csproj @@ -95,8 +95,8 @@ - - + + diff --git a/DNN Platform/Controls/CountryListBox/packages.config b/DNN Platform/Controls/CountryListBox/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Controls/CountryListBox/packages.config +++ b/DNN Platform/Controls/CountryListBox/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj index 3de7e816353..e50b2f759a1 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj +++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj @@ -179,8 +179,8 @@ - - + + diff --git a/DNN Platform/Dnn.AuthServices.Jwt/packages.config b/DNN Platform/Dnn.AuthServices.Jwt/packages.config index 0a695be6d07..14d5a3e5b78 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/packages.config +++ b/DNN Platform/Dnn.AuthServices.Jwt/packages.config @@ -15,7 +15,8 @@ - + + diff --git a/DNN Platform/DotNetNuke.Abstractions/Application/ReleaseMode.cs b/DNN Platform/DotNetNuke.Abstractions/Application/ReleaseMode.cs index 4b857430424..8324416b640 100644 --- a/DNN Platform/DotNetNuke.Abstractions/Application/ReleaseMode.cs +++ b/DNN Platform/DotNetNuke.Abstractions/Application/ReleaseMode.cs @@ -19,19 +19,19 @@ namespace DotNetNuke.Abstractions.Application /// public enum ReleaseMode { - /// Not assigned + /// Not assigned. None = 0, - /// Alpha release + /// Alpha release. Alpha = 1, - /// Beta release + /// Beta release. Beta = 2, - /// Release candidate + /// Release candidate. RC = 3, - /// Stable release version + /// Stable release version. Stable = 4, } } diff --git a/DNN Platform/DotNetNuke.Abstractions/Application/UpgradeStatus.cs b/DNN Platform/DotNetNuke.Abstractions/Application/UpgradeStatus.cs index 5dc18a767f3..19167816c15 100644 --- a/DNN Platform/DotNetNuke.Abstractions/Application/UpgradeStatus.cs +++ b/DNN Platform/DotNetNuke.Abstractions/Application/UpgradeStatus.cs @@ -18,7 +18,7 @@ public enum UpgradeStatus /// The application occur error when running. Error = 3, - /// The application status is unknown, + /// The application status is unknown. /// This status should never be returned. its is only used as a flag that Status hasn't been determined. Unknown = 4, } diff --git a/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj b/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj index 226040daee6..f8fdbd1d7cd 100644 --- a/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj +++ b/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DNN Platform/DotNetNuke.Abstractions/Logging/NotificationThresholdTimeType.cs b/DNN Platform/DotNetNuke.Abstractions/Logging/NotificationThresholdTimeType.cs new file mode 100644 index 00000000000..10074c78292 --- /dev/null +++ b/DNN Platform/DotNetNuke.Abstractions/Logging/NotificationThresholdTimeType.cs @@ -0,0 +1,24 @@ +// 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 + +namespace DotNetNuke.Abstractions.Logging; + +/// Notification threshold time. +public enum NotificationThresholdTimeType +{ + /// No threshold time. + None = 0, + + /// Seconds. + Seconds = 1, + + /// Minutes. + Minutes = 2, + + /// Hours. + Hours = 3, + + /// Days. + Days = 4, +} diff --git a/DNN Platform/DotNetNuke.Abstractions/Logging/NotificationThresholdTimeTypes.cs b/DNN Platform/DotNetNuke.Abstractions/Logging/NotificationThresholdTimeTypes.cs deleted file mode 100644 index 13f6b07ff2c..00000000000 --- a/DNN Platform/DotNetNuke.Abstractions/Logging/NotificationThresholdTimeTypes.cs +++ /dev/null @@ -1,24 +0,0 @@ -// 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 -namespace DotNetNuke.Abstractions.Logging -{ - /// Notification threshold time. - public enum NotificationThresholdTimeType - { - /// No threshold time. - None = 0, - - /// Seconds. - Seconds = 1, - - /// Minutes. - Minutes = 2, - - /// Hours. - Hours = 3, - - /// Days. - Days = 4, - } -} diff --git a/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/IPortalTemplateController.cs b/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/IPortalTemplateController.cs index 38ee5f4cefa..6deb1b1aeef 100644 --- a/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/IPortalTemplateController.cs +++ b/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/IPortalTemplateController.cs @@ -39,7 +39,7 @@ public interface IPortalTemplateController /// Whether to include user profile settings. /// Whether to include the portal's roles. /// A boolean indicating success and a string with an (success or error) message. - (bool success, string message) ExportPortalTemplate(int portalId, string fileName, string description, bool isMultiLanguage, IEnumerable locales, string localizationCulture, IEnumerable exportTabIds, bool includeContent, bool includeFiles, bool includeModules, bool includeProfile, bool includeRoles); + (bool Success, string Message) ExportPortalTemplate(int portalId, string fileName, string description, bool isMultiLanguage, IEnumerable locales, string localizationCulture, IEnumerable exportTabIds, bool includeContent, bool includeFiles, bool includeModules, bool includeProfile, bool includeRoles); /// Load info for a portal template. /// Full path to the portal template. diff --git a/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/PortalTemplateModuleAction.cs b/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/PortalTemplateModuleAction.cs index 42763f8e5d2..a0b665e384e 100644 --- a/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/PortalTemplateModuleAction.cs +++ b/DNN Platform/DotNetNuke.Abstractions/Portals/Templates/PortalTemplateModuleAction.cs @@ -7,13 +7,13 @@ namespace DotNetNuke.Abstractions.Portals.Templates /// Specify what should happen during the application of a portal template when modules collide with existing modules. public enum PortalTemplateModuleAction { - /// Ignore + /// Ignore. Ignore = 0, - /// Add the module to the page next to the old module + /// Add the module to the page next to the old module. Merge = 1, - /// Replace the old module + /// Replace the old module. Replace = 2, } } diff --git a/DNN Platform/DotNetNuke.Abstractions/Security/SiteSslSetup.cs b/DNN Platform/DotNetNuke.Abstractions/Security/SiteSslSetup.cs index 47fd5fd91a5..54cb5333346 100644 --- a/DNN Platform/DotNetNuke.Abstractions/Security/SiteSslSetup.cs +++ b/DNN Platform/DotNetNuke.Abstractions/Security/SiteSslSetup.cs @@ -7,13 +7,13 @@ namespace DotNetNuke.Abstractions.Security /// The SiteSslSetup is used in the portal settings to indicate what the global SSL setup is for the site. public enum SiteSslSetup { - /// No SSL + /// No SSL. Off = 0, - /// Complete SSL + /// Complete SSL. On = 1, - /// Ability to tweak SSL settings + /// Ability to tweak SSL settings. Advanced = 2, } } diff --git a/DNN Platform/DotNetNuke.Abstractions/Urls/BrowserTypes.cs b/DNN Platform/DotNetNuke.Abstractions/Urls/BrowserTypes.cs index 67d8e21adeb..2308299e80e 100644 --- a/DNN Platform/DotNetNuke.Abstractions/Urls/BrowserTypes.cs +++ b/DNN Platform/DotNetNuke.Abstractions/Urls/BrowserTypes.cs @@ -9,7 +9,7 @@ public enum BrowserTypes /// Standard web browser. Normal = 0, - /// Mobile web browser + /// Mobile web browser. Mobile = 1, } } diff --git a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj index 84bed6f2e69..22bfadc30e9 100644 --- a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj +++ b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj @@ -20,7 +20,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DNN Platform/DotNetNuke.DependencyInjection/LazyWrapper.cs b/DNN Platform/DotNetNuke.DependencyInjection/LazyWrapper.cs index e46e47ef400..6b430da787f 100644 --- a/DNN Platform/DotNetNuke.DependencyInjection/LazyWrapper.cs +++ b/DNN Platform/DotNetNuke.DependencyInjection/LazyWrapper.cs @@ -2,7 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information namespace DotNetNuke.DependencyInjection; + using System; + using Microsoft.Extensions.DependencyInjection; /// A wrapper which allows requesting via dependency injection and delaying instantiation. diff --git a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj index 1bdfde6d4ad..fc1ec50895f 100644 --- a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj +++ b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj @@ -77,10 +77,6 @@ - - - - {5FE5D021-9C8D-47A6-BD34-F328BA3E709C} @@ -91,6 +87,10 @@ DotNetNuke.Abstractions + + + + $(MSBuildProjectDirectory)\..\.. diff --git a/DNN Platform/DotNetNuke.Instrumentation/packages.config b/DNN Platform/DotNetNuke.Instrumentation/packages.config index 930d5480836..8afaefa498c 100644 --- a/DNN Platform/DotNetNuke.Instrumentation/packages.config +++ b/DNN Platform/DotNetNuke.Instrumentation/packages.config @@ -3,5 +3,6 @@ - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj b/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj index 951da3250d1..690717e403c 100644 --- a/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj +++ b/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj b/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj index 2d43ec7c29a..88aced860e0 100644 --- a/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj +++ b/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj index e2b0b6f869d..92c34a55883 100644 --- a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj +++ b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj @@ -112,10 +112,6 @@ - - - - {5FE5D021-9C8D-47A6-BD34-F328BA3E709C} @@ -126,6 +122,10 @@ DotNetNuke.Abstractions + + + + $(MSBuildProjectDirectory)\..\.. diff --git a/DNN Platform/DotNetNuke.Web.Client/FileOrder.cs b/DNN Platform/DotNetNuke.Web.Client/FileOrder.cs index c4dbf6b43a2..b4b5e5258c2 100644 --- a/DNN Platform/DotNetNuke.Web.Client/FileOrder.cs +++ b/DNN Platform/DotNetNuke.Web.Client/FileOrder.cs @@ -11,10 +11,10 @@ public class FileOrder /// Defines load order of key JavaScript files within the framework. public enum Js { - /// The default priority (100) indicates that the ordering will be done based on the order in which the registrations are made + /// The default priority (100) indicates that the ordering will be done based on the order in which the registrations are made. DefaultPriority = 100, - /// jQuery (CDN or local file) has the priority of 5 + /// jQuery (CDN or local file) has the priority of 5. [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:ElementMustBeginWithUpperCaseLetter", Justification = "Breaking Change")] // ReSharper disable once InconsistentNaming @@ -26,77 +26,77 @@ public enum Js // ReSharper disable once InconsistentNaming jQueryMigrate = 6, - /// jQuery UI (CDN or local file) has the priority of 10 + /// jQuery UI (CDN or local file) has the priority of 10. [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:ElementMustBeginWithUpperCaseLetter", Justification = "Breaking Change")] // ReSharper disable once InconsistentNaming jQueryUI = 10, - /// /js/dnn.xml.js has the priority of 15 + /// /js/dnn.xml.js has the priority of 15. DnnXml = 15, - /// /js/dnn.xml.jsparser.js has the priority of 20 + /// /js/dnn.xml.jsparser.js has the priority of 20. DnnXmlJsParser = 20, - /// /js/dnn.xmlhttp.js has the priority of 25 + /// /js/dnn.xmlhttp.js has the priority of 25. DnnXmlHttp = 25, - /// /js/dnn.xmlhttp.jsxmlhttprequest.js has the pririty of 30 + /// /js/dnn.xmlhttp.jsxmlhttprequest.js has the pririty of 30. DnnXmlHttpJsXmlHttpRequest = 30, - /// /js/dnn.dom.positioning.js has the priority of 35 + /// /js/dnn.dom.positioning.js has the priority of 35. DnnDomPositioning = 35, - /// /js/dnn.controls.js has the priority of 40 + /// /js/dnn.controls.js has the priority of 40. DnnControls = 40, - /// /js/dnn.controls.labeledit.js has the priority of 45 + /// /js/dnn.controls.labeledit.js has the priority of 45. DnnControlsLabelEdit = 45, - /// /js/dnn.modalpopup.js has the priority of 50 + /// /js/dnn.modalpopup.js has the priority of 50. DnnModalPopup = 50, - /// jQuery Hover Intent JS File has the priority of 55 + /// jQuery Hover Intent JS File has the priority of 55. HoverIntent = 55, } /// Defines load order of key CSS files within the framework. public enum Css { - /// The default priority (100) indicates that the ordering will be done based on the order in which the registrations are made + /// The default priority (100) indicates that the ordering will be done based on the order in which the registrations are made. DefaultPriority = 100, - /// The default.css file has a priority of 5 + /// The default.css file has a priority of 5. DefaultCss = 5, - /// The admin.css file has a priority of 6 + /// The admin.css file has a priority of 6. AdminCss = 6, - /// The feature.css file has a priority of 7 + /// The feature.css file has a priority of 7. FeatureCss = 7, - /// The ie.css file has a priority of 8 + /// The ie.css file has a priority of 8. IeCss = 8, - /// Module CSS files have a priority of 10 + /// Module CSS files have a priority of 10. ModuleCss = 10, - /// Resources CSS files have a priority of 12 + /// Resources CSS files have a priority of 12. ResourceCss = 12, - /// Skin CSS files have a priority of 15 + /// Skin CSS files have a priority of 15. SkinCss = 15, - /// Specific skin control's CSS files have a priority of 20 + /// Specific skin control's CSS files have a priority of 20. SpecificSkinCss = 20, - /// Container CSS files have a priority of 25 + /// Container CSS files have a priority of 25. ContainerCss = 25, - /// Specific container control's CSS files have a priority of 30 + /// Specific container control's CSS files have a priority of 30. SpecificContainerCss = 30, - /// The portal.css file has a priority of 35 + /// The portal.css file has a priority of 35. PortalCss = 35, } } diff --git a/DNN Platform/DotNetNuke.Web.Client/packages.config b/DNN Platform/DotNetNuke.Web.Client/packages.config index 19323094459..af9e451e0c6 100644 --- a/DNN Platform/DotNetNuke.Web.Client/packages.config +++ b/DNN Platform/DotNetNuke.Web.Client/packages.config @@ -6,7 +6,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj index 8ce1a1074a2..1825706c20e 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj +++ b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj @@ -264,8 +264,8 @@ - - + + diff --git a/DNN Platform/DotNetNuke.Web.Mvc/packages.config b/DNN Platform/DotNetNuke.Web.Mvc/packages.config index b1cc52b8932..f9f794ca904 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/packages.config +++ b/DNN Platform/DotNetNuke.Web.Mvc/packages.config @@ -18,7 +18,8 @@ - + + diff --git a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj index ba6c5723945..7493e5bdfb2 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj +++ b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj @@ -160,8 +160,8 @@ - - + + diff --git a/DNN Platform/DotNetNuke.Web.Razor/packages.config b/DNN Platform/DotNetNuke.Web.Razor/packages.config index 9634ed70350..9f4deb17bc4 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/packages.config +++ b/DNN Platform/DotNetNuke.Web.Razor/packages.config @@ -12,7 +12,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/ApiTokenController.cs b/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/ApiTokenController.cs index b09efa92252..d0dbcd892e5 100644 --- a/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/ApiTokenController.cs +++ b/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/ApiTokenController.cs @@ -51,7 +51,7 @@ public ApiTokenController( private Abstractions.Portals.IPortalSettings PortalSettings => PortalController.Instance.GetCurrentSettings(); /// - public (ApiToken, UserInfo) ValidateToken(HttpRequestMessage request) + public (ApiToken Token, UserInfo User) ValidateToken(HttpRequestMessage request) { if (!ApiTokenAuthMessageHandler.IsEnabled) { @@ -211,7 +211,7 @@ private string ValidateAuthHeader(AuthenticationHeaderValue authHdr) return authorization; } - private (ApiToken, UserInfo) ValidateAuthorizationValue(string authorization) + private (ApiToken Token, UserInfo User) ValidateAuthorizationValue(string authorization) { var tokenAndHostGuid = authorization + Entities.Host.Host.GUID; var hashedToken = this.GetHashedStr(tokenAndHostGuid); diff --git a/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/IApiTokenController.cs b/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/IApiTokenController.cs index bc7b5832041..2c6b6dfba60 100644 --- a/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/IApiTokenController.cs +++ b/DNN Platform/DotNetNuke.Web/Api/Auth/ApiTokens/IApiTokenController.cs @@ -27,7 +27,7 @@ public interface IApiTokenController /// /// The `HttpRequestMessage` instance that contains the token. /// A tuple object containing an `ApiToken` object and a `UserInfo` object. - (ApiToken, UserInfo) ValidateToken(HttpRequestMessage request); + (ApiToken Token, UserInfo User) ValidateToken(HttpRequestMessage request); /// /// Sets the API token of the current thread. diff --git a/DNN Platform/DotNetNuke.Web/Api/HttpStatusCodeAdditions.cs b/DNN Platform/DotNetNuke.Web/Api/HttpStatusCodeAdditions.cs index f56b623c90a..f97ea4c2188 100644 --- a/DNN Platform/DotNetNuke.Web/Api/HttpStatusCodeAdditions.cs +++ b/DNN Platform/DotNetNuke.Web/Api/HttpStatusCodeAdditions.cs @@ -13,7 +13,7 @@ public enum HttpStatusCodeAdditions /// status code is inappropriate) but was unable to process the contained instructions. /// /// http://tools.ietf.org/html/rfc4918 - /// + /// . /// UnprocessableEntity = 422, } diff --git a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj index bac661876e8..69c606a4a5b 100644 --- a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj +++ b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj @@ -494,8 +494,8 @@ - - + + diff --git a/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs b/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs index 01d56082718..515cbe714f9 100644 --- a/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs +++ b/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs @@ -183,7 +183,8 @@ public Task PostFile() state => { returnFileDto = SaveFile(stream, portalSettings, userInfo, folder, filter, fileName, overwrite, isHostMenu, extract, out alreadyExists, out errorMessage); - }, null); + }, + null); } /* Response Content Type cannot be application/json diff --git a/DNN Platform/DotNetNuke.Web/Mvp/ProfileModuleViewBase.cs b/DNN Platform/DotNetNuke.Web/Mvp/ProfileModuleViewBase.cs index d97cf76f902..4c6f92d0df3 100644 --- a/DNN Platform/DotNetNuke.Web/Mvp/ProfileModuleViewBase.cs +++ b/DNN Platform/DotNetNuke.Web/Mvp/ProfileModuleViewBase.cs @@ -68,10 +68,10 @@ protected override void OnInit(EventArgs e) || this.ModuleContext.PortalSettings.ActiveTab.ParentId == this.ModuleContext.PortalSettings.UserTabId)) { // Clicked on breadcrumb - don't know which user - this.Response.Redirect( - this.Request.IsAuthenticated - ? this.NavigationManager.NavigateURL(this.ModuleContext.PortalSettings.ActiveTab.TabID, string.Empty, "UserId=" + this.ModuleContext.PortalSettings.UserId.ToString(CultureInfo.InvariantCulture)) - : this.GetRedirectUrl(), true); + var redirectUrl = this.Request.IsAuthenticated + ? this.NavigationManager.NavigateURL(this.ModuleContext.PortalSettings.ActiveTab.TabID, string.Empty, "UserId=" + this.ModuleContext.PortalSettings.UserId.ToString(CultureInfo.InvariantCulture)) + : this.GetRedirectUrl(); + this.Response.Redirect(redirectUrl, true); } base.OnInit(e); diff --git a/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnFilePicker.cs b/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnFilePicker.cs index fe240531ac0..f2cd0cae82c 100644 --- a/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnFilePicker.cs +++ b/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnFilePicker.cs @@ -52,13 +52,13 @@ public class DnnFilePicker : CompositeControl, ILocalizable /// Represents a possible mode for the File Control. protected enum FileControlMode { - /// The File Control is in its Normal mode + /// The File Control is in its Normal mode. Normal = 0, - /// The File Control is in the Upload File mode + /// The File Control is in the Upload File mode. UpLoadFile = 1, - /// The File Control is in the Preview mode + /// The File Control is in the Preview mode. Preview = 2, } diff --git a/DNN Platform/DotNetNuke.Web/packages.config b/DNN Platform/DotNetNuke.Web/packages.config index 597b679bccb..c062ae7f223 100644 --- a/DNN Platform/DotNetNuke.Web/packages.config +++ b/DNN Platform/DotNetNuke.Web/packages.config @@ -16,7 +16,8 @@ - + + diff --git a/DNN Platform/DotNetNuke.WebUtility/packages.config b/DNN Platform/DotNetNuke.WebUtility/packages.config index 930d5480836..8afaefa498c 100644 --- a/DNN Platform/DotNetNuke.WebUtility/packages.config +++ b/DNN Platform/DotNetNuke.WebUtility/packages.config @@ -3,5 +3,6 @@ - + + \ No newline at end of file diff --git a/DNN Platform/HttpModules/Compression/Config/Algorithms.cs b/DNN Platform/HttpModules/Compression/Config/Algorithms.cs new file mode 100644 index 00000000000..0fe2a0f6b09 --- /dev/null +++ b/DNN Platform/HttpModules/Compression/Config/Algorithms.cs @@ -0,0 +1,14 @@ +// 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 + +namespace DotNetNuke.HttpModules.Compression; + +/// The available compression algorithms to use with the HttpCompressionModule. +public enum Algorithms +{ + Deflate = 2, + GZip = 1, + None = 0, + Default = -1, +} diff --git a/DNN Platform/HttpModules/Compression/Config/Enums.cs b/DNN Platform/HttpModules/Compression/Config/Enums.cs deleted file mode 100644 index 1f5665978bb..00000000000 --- a/DNN Platform/HttpModules/Compression/Config/Enums.cs +++ /dev/null @@ -1,15 +0,0 @@ -// 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 - -namespace DotNetNuke.HttpModules.Compression -{ - /// The available compression algorithms to use with the HttpCompressionModule. - public enum Algorithms - { - Deflate = 2, - GZip = 1, - None = 0, - Default = -1, - } -} diff --git a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj index 4bc54ba83b0..519af342ecc 100644 --- a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj +++ b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj @@ -94,6 +94,7 @@ SolutionInfo.cs + @@ -129,7 +130,6 @@ - @@ -155,8 +155,8 @@ - - + + diff --git a/DNN Platform/HttpModules/packages.config b/DNN Platform/HttpModules/packages.config index 97ff371880c..5c71a588acc 100644 --- a/DNN Platform/HttpModules/packages.config +++ b/DNN Platform/HttpModules/packages.config @@ -6,7 +6,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Library/Application/AssemblyStatusAttribute.cs b/DNN Platform/Library/Application/AssemblyStatusAttribute.cs index 3b8989c6706..a36c460add3 100644 --- a/DNN Platform/Library/Application/AssemblyStatusAttribute.cs +++ b/DNN Platform/Library/Application/AssemblyStatusAttribute.cs @@ -21,19 +21,19 @@ namespace DotNetNuke.Application /// public enum ReleaseMode { - /// Not assigned + /// Not assigned. None = 0, - /// Alpha release + /// Alpha release. Alpha = 1, - /// Beta release + /// Beta release. Beta = 2, - /// Release candidate + /// Release candidate. RC = 3, - /// Stable release version + /// Stable release version. Stable = 4, } diff --git a/DNN Platform/Library/Common/Globals.cs b/DNN Platform/Library/Common/Globals.cs index 8a740fc1f6c..cd2d49f01d2 100644 --- a/DNN Platform/Library/Common/Globals.cs +++ b/DNN Platform/Library/Common/Globals.cs @@ -233,16 +233,16 @@ public sealed partial class Globals /// public enum PerformanceSettings { - /// No Caching + /// No Caching. NoCaching = 0, - /// Caching for a short time + /// Caching for a short time. LightCaching = 1, - /// Caching for moderate time + /// Caching for moderate time. ModerateCaching = 3, - /// Caching for a long time + /// Caching for a long time. HeavyCaching = 6, } @@ -260,7 +260,7 @@ public enum PerformanceSettings /// public enum PortalRegistrationType { - /// Disabled Registration + /// Disabled Registration. NoRegistration = 0, /// Account need be approved by portal's administrator. @@ -288,7 +288,7 @@ public enum UpgradeStatus /// The application occur error when running. Error = 3, - /// The application status is unknown, + /// The application status is unknown. /// This status should never be returned. its is only used as a flag that Status hasn't been determined. Unknown = 4, } diff --git a/DNN Platform/Library/Common/Utilities/PathUtils.cs b/DNN Platform/Library/Common/Utilities/PathUtils.cs index 7f15bdd8ae6..2ce9ff0bb27 100644 --- a/DNN Platform/Library/Common/Utilities/PathUtils.cs +++ b/DNN Platform/Library/Common/Utilities/PathUtils.cs @@ -208,7 +208,7 @@ internal static string GetUserFolderPathElement(int userId, UserFolderElement mo .Substring( userId.ToString("00").Length - SubfolderSeedLength, SubfolderSeedLength), - _ => string.Empty + _ => string.Empty, }; } diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj index 2bc8ef2370e..d961a4533df 100644 --- a/DNN Platform/Library/DotNetNuke.Library.csproj +++ b/DNN Platform/Library/DotNetNuke.Library.csproj @@ -1941,8 +1941,8 @@ - - + + $(MSBuildProjectDirectory)\..\.. diff --git a/DNN Platform/Library/Entities/Content/Taxonomy/VocabularyType.cs b/DNN Platform/Library/Entities/Content/Taxonomy/VocabularyType.cs index 2e1c30736f7..46415d4e9b6 100644 --- a/DNN Platform/Library/Entities/Content/Taxonomy/VocabularyType.cs +++ b/DNN Platform/Library/Entities/Content/Taxonomy/VocabularyType.cs @@ -7,7 +7,7 @@ namespace DotNetNuke.Entities.Content.Taxonomy /// Enumeration of VocabularyType. public enum VocabularyType { - /// Simple Vocabulary + /// Simple Vocabulary. Simple = 1, /// The Vocabulary can have parent or child nodes. diff --git a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteState.cs b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteState.cs index d35372fa27f..fb5c9ca4671 100644 --- a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteState.cs +++ b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteState.cs @@ -27,7 +27,7 @@ public void DoActionOnStateChanged(StateTransaction stateTransaction) /// public ActionMessage GetActionMessage(StateTransaction stateTransaction, WorkflowState currentState) - => new () + => new ActionMessage() { Subject = GetString($"{nameof(CompleteState)}{nameof(ActionMessage.Subject)}", "Page Approval"), Body = GetString($"{nameof(CompleteState)}{nameof(ActionMessage.Body)}", "Page '{0}' is in the '{1}' state and awaits review and approval.", GetTab(stateTransaction.ContentItemId).LocalizedTabName, currentState.StateName), diff --git a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteWorkflow.cs b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteWorkflow.cs index 928ba8d1d8d..6f05e1332f9 100644 --- a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteWorkflow.cs +++ b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/CompleteWorkflow.cs @@ -37,7 +37,7 @@ public void DoActionOnStateChanged(StateTransaction stateTransaction) /// public ActionMessage GetActionMessage(StateTransaction stateTransaction, WorkflowState currentState) - => new () + => new ActionMessage() { Subject = GetString($"{nameof(CompleteWorkflow)}{nameof(ActionMessage.Subject)}", "Page Published"), Body = GetString($"{nameof(CompleteWorkflow)}{nameof(ActionMessage.Body)}", "Page '{0}' has been published and is now live.", GetTab(stateTransaction.ContentItemId).LocalizedTabName), diff --git a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardState.cs b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardState.cs index a79b8dc4ba4..764855abd65 100644 --- a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardState.cs +++ b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardState.cs @@ -27,7 +27,7 @@ public void DoActionOnStateChanged(StateTransaction stateTransaction) /// public ActionMessage GetActionMessage(StateTransaction stateTransaction, WorkflowState currentState) - => new () + => new ActionMessage() { Subject = GetString($"{nameof(DiscardState)}{nameof(ActionMessage.Subject)}", "Page Rejected"), Body = GetString($"{nameof(DiscardState)}{nameof(ActionMessage.Body)}", "The edits for page '{0}' were rejected, and it is now in '{1}' state.", GetTab(stateTransaction.ContentItemId).LocalizedTabName, currentState.StateName), diff --git a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardWorkflow.cs b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardWorkflow.cs index 5330a99f34b..4f6006a9946 100644 --- a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardWorkflow.cs +++ b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/DiscardWorkflow.cs @@ -58,7 +58,7 @@ public void DoActionOnStateChanged(StateTransaction stateTransaction) /// public ActionMessage GetActionMessage(StateTransaction stateTransaction, WorkflowState currentState) - => new () + => new ActionMessage() { Subject = GetString($"{nameof(DiscardWorkflow)}{nameof(ActionMessage.Subject)}", "Page Discarded"), Body = GetString($"{nameof(DiscardWorkflow)}{nameof(ActionMessage.Body)}", "Edits for page '{0}' have been discarded.", GetTab(stateTransaction.ContentItemId).LocalizedTabName), diff --git a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/StartWorkflow.cs b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/StartWorkflow.cs index 8145acacc26..62265361d84 100644 --- a/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/StartWorkflow.cs +++ b/DNN Platform/Library/Entities/Content/Workflow/Actions/TabActions/StartWorkflow.cs @@ -25,7 +25,7 @@ public void DoActionOnStateChanged(StateTransaction stateTransaction) /// public ActionMessage GetActionMessage(StateTransaction stateTransaction, WorkflowState currentState) - => new () + => new ActionMessage() { Subject = GetString($"{nameof(StartWorkflow)}{nameof(ActionMessage.Subject)}", "Page Submitted"), Body = GetString($"{nameof(StartWorkflow)}{nameof(ActionMessage.Body)}", "Page '{0}' is in the '{1}' state and waiting to be submitted.", GetTab(stateTransaction.ContentItemId).LocalizedTabName, currentState.StateName), diff --git a/DNN Platform/Library/Entities/Content/Workflow/Repositories/WorkflowActionRepository.cs b/DNN Platform/Library/Entities/Content/Workflow/Repositories/WorkflowActionRepository.cs index 402e3c88f2e..1c7865e4271 100644 --- a/DNN Platform/Library/Entities/Content/Workflow/Repositories/WorkflowActionRepository.cs +++ b/DNN Platform/Library/Entities/Content/Workflow/Repositories/WorkflowActionRepository.cs @@ -2,41 +2,41 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information -namespace DotNetNuke.Entities.Content.Workflow.Repositories -{ +namespace DotNetNuke.Entities.Content.Workflow.Repositories +{ using System; - using System.Linq; + using System.Linq; - using DotNetNuke.Data; + using DotNetNuke.Data; using DotNetNuke.Entities.Content.Workflow.Actions; using DotNetNuke.Entities.Content.Workflow.Actions.TabActions; - using DotNetNuke.Framework; + using DotNetNuke.Framework; - internal class WorkflowActionRepository : ServiceLocator, IWorkflowActionRepository + internal class WorkflowActionRepository : ServiceLocator, IWorkflowActionRepository { /// - public WorkflowAction GetWorkflowAction(int contentTypeId, string type) - { + public WorkflowAction GetWorkflowAction(int contentTypeId, string type) + { using var context = DataContext.Instance(); var rep = context.GetRepository(); return rep.Find("WHERE ContentTypeId = @0 AND ActionType = @1", contentTypeId, type).SingleOrDefault() - ?? this.GetWorkflowActionsDefaultsOrNull(contentTypeId, type); // fallback to default action (not in db) + ?? this.GetWorkflowActionsDefaultsOrNull(contentTypeId, type); // fallback to default action (not in db) } /// - public void AddWorkflowAction(WorkflowAction action) - { - using (var context = DataContext.Instance()) - { - var rep = context.GetRepository(); - rep.Insert(action); - } + public void AddWorkflowAction(WorkflowAction action) + { + using (var context = DataContext.Instance()) + { + var rep = context.GetRepository(); + rep.Insert(action); + } } /// - protected override Func GetFactory() - { - return () => new WorkflowActionRepository(); + protected override Func GetFactory() + { + return () => new WorkflowActionRepository(); } private WorkflowAction GetWorkflowActionsDefaultsOrNull(int contentTypeId, string type) @@ -60,7 +60,7 @@ private WorkflowAction GetWorkflowActionsDefaultsOrNull(int contentTypeId, strin WorkflowActionTypes.DiscardState => typeof(DiscardState).AssemblyQualifiedName, WorkflowActionTypes.CompleteState => typeof(CompleteState).AssemblyQualifiedName, WorkflowActionTypes.StartWorkflow => typeof(StartWorkflow).AssemblyQualifiedName, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; return new WorkflowAction() @@ -70,6 +70,6 @@ private WorkflowAction GetWorkflowActionsDefaultsOrNull(int contentTypeId, strin ActionType = type, ActionSource = actionSource, }; - } - } -} + } + } +} diff --git a/DNN Platform/Library/Entities/Portals/Templates/IPortalTemplateIO.cs b/DNN Platform/Library/Entities/Portals/Templates/IPortalTemplateIO.cs index fcab6d9b89d..a1a837df131 100644 --- a/DNN Platform/Library/Entities/Portals/Templates/IPortalTemplateIO.cs +++ b/DNN Platform/Library/Entities/Portals/Templates/IPortalTemplateIO.cs @@ -1,27 +1,27 @@ -// 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 - -namespace DotNetNuke.Entities.Portals.Internal -{ - using System.Collections.Generic; +// 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 + +namespace DotNetNuke.Entities.Portals.Internal +{ + using System.Collections.Generic; using System.IO; - - using DotNetNuke.Internal.SourceGenerators; - - [DnnDeprecated(9, 11, 1, "No replacement")] - public partial interface IPortalTemplateIO - { - IEnumerable EnumerateTemplates(); - - IEnumerable EnumerateLanguageFiles(); - - string GetResourceFilePath(string templateFilePath); - - string GetLanguageFilePath(string templateFilePath, string cultureCode); - - TextReader OpenTextReader(string filePath); - - (string, List) GetTemplateLanguages(string templateFilePath); - } -} + + using DotNetNuke.Internal.SourceGenerators; + + [DnnDeprecated(9, 11, 1, "No replacement")] + public partial interface IPortalTemplateIO + { + IEnumerable EnumerateTemplates(); + + IEnumerable EnumerateLanguageFiles(); + + string GetResourceFilePath(string templateFilePath); + + string GetLanguageFilePath(string templateFilePath, string cultureCode); + + TextReader OpenTextReader(string filePath); + + (string DefaultLanguage, List Locales) GetTemplateLanguages(string templateFilePath); + } +} diff --git a/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateController.cs b/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateController.cs index 766d44f91c7..43ab830de2f 100644 --- a/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateController.cs +++ b/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateController.cs @@ -44,7 +44,7 @@ public void ApplyPortalTemplate(int portalId, IPortalTemplateInfo template, int } /// - public (bool success, string message) ExportPortalTemplate(int portalId, string fileName, string description, bool isMultiLanguage, IEnumerable locales, string localizationCulture, IEnumerable exportTabIds, bool includeContent, bool includeFiles, bool includeModules, bool includeProfile, bool includeRoles) + public (bool Success, string Message) ExportPortalTemplate(int portalId, string fileName, string description, bool isMultiLanguage, IEnumerable locales, string localizationCulture, IEnumerable exportTabIds, bool includeContent, bool includeFiles, bool includeModules, bool includeProfile, bool includeRoles) { var exporter = new PortalTemplateExporter(); return exporter.ExportPortalTemplate(this.businessControllerProvider, portalId, fileName, description, isMultiLanguage, locales, localizationCulture, exportTabIds, includeContent, includeFiles, includeModules, includeProfile, includeRoles); diff --git a/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateExporter.cs b/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateExporter.cs index 886fa7ed878..11e9a0e043e 100644 --- a/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateExporter.cs +++ b/DNN Platform/Library/Entities/Portals/Templates/PortalTemplateExporter.cs @@ -33,7 +33,7 @@ internal class PortalTemplateExporter { private string LocalResourcesFile => Path.Combine("~/DesktopModules/admin/Dnn.PersonaBar/Modules/Dnn.Sites/App_LocalResources/Sites.resx"); - internal (bool success, string message) ExportPortalTemplate(IBusinessControllerProvider businessControllerProvider, int portalId, string fileName, string description, bool isMultiLanguage, IEnumerable locales, string localizationCulture, IEnumerable exportTabIds, bool includeContent, bool includeFiles, bool includeModules, bool includeProfile, bool includeRoles) + internal (bool Success, string Message) ExportPortalTemplate(IBusinessControllerProvider businessControllerProvider, int portalId, string fileName, string description, bool isMultiLanguage, IEnumerable locales, string localizationCulture, IEnumerable exportTabIds, bool includeContent, bool includeFiles, bool includeModules, bool includeProfile, bool includeRoles) { if (!exportTabIds.Any()) { diff --git a/DNN Platform/Library/Entities/Tabs/TabVersions/TabVersionBuilder.cs b/DNN Platform/Library/Entities/Tabs/TabVersions/TabVersionBuilder.cs index 410aacce31c..dae5dbcbeb6 100644 --- a/DNN Platform/Library/Entities/Tabs/TabVersions/TabVersionBuilder.cs +++ b/DNN Platform/Library/Entities/Tabs/TabVersions/TabVersionBuilder.cs @@ -857,7 +857,8 @@ private void CreateFirstTabVersion(int tabId, TabInfo tab, IEnumerableDefaultRelationshipType defined in system. public enum DefaultRelationshipTypes { - /// Friends Relationship Type + /// Friends Relationship Type. Friends = 1, - /// Followers Relationship Type + /// Followers Relationship Type. Followers = 2, - /// A user-owned custom-list, e.g. my best friends + /// A user-owned custom-list, e.g. my best friends. CustomList = 3, } } diff --git a/DNN Platform/Library/Entities/Users/Social/RelationshipStatus.cs b/DNN Platform/Library/Entities/Users/Social/RelationshipStatus.cs index ade5c1fb365..f633509d5fa 100644 --- a/DNN Platform/Library/Entities/Users/Social/RelationshipStatus.cs +++ b/DNN Platform/Library/Entities/Users/Social/RelationshipStatus.cs @@ -9,7 +9,7 @@ namespace DotNetNuke.Entities.Users.Social /// The RelationshipStatus enum describes various UserRelationship statuses. E.g. Accepted, Pending. public enum RelationshipStatus { - /// Relationship Request is not present (lack of any other status) + /// Relationship Request is not present (lack of any other status). None = 0, /// Relationship Request is Initiated. E.g. User 1 sent a friend request to User 2. diff --git a/DNN Platform/Library/Framework/JavaScriptLibraries/SpecificVersion.cs b/DNN Platform/Library/Framework/JavaScriptLibraries/SpecificVersion.cs index 07c9a030b15..49a1eafa513 100644 --- a/DNN Platform/Library/Framework/JavaScriptLibraries/SpecificVersion.cs +++ b/DNN Platform/Library/Framework/JavaScriptLibraries/SpecificVersion.cs @@ -7,16 +7,16 @@ namespace DotNetNuke.Framework.JavaScriptLibraries /// determine which version of a script is to be used. public enum SpecificVersion { - /// The most recent version + /// The most recent version. Latest = 0, - /// Match the major version + /// Match the major version. LatestMajor = 1, - /// Match the major and minor versions + /// Match the major and minor versions. LatestMinor = 2, - /// Match version exactly + /// Match version exactly. Exact = 3, } } diff --git a/DNN Platform/Library/Security/Permissions/AdvancedPermissionProvider.cs b/DNN Platform/Library/Security/Permissions/AdvancedPermissionProvider.cs index 3eba8964266..1657670ee66 100644 --- a/DNN Platform/Library/Security/Permissions/AdvancedPermissionProvider.cs +++ b/DNN Platform/Library/Security/Permissions/AdvancedPermissionProvider.cs @@ -187,7 +187,7 @@ public override bool HasModuleAccess(SecurityAccessLevel accessLevel, string per return accessLevel switch { SecurityAccessLevel.Admin or SecurityAccessLevel.Host => hasModuleAccess, - _ => this.ForAdvancedRoles(moduleConfiguration) | hasModuleAccess + _ => this.ForAdvancedRoles(moduleConfiguration) | hasModuleAccess, }; } diff --git a/DNN Platform/Library/Security/Roles/DNNRoleProvider.cs b/DNN Platform/Library/Security/Roles/DNNRoleProvider.cs index 1a043ba4340..9ee184ab1d8 100644 --- a/DNN Platform/Library/Security/Roles/DNNRoleProvider.cs +++ b/DNN Platform/Library/Security/Roles/DNNRoleProvider.cs @@ -81,11 +81,11 @@ public override void DeleteRole(RoleInfo role) /// An ArrayList of RoleInfo objects. public override ArrayList GetRoles(int portalId) { - var arrRoles = CBO.FillCollection( + return CBO.FillCollection( portalId == Null.NullInteger - ? this.dataProvider.GetRoles() - : this.dataProvider.GetPortalRoles(portalId), typeof(RoleInfo)); - return arrRoles; + ? this.dataProvider.GetRoles() + : this.dataProvider.GetPortalRoles(portalId), + typeof(RoleInfo)); } /// diff --git a/DNN Platform/Library/Services/FileSystem/FileManager.cs b/DNN Platform/Library/Services/FileSystem/FileManager.cs index 981d0bb98b6..f26926b4c2f 100644 --- a/DNN Platform/Library/Services/FileSystem/FileManager.cs +++ b/DNN Platform/Library/Services/FileSystem/FileManager.cs @@ -1749,7 +1749,8 @@ private void CheckFileAddingRestrictions(IFolderInfo folder, string fileName, bo string.Format( Localization.GetExceptionMessage( "AddFileExtensionNotAllowed", - "The extension '{0}' is not allowed. The file has not been added."), Path.GetExtension(fileName))); + "The extension '{0}' is not allowed. The file has not been added."), + Path.GetExtension(fileName))); } if (!this.IsValidFilename(fileName)) @@ -1758,7 +1759,8 @@ private void CheckFileAddingRestrictions(IFolderInfo folder, string fileName, bo string.Format( Localization.GetExceptionMessage( "AddFilenameNotAllowed", - "The file name '{0}' is not allowed. The file has not been added."), fileName)); + "The file name '{0}' is not allowed. The file has not been added."), + fileName)); } } diff --git a/DNN Platform/Library/Services/GeneratedImage/ImageResizeMode.cs b/DNN Platform/Library/Services/GeneratedImage/ImageResizeMode.cs index ed0cee39cc5..9fc8bdad8e5 100644 --- a/DNN Platform/Library/Services/GeneratedImage/ImageResizeMode.cs +++ b/DNN Platform/Library/Services/GeneratedImage/ImageResizeMode.cs @@ -24,7 +24,7 @@ public enum ImageResizeMode /// /// Resizes the image with the given width or height and maintains the aspect ratio. The image will be centered in a - /// square area of the chosen background color + /// square area of the chosen background color. /// FitSquare = 3, } diff --git a/DNN Platform/Library/Services/Localization/CultureDropDownTypes.cs b/DNN Platform/Library/Services/Localization/CultureDropDownTypes.cs index e8ccc8f6016..6ed16d748da 100644 --- a/DNN Platform/Library/Services/Localization/CultureDropDownTypes.cs +++ b/DNN Platform/Library/Services/Localization/CultureDropDownTypes.cs @@ -12,25 +12,25 @@ namespace DotNetNuke.Services.Localization [Serializable] public enum CultureDropDownTypes { - /// Displays the culture name in the format "<languagefull> (<country/regionfull>) in the .NET Framework language + /// Displays the culture name in the format "<languagefull> (<country/regionfull>) in the .NET Framework language. DisplayName = 0, - /// Displays the culture name in the format "<languagefull> (<country/regionfull>) in English + /// Displays the culture name in the format "<languagefull> (<country/regionfull>) in English. EnglishName = 1, - /// Displays the culture identifier + /// Displays the culture identifier. Lcid = 2, - /// Displays the culture name in the format "<languagecode2> (<country/regioncode2>) + /// Displays the culture name in the format "<languagecode2> (<country/regioncode2>). Name = 3, - /// Displays the culture name in the format "<languagefull> (<country/regionfull>) in the language that the culture is set to display + /// Displays the culture name in the format "<languagefull> (<country/regionfull>) in the language that the culture is set to display. NativeName = 4, - /// Displays the IS0 639-1 two letter code + /// Displays the IS0 639-1 two letter code. TwoLetterIsoCode = 5, - /// Displays the ISO 629-2 three letter code "<languagefull> (<country/regionfull>) + /// Displays the ISO 629-2 three letter code "<languagefull> (<country/regionfull>). ThreeLetterIsoCode = 6, } } diff --git a/DNN Platform/Library/Services/Mail/CoreMailProvider.cs b/DNN Platform/Library/Services/Mail/CoreMailProvider.cs index d923ba8c128..4242a9e15a4 100644 --- a/DNN Platform/Library/Services/Mail/CoreMailProvider.cs +++ b/DNN Platform/Library/Services/Mail/CoreMailProvider.cs @@ -226,7 +226,7 @@ private static MailMessage CreateMailMessage(MailInfo mailInfo, SmtpInfo smtpInf return mailMessage; } - private static (string host, int? port, string errorMessage) ParseSmtpServer(ref SmtpInfo smtpInfo) + private static (string Host, int? Port, string ErrorMessage) ParseSmtpServer(ref SmtpInfo smtpInfo) { var errorMessage = ValidateSmtpInfo(smtpInfo); if (errorMessage != null) diff --git a/DNN Platform/Library/Services/Mail/MailKitMailProvider.cs b/DNN Platform/Library/Services/Mail/MailKitMailProvider.cs index 36e666630e5..7aa65ded0d5 100644 --- a/DNN Platform/Library/Services/Mail/MailKitMailProvider.cs +++ b/DNN Platform/Library/Services/Mail/MailKitMailProvider.cs @@ -128,7 +128,7 @@ public override string SendMail(MailInfo mailInfo, SmtpInfo smtpInfo = null) } } - private static (string host, int port, string errorMessage) ParseSmtpServer(ref SmtpInfo smtpInfo) + private static (string Host, int Port, string ErrorMessage) ParseSmtpServer(ref SmtpInfo smtpInfo) { var port = 25; if (smtpInfo == null || string.IsNullOrEmpty(smtpInfo.Server)) @@ -321,7 +321,7 @@ private static MessagePriority ToMessagePriority(MailPriority priority) } } - private (ISmtpOAuthProvider, int) GetOAuthProvider(SmtpClient smtpClient, SmtpInfo smtpInfo) + private (ISmtpOAuthProvider AuthProvider, int PortalId) GetOAuthProvider(SmtpClient smtpClient, SmtpInfo smtpInfo) { var usingOAuth = smtpInfo.Authentication == "3"; if (usingOAuth) diff --git a/DNN Platform/Library/Services/Mobile/RedirectionType.cs b/DNN Platform/Library/Services/Mobile/RedirectionType.cs index e7d2f517679..d6d95b13811 100644 --- a/DNN Platform/Library/Services/Mobile/RedirectionType.cs +++ b/DNN Platform/Library/Services/Mobile/RedirectionType.cs @@ -5,19 +5,19 @@ namespace DotNetNuke.Services.Mobile { public enum RedirectionType { - /// Redirect when request from a mobile phone + /// Redirect when request from a mobile phone. MobilePhone = 1, - /// Redirect when request from a tablet + /// Redirect when request from a tablet. Tablet = 2, - /// Redirect when request from either a mobile phone or a tablet + /// Redirect when request from either a mobile phone or a tablet. AllMobile = 3, - /// Redirect when request from some unknown device, should be determine by match rules; + /// Redirect when request from some unknown device, should be determine by match rules. Other = 4, - /// Redirect when request from a smart phone + /// Redirect when request from a smart phone. SmartPhone = 5, } } diff --git a/DNN Platform/Library/Services/Mobile/TargetType.cs b/DNN Platform/Library/Services/Mobile/TargetType.cs index 7bd9998ecba..42d39fede20 100644 --- a/DNN Platform/Library/Services/Mobile/TargetType.cs +++ b/DNN Platform/Library/Services/Mobile/TargetType.cs @@ -5,13 +5,13 @@ namespace DotNetNuke.Services.Mobile { public enum TargetType { - /// Redirect when request from a mobile + /// Redirect when request from a mobile. Portal = 1, - /// Redirect when request from a tablet + /// Redirect when request from a tablet. Tab = 2, - /// Redirect when request from some unknown device, should be determine by match rules; + /// Redirect when request from some unknown device, should be determine by match rules. Url = 3, } } diff --git a/DNN Platform/Library/Services/Search/Controllers/SearchControllerImpl.cs b/DNN Platform/Library/Services/Search/Controllers/SearchControllerImpl.cs index f6d0c5394db..86b74b0e536 100644 --- a/DNN Platform/Library/Services/Search/Controllers/SearchControllerImpl.cs +++ b/DNN Platform/Library/Services/Search/Controllers/SearchControllerImpl.cs @@ -324,9 +324,8 @@ private Tuple> GetResults(SearchQuery searchQuery) foreach (var kvp in searchQuery.CustomKeywords) { - query.Add( - new TermQuery(new Term( - SearchHelper.Instance.StripTagsNoAttributes(Constants.KeywordsPrefixTag + kvp.Key, true), kvp.Value)), Occur.MUST); + var field = SearchHelper.Instance.StripTagsNoAttributes(Constants.KeywordsPrefixTag + kvp.Key, true); + query.Add(new TermQuery(new Term(field, kvp.Value)), Occur.MUST); } foreach (var kvp in searchQuery.NumericKeys) diff --git a/DNN Platform/Library/Services/Search/Entities/SortDirections.cs b/DNN Platform/Library/Services/Search/Entities/SortDirections.cs index 3bf92793e00..eb1fd2d490a 100644 --- a/DNN Platform/Library/Services/Search/Entities/SortDirections.cs +++ b/DNN Platform/Library/Services/Search/Entities/SortDirections.cs @@ -8,10 +8,10 @@ namespace DotNetNuke.Services.Search.Entities /// Does not apply when SortFields.Relevance is specified in SearchQuery.SortField. public enum SortDirections { - /// Sort by descending [default] order + /// Sort by descending [default] order. Descending = 0, - /// Sort by ascending order + /// Sort by ascending order. Ascending = 1, } } diff --git a/DNN Platform/Library/Services/Search/Entities/SortFields.cs b/DNN Platform/Library/Services/Search/Entities/SortFields.cs index 8fd9137e8f4..bb36a10ff32 100644 --- a/DNN Platform/Library/Services/Search/Entities/SortFields.cs +++ b/DNN Platform/Library/Services/Search/Entities/SortFields.cs @@ -10,7 +10,7 @@ public enum SortFields /// Sort by Relevance [default]. Most relevant come first, SortDirection is ignored. Relevance = 0, - /// Sort by DateTime Modified. Latest come first + /// Sort by DateTime Modified. Latest come first. LastModified = 1, /// Sort by Title. @@ -19,18 +19,18 @@ public enum SortFields /// Sort by Tag. Tag = 3, - /// Sort by NumericKey (as specified in SearchDocument while indexing). The NumericKeys key-name should be specified in SearchQuery.CustomSortField + /// Sort by NumericKey (as specified in SearchDocument while indexing). The NumericKeys key-name should be specified in SearchQuery.CustomSortField. NumericKey = 4, - /// Sort by Keywords (as specified in SearchDocument while indexing). The Keywords key-name should be specified in SearchQuery.CustomSortField + /// Sort by Keywords (as specified in SearchDocument while indexing). The Keywords key-name should be specified in SearchQuery.CustomSortField. Keyword = 5, - /// Specify custom numeric field for sorting. Field name should be specified in SearchQuery.CustomSortField - /// This option should be used when you can't any of the previous options, e.g. AuthorUserId (authorid) or TabId (tab) + /// Specify custom numeric field for sorting. Field name should be specified in SearchQuery.CustomSortField. + /// This option should be used when you can't any of the previous options, e.g. AuthorUserId (authorid) or TabId (tab). CustomNumericField = 6, - /// Specify custom string filed for sorting. Field name should be specified in SearchQuery.CustomSortField - /// This option should be used when you can't any of the previous options, e.g. authorname or UniqueKey (key) + /// Specify custom string filed for sorting. Field name should be specified in SearchQuery.CustomSortField. + /// This option should be used when you can't any of the previous options, e.g. authorname or UniqueKey (key). CustomStringField = 7, } } diff --git a/DNN Platform/Library/Services/Search/Internals/SearchQueryAnalyzer.cs b/DNN Platform/Library/Services/Search/Internals/SearchQueryAnalyzer.cs index 0848b0751ac..c9625fc179c 100644 --- a/DNN Platform/Library/Services/Search/Internals/SearchQueryAnalyzer.cs +++ b/DNN Platform/Library/Services/Search/Internals/SearchQueryAnalyzer.cs @@ -28,7 +28,7 @@ public override TokenStream TokenStream(string fieldName, TextReader reader) // Note: the order of filtering is important for both operation and performane, so we try to make it work faster // Also, note that filters are applied from the innermost outwards. var filter = - new ASCIIFoldingFilter( // accents filter + new ASCIIFoldingFilter(// accents filter new LowerCaseFilter( new LengthFilter( new StandardFilter( diff --git a/DNN Platform/Library/Services/Search/Internals/SynonymAnalyzer.cs b/DNN Platform/Library/Services/Search/Internals/SynonymAnalyzer.cs index f147545eeb0..5326a9e06c2 100644 --- a/DNN Platform/Library/Services/Search/Internals/SynonymAnalyzer.cs +++ b/DNN Platform/Library/Services/Search/Internals/SynonymAnalyzer.cs @@ -28,8 +28,8 @@ public override TokenStream TokenStream(string fieldName, TextReader reader) // According to Lucene's documentaiton the StopFilter performs a case-sensitive lookup of each token in a set of stop // words. It relies on being fed already lowercased tokens. Therefore, DO NOT reverse the order of these filters. return - new PorterStemFilter( // stemming filter - new ASCIIFoldingFilter( // accents filter + new PorterStemFilter(// stemming filter + new ASCIIFoldingFilter(// accents filter new SynonymFilter( new StopFilter( true, diff --git a/DNN Platform/Library/Services/Social/Messaging/MessageArchivedStatus.cs b/DNN Platform/Library/Services/Social/Messaging/MessageArchivedStatus.cs index 1fbc75f8c32..5b5c3a784f8 100644 --- a/DNN Platform/Library/Services/Social/Messaging/MessageArchivedStatus.cs +++ b/DNN Platform/Library/Services/Social/Messaging/MessageArchivedStatus.cs @@ -6,13 +6,13 @@ namespace DotNetNuke.Services.Social.Messaging /// Archived Status of a Message. public enum MessageArchivedStatus { - /// Archived Message Status + /// Archived Message Status. Archived = 1, - /// UnArchived Message Status + /// UnArchived Message Status. UnArchived = 0, - /// Any Message Status - Both Archived and UnArchived + /// Any Message Status - Both Archived and UnArchived. Any = -1, } } diff --git a/DNN Platform/Library/Services/Social/Messaging/MessageReadStatus.cs b/DNN Platform/Library/Services/Social/Messaging/MessageReadStatus.cs index 3a6714f0436..61cf3e18361 100644 --- a/DNN Platform/Library/Services/Social/Messaging/MessageReadStatus.cs +++ b/DNN Platform/Library/Services/Social/Messaging/MessageReadStatus.cs @@ -6,13 +6,13 @@ namespace DotNetNuke.Services.Social.Messaging /// Read Status of a Message. public enum MessageReadStatus { - /// Read Message Status + /// Read Message Status. Read = 1, - /// UnRead Message Status + /// UnRead Message Status. UnRead = 0, - /// Any Message Status - Both Read and UnRead + /// Any Message Status - Both Read and UnRead. Any = -1, } } diff --git a/DNN Platform/Library/Services/Social/Messaging/MessageSentStatus.cs b/DNN Platform/Library/Services/Social/Messaging/MessageSentStatus.cs index 535508410b5..8a9e2d33674 100644 --- a/DNN Platform/Library/Services/Social/Messaging/MessageSentStatus.cs +++ b/DNN Platform/Library/Services/Social/Messaging/MessageSentStatus.cs @@ -6,13 +6,13 @@ namespace DotNetNuke.Services.Social.Messaging /// Sent Status of a Message - Is this a Sent Message or a Received Message. public enum MessageSentStatus { - /// This Message was Received + /// This Message was Received. Received = 1, - /// This Message was Sent + /// This Message was Sent. Sent = 0, - /// Any Message Status - Both Sent and Received + /// Any Message Status - Both Sent and Received. Any = -1, } } diff --git a/DNN Platform/Library/Services/Tokens/CacheLevel.cs b/DNN Platform/Library/Services/Tokens/CacheLevel.cs index 2191e0fa0d0..2d2d099f51a 100644 --- a/DNN Platform/Library/Services/Tokens/CacheLevel.cs +++ b/DNN Platform/Library/Services/Tokens/CacheLevel.cs @@ -12,19 +12,19 @@ namespace DotNetNuke.Services.Tokens /// public enum CacheLevel : byte { - /// Caching of the text is not suitable and might expose security risks + /// Caching of the text is not suitable and might expose security risks. [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:ElementMustBeginWithUpperCaseLetter", Justification = "Breaking Change")] // ReSharper disable once InconsistentNaming notCacheable = 0, - /// Caching of the text might result in inaccurate display (e.g. time), but does not expose a security risk + /// Caching of the text might result in inaccurate display (e.g. time), but does not expose a security risk. [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:ElementMustBeginWithUpperCaseLetter", Justification = "Breaking Change")] // ReSharper disable once InconsistentNaming secureforCaching = 5, - /// Caching of the text can be done without limitations or any risk + /// Caching of the text can be done without limitations or any risk. [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:ElementMustBeginWithUpperCaseLetter", Justification = "Breaking Change")] // ReSharper disable once InconsistentNaming diff --git a/DNN Platform/Library/Services/Tokens/Scope.cs b/DNN Platform/Library/Services/Tokens/Scope.cs index ea3674938c9..cd87a777865 100644 --- a/DNN Platform/Library/Services/Tokens/Scope.cs +++ b/DNN Platform/Library/Services/Tokens/Scope.cs @@ -12,19 +12,19 @@ namespace DotNetNuke.Services.Tokens /// public enum Scope { - /// Only access to Date and Time + /// Only access to Date and Time. NoSettings = 0, - /// Tokens for Host, Portal, Tab (, Module), user name + /// Tokens for Host, Portal, Tab (, Module), user name. Configuration = 1, - /// Configuration, Current User data and user data allowed for registered members + /// Configuration, Current User data and user data allowed for registered members. DefaultSettings = 2, - /// System notifications to users and adminstrators + /// System notifications to users and adminstrators. SystemMessages = 3, - /// internal debugging, error messages, logs + /// internal debugging, error messages, logs. Debug = 4, } } diff --git a/DNN Platform/Library/UI/Modules/ProfileModuleUserControlBase.cs b/DNN Platform/Library/UI/Modules/ProfileModuleUserControlBase.cs index a31a07cfd73..3276e417116 100644 --- a/DNN Platform/Library/UI/Modules/ProfileModuleUserControlBase.cs +++ b/DNN Platform/Library/UI/Modules/ProfileModuleUserControlBase.cs @@ -62,10 +62,10 @@ protected override void OnInit(EventArgs e) try { // Clicked on breadcrumb - don't know which user - this.Response.Redirect( - this.Request.IsAuthenticated - ? this.NavigationManager.NavigateURL(this.ModuleContext.PortalSettings.ActiveTab.TabID, string.Empty, "UserId=" + this.ModuleContext.PortalSettings.UserId.ToString(CultureInfo.InvariantCulture)) - : this.GetRedirectUrl(), true); + var redirectUrl = this.Request.IsAuthenticated + ? this.NavigationManager.NavigateURL(this.ModuleContext.PortalSettings.ActiveTab.TabID, string.Empty, "UserId=" + this.ModuleContext.PortalSettings.UserId.ToString(CultureInfo.InvariantCulture)) + : this.GetRedirectUrl(); + this.Response.Redirect(redirectUrl, true); } catch (ThreadAbortException) { diff --git a/DNN Platform/Library/packages.config b/DNN Platform/Library/packages.config index c986ff3e7d1..bbbab94b5ca 100644 --- a/DNN Platform/Library/packages.config +++ b/DNN Platform/Library/packages.config @@ -21,7 +21,8 @@ - + + diff --git a/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj b/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj index d42a6216e3f..3c35923e7a7 100644 --- a/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj +++ b/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj @@ -210,8 +210,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/CoreMessaging/packages.config b/DNN Platform/Modules/CoreMessaging/packages.config index fc980b101fe..1e2c076b015 100644 --- a/DNN Platform/Modules/CoreMessaging/packages.config +++ b/DNN Platform/Modules/CoreMessaging/packages.config @@ -6,7 +6,8 @@ - + + diff --git a/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj b/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj index b89a89c5873..43d7d737af3 100644 --- a/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj +++ b/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj @@ -258,8 +258,8 @@ - - + + diff --git a/DNN Platform/Modules/DDRMenu/packages.config b/DNN Platform/Modules/DDRMenu/packages.config index 2ae2e719596..35fe35b1895 100644 --- a/DNN Platform/Modules/DDRMenu/packages.config +++ b/DNN Platform/Modules/DDRMenu/packages.config @@ -6,7 +6,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs b/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs index 7e54565780b..d1df121858a 100644 --- a/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs +++ b/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs @@ -1890,7 +1890,8 @@ private int ExportModulePackage(ExportModule exportModule) Version = package.Version, PackageType = package.PackageType, PackageFileName = InstallerUtil.GetPackageBackupName(package), - }, null); + }, + null); this.exportedModuleDefinitions.Add(exportModule.ModuleDefID); return 1; diff --git a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj index 14fec9fe7cd..8130fecd15c 100644 --- a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj +++ b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj @@ -227,8 +227,8 @@ - - + + diff --git a/DNN Platform/Modules/DnnExportImport/packages.config b/DNN Platform/Modules/DnnExportImport/packages.config index 7dca6a1e830..0e484d53d8e 100644 --- a/DNN Platform/Modules/DnnExportImport/packages.config +++ b/DNN Platform/Modules/DnnExportImport/packages.config @@ -10,7 +10,8 @@ - + + diff --git a/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj b/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj index 7036c5cb69b..162b103c66d 100644 --- a/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj +++ b/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj @@ -113,8 +113,8 @@ - - + + diff --git a/DNN Platform/Modules/DnnExportImportLibrary/packages.config b/DNN Platform/Modules/DnnExportImportLibrary/packages.config index 338504cfb70..427157c1990 100644 --- a/DNN Platform/Modules/DnnExportImportLibrary/packages.config +++ b/DNN Platform/Modules/DnnExportImportLibrary/packages.config @@ -4,6 +4,7 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj b/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj index 3dc69a69633..1356ad0569b 100644 --- a/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj +++ b/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj @@ -288,8 +288,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/Groups/packages.config b/DNN Platform/Modules/Groups/packages.config index 02b9ac0fd7c..d5cbd267e58 100644 --- a/DNN Platform/Modules/Groups/packages.config +++ b/DNN Platform/Modules/Groups/packages.config @@ -9,7 +9,8 @@ - + + diff --git a/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj b/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj index 4512adaed63..e91d786e37e 100644 --- a/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj +++ b/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj @@ -273,8 +273,8 @@ - - + + \ No newline at end of file diff --git a/DNN Platform/Modules/HTML/packages.config b/DNN Platform/Modules/HTML/packages.config index cd13450a8cc..0e16679d953 100644 --- a/DNN Platform/Modules/HTML/packages.config +++ b/DNN Platform/Modules/HTML/packages.config @@ -3,7 +3,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Modules/HtmlEditorManager/DotNetNuke.Modules.HtmlEditorManager.csproj b/DNN Platform/Modules/HtmlEditorManager/DotNetNuke.Modules.HtmlEditorManager.csproj index 9369ace4de9..0692508bec4 100644 --- a/DNN Platform/Modules/HtmlEditorManager/DotNetNuke.Modules.HtmlEditorManager.csproj +++ b/DNN Platform/Modules/HtmlEditorManager/DotNetNuke.Modules.HtmlEditorManager.csproj @@ -175,8 +175,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/HtmlEditorManager/packages.config b/DNN Platform/Modules/HtmlEditorManager/packages.config index 6e8262155e8..94fcd56fefa 100644 --- a/DNN Platform/Modules/HtmlEditorManager/packages.config +++ b/DNN Platform/Modules/HtmlEditorManager/packages.config @@ -1,5 +1,6 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj b/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj index 8f0d1d3762f..0c17135f04d 100644 --- a/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj +++ b/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj @@ -278,8 +278,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/Journal/packages.config b/DNN Platform/Modules/Journal/packages.config index 02b9ac0fd7c..d5cbd267e58 100644 --- a/DNN Platform/Modules/Journal/packages.config +++ b/DNN Platform/Modules/Journal/packages.config @@ -9,7 +9,8 @@ - + + diff --git a/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj b/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj index 8e17ec32a2e..8e8f41bb9e9 100644 --- a/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj +++ b/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj @@ -213,8 +213,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/MemberDirectory/packages.config b/DNN Platform/Modules/MemberDirectory/packages.config index 00850042f41..d097507d314 100644 --- a/DNN Platform/Modules/MemberDirectory/packages.config +++ b/DNN Platform/Modules/MemberDirectory/packages.config @@ -6,7 +6,8 @@ - + + diff --git a/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj b/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj index 09fe61a9254..1a96c4cf6c0 100644 --- a/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj +++ b/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj @@ -245,8 +245,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/RazorHost/packages.config b/DNN Platform/Modules/RazorHost/packages.config index cd13450a8cc..0e16679d953 100644 --- a/DNN Platform/Modules/RazorHost/packages.config +++ b/DNN Platform/Modules/RazorHost/packages.config @@ -3,7 +3,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj b/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj index 9fcb42637c5..a4ac6d41abf 100644 --- a/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj +++ b/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj @@ -288,8 +288,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/ResourceManager/packages.config b/DNN Platform/Modules/ResourceManager/packages.config index 24b7bff3e67..d79f1480a64 100644 --- a/DNN Platform/Modules/ResourceManager/packages.config +++ b/DNN Platform/Modules/ResourceManager/packages.config @@ -7,7 +7,8 @@ - + + diff --git a/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj b/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj index 25f46d22af6..0da5c7dc7ad 100644 --- a/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj +++ b/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj @@ -148,8 +148,8 @@ - - + + 10.0 diff --git a/DNN Platform/Modules/TelerikRemoval/packages.config b/DNN Platform/Modules/TelerikRemoval/packages.config index 0f83dec7116..c4ee90a2df6 100644 --- a/DNN Platform/Modules/TelerikRemoval/packages.config +++ b/DNN Platform/Modules/TelerikRemoval/packages.config @@ -3,7 +3,8 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/DotNetNuke.Authentication.Facebook.csproj b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/DotNetNuke.Authentication.Facebook.csproj index 0efcd4c888e..02165e34f84 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/DotNetNuke.Authentication.Facebook.csproj +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/DotNetNuke.Authentication.Facebook.csproj @@ -140,8 +140,8 @@ - - + + 10.0 diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/packages.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/packages.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/DotNetNuke.Authentication.Google.csproj b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/DotNetNuke.Authentication.Google.csproj index c30e507b6ff..3d501cd22e4 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/DotNetNuke.Authentication.Google.csproj +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/DotNetNuke.Authentication.Google.csproj @@ -135,8 +135,8 @@ - - + + 10.0 diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/packages.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/packages.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/DotNetNuke.Authentication.LiveConnect.csproj b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/DotNetNuke.Authentication.LiveConnect.csproj index 11ce62baca5..82ea61d6858 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/DotNetNuke.Authentication.LiveConnect.csproj +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/DotNetNuke.Authentication.LiveConnect.csproj @@ -133,8 +133,8 @@ - - + + 10.0 diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/packages.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/packages.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/DotNetNuke.Authentication.Twitter.csproj b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/DotNetNuke.Authentication.Twitter.csproj index 0a5c74f07fd..70989f4ed25 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/DotNetNuke.Authentication.Twitter.csproj +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/DotNetNuke.Authentication.Twitter.csproj @@ -136,8 +136,8 @@ - - + + 10.0 diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/packages.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/packages.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider.csproj b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider.csproj index 9df9886d08a..83b595140b5 100644 --- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider.csproj +++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider.csproj @@ -84,8 +84,8 @@ - - + + diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/packages.config b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/packages.config +++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/DotNetNuke.Providers.AspNetCCP.csproj b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/DotNetNuke.Providers.AspNetCCP.csproj index 17cd83af692..a658559ba09 100644 --- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/DotNetNuke.Providers.AspNetCCP.csproj +++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/DotNetNuke.Providers.AspNetCCP.csproj @@ -138,8 +138,8 @@ - - + + diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/packages.config b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/packages.config +++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj b/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj index 29ad3008e15..e77ecd721d6 100644 --- a/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj +++ b/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj @@ -145,8 +145,8 @@ - - + + diff --git a/DNN Platform/Providers/FolderProviders/packages.config b/DNN Platform/Providers/FolderProviders/packages.config index 930d5480836..8afaefa498c 100644 --- a/DNN Platform/Providers/FolderProviders/packages.config +++ b/DNN Platform/Providers/FolderProviders/packages.config @@ -3,5 +3,6 @@ - + + \ No newline at end of file diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/BrowserType.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/BrowserType.cs index c743d0799f8..d103eeca07d 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/BrowserType.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/BrowserType.cs @@ -13,7 +13,7 @@ public enum BrowserType /// The standard browser. StandardBrowser = 1, - /// ckfinder browser + /// ckfinder browser. CKFinder = 2, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/EnterModus.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/EnterModus.cs index 9186303dc30..017c5120000 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/EnterModus.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/EnterModus.cs @@ -7,13 +7,13 @@ namespace DNNConnect.CKEditorProvider.Constants /// The Enter Modes. public enum EnterModus { - /// EnterMode p + /// EnterMode p. P = 0, - /// EnterMode br + /// EnterMode br. BR = 1, - /// EnterMode div + /// EnterMode div. DIV = 2, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/FileListView.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/FileListView.cs index 6c6809edf42..d4c0ff5eebf 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/FileListView.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/FileListView.cs @@ -7,13 +7,13 @@ namespace DNNConnect.CKEditorProvider.Constants /// File List View Mode. public enum FileListView { - /// List View Type Detail View + /// List View Type Detail View. DetailView = 0, - /// List View Type List View + /// List View Type List View. ListView = 1, - /// List View Type Icons View + /// List View Type Icons View. IconsView = 2, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ImageButtonType.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ImageButtonType.cs index d8890e2f35c..33d5ad303a2 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ImageButtonType.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ImageButtonType.cs @@ -10,7 +10,7 @@ public enum ImageButtonType /// The standard button. StandardButton = 0, - /// easy image button + /// easy image button. EasyImageButton = 1, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LanguageDirection.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LanguageDirection.cs index 23d32b3104b..82a81b9d4f2 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LanguageDirection.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LanguageDirection.cs @@ -7,13 +7,13 @@ namespace DNNConnect.CKEditorProvider.Constants /// The Language Direction. public enum LanguageDirection { - /// Indicate content direction will be the same with either the editor UI direction or page element direction depending on the creators + /// Indicate content direction will be the same with either the editor UI direction or page element direction depending on the creators. Inherit = 0, - /// Language Direction Left to Right + /// Language Direction Left to Right. LeftToRight = 1, - /// Language Direction Right to Left + /// Language Direction Right to Left. RightToLeft = 2, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkMode.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkMode.cs index 372129a6fff..2c5ca5ccb18 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkMode.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkMode.cs @@ -7,16 +7,16 @@ namespace DNNConnect.CKEditorProvider.Constants /// File Browser Link Modes. public enum LinkMode { - /// Relative URL + /// Relative URL. RelativeURL = 0, - /// Absolute URL + /// Absolute URL. AbsoluteURL = 1, - /// Relative Secured URL + /// Relative Secured URL. RelativeSecuredURL = 2, - /// Absolute Secured URL + /// Absolute Secured URL. AbsoluteSecuredURL = 3, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkProtocol.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkProtocol.cs index 9230b4a62e4..2267ac4a212 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkProtocol.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkProtocol.cs @@ -7,19 +7,19 @@ namespace DNNConnect.CKEditorProvider.Constants /// Link Dialog Protocol. More info https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-linkDefaultProtocol. public enum LinkProtocol { - /// HTTP + /// HTTP. Http = 0, - /// Https + /// Https. Https = 1, - /// Ftp + /// Ftp. Ftp = 2, - /// News + /// News. News = 3, - /// Other + /// Other. Other = 9, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkType.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkType.cs index 520d22d8e7a..56805e62151 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkType.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/LinkType.cs @@ -7,16 +7,16 @@ namespace DNNConnect.CKEditorProvider.Constants public enum LinkType { #pragma warning disable SA1300 // Element should begin with upper-case letter - /// Link Type URL + /// Link Type URL. url = 0, - /// Link Type local Page + /// Link Type local Page. localPage = 1, - /// Link Type anchor + /// Link Type anchor. anchor = 2, - /// Link Type email + /// Link Type email. email = 3, #pragma warning restore SA1300 // Element should begin with upper-case letter } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ToolBarLocation.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ToolBarLocation.cs index 43315116261..22e2e5ab915 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ToolBarLocation.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Constants/ToolBarLocation.cs @@ -6,10 +6,10 @@ namespace DNNConnect.CKEditorProvider.Constants /// The Toolbar Location. public enum ToolBarLocation { - /// Toolbar Location at the Top + /// Toolbar Location at the Top. Top = 0, - /// Toolbar Location at the Bottom + /// Toolbar Location at the Bottom. Bottom = 1, } } diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj index 1354e9a1cc9..a676a80cead 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj @@ -465,8 +465,8 @@ - - + + 10.0 diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config index 2a1bfa993f1..f79eca4ae1c 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config @@ -9,7 +9,8 @@ - + + diff --git a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj index f7be8045628..72582a14315 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj +++ b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj @@ -196,8 +196,8 @@ - - + + diff --git a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config index fa0d3653ac7..1694be29580 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config +++ b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config @@ -14,7 +14,8 @@ - + + diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj index 917cc19107b..10e375311a9 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj @@ -194,8 +194,8 @@ - - + + diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config index 11fb0d90026..2ac37e6541a 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config @@ -15,7 +15,8 @@ - + + diff --git a/DNN Platform/Syndication/DotNetNuke.Syndication.csproj b/DNN Platform/Syndication/DotNetNuke.Syndication.csproj index 448a02b4872..738fd9d6742 100644 --- a/DNN Platform/Syndication/DotNetNuke.Syndication.csproj +++ b/DNN Platform/Syndication/DotNetNuke.Syndication.csproj @@ -106,8 +106,8 @@ - - + + diff --git a/DNN Platform/Syndication/packages.config b/DNN Platform/Syndication/packages.config index e18dca45cda..4833d30a395 100644 --- a/DNN Platform/Syndication/packages.config +++ b/DNN Platform/Syndication/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj index d9a401ff7c7..284635d669e 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj @@ -201,8 +201,8 @@ - - + + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config index 8aefba64683..03c1c5883b8 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config @@ -19,7 +19,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj index b99e066ab70..9b1f095e04b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj @@ -172,8 +172,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config index d8638334bf3..3496fbb1fbe 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config @@ -12,7 +12,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj index 8f35598f0d9..450e3cb5731 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj @@ -193,8 +193,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config index d8638334bf3..3496fbb1fbe 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config @@ -12,7 +12,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj index 344bfc7dc04..6c337d3b476 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj @@ -214,8 +214,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config index dfaa7ecf02c..e69766075cb 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config @@ -16,7 +16,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj index 9044503ff17..91687347f2b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj @@ -354,8 +354,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Urls/AdvancedUrlRewriterTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Urls/AdvancedUrlRewriterTests.cs index 807e8472297..ed0619064f6 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Urls/AdvancedUrlRewriterTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Urls/AdvancedUrlRewriterTests.cs @@ -144,7 +144,7 @@ public void CheckForRedirects_WithUmlautUrls_DontRedirectInfinitely() HTTPAlias = GenericHost, }, DoRewrite = true, - RewritePath = RewritePath + RewritePath = RewritePath, }; urlAction.SetRedirectAllowed(string.Empty, friendlyUrlSettings); var requestType = string.Empty; @@ -161,7 +161,7 @@ public void CheckForRedirects_WithUmlautUrls_DontRedirectInfinitely() urlAction, requestType, friendlyUrlSettings, - portalHomeTabId + portalHomeTabId, }); // Assert @@ -215,7 +215,7 @@ private void FillTabsTable(DataTable tabsTable) "LastModifiedOnDate", "StateID", "HasBeenPublished", - "IsSystem" + "IsSystem", }; foreach (var column in tabColumns) { @@ -387,7 +387,7 @@ private void FillPortalAliasTable(DataTable portalAliasTable) "BrowserType", "Skin", "CultureCode", - "IsPrimary" + "IsPrimary", }; foreach (var column in portalAliasColumns) { diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config index 66fb5ae871c..6359f39dd0a 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config @@ -16,7 +16,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj index ad746d2e3d9..24f807daf42 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj @@ -234,8 +234,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/PetaPocoExtTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Data/PetaPocoExtTests.cs index 5bbd2dbfcb8..6dfc7118c3d 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Data/PetaPocoExtTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Data/PetaPocoExtTests.cs @@ -44,7 +44,7 @@ public void NormalizeSql_WithAtCharAndEmptyArguments_EscapesAtCharSuccessfully( new object[] { sql, - args + args, }); // Assert diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config index 79833d6778e..9545183622c 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config @@ -16,7 +16,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj index 0898521c7ae..da98e6da0ff 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj @@ -241,8 +241,6 @@ - - @@ -303,8 +301,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config index 0ded09f809d..11624b5c783 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config @@ -22,7 +22,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj index ab40078bdd1..85a7e3e0020 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj @@ -182,8 +182,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config index cd930e04493..2c305641546 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config @@ -15,7 +15,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/DotNetNuke.Tests.Modules.DDRMenu.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/DotNetNuke.Tests.Modules.DDRMenu.csproj index d9a03179c00..d230db1d796 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/DotNetNuke.Tests.Modules.DDRMenu.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/DotNetNuke.Tests.Modules.DDRMenu.csproj @@ -143,11 +143,11 @@ - - + - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/packages.config index 88747b2ac89..0f675e35268 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Modules.DDRMenu/packages.config @@ -9,7 +9,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj index 8298368fd41..8a090f7580c 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj @@ -180,8 +180,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config index d8638334bf3..3496fbb1fbe 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config @@ -12,7 +12,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj index 0e6aed30a4b..4154728e63b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj @@ -32,7 +32,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj b/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj index 2e3679d388e..db1924d1fb6 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj @@ -181,8 +181,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config index d8638334bf3..3496fbb1fbe 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config @@ -12,7 +12,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj index adacd78d5c0..103a05483c6 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj @@ -297,8 +297,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config index a2e401bf35d..e339dadf90d 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config @@ -18,7 +18,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj index 04026988776..95887565efb 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj @@ -243,8 +243,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config index 2dd5d4fbeb5..07bdd2d9ef1 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config @@ -21,7 +21,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj index 17fc9b7be9d..a55ca184e7b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj @@ -223,8 +223,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config index 9c09439fbd9..bda22680d08 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config @@ -20,7 +20,8 @@ - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs index cc9a316a232..fc4fd1a7d07 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs @@ -29,7 +29,7 @@ public class ServiceRoutingManagerTests { private static readonly List EmptyStringArrays = new List { - null, Array.Empty(), new[] { string.Empty }, new string[] { null } + null, Array.Empty(), new[] { string.Empty }, new string[] { null }, }; private Mock mockPortalController; diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj index 6f1e2acff2b..a5628dc0906 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj @@ -240,8 +240,8 @@ - - + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/FileUploadControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/FileUploadControllerTests.cs index 8cee00bb8b5..8e5eef4f404 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/FileUploadControllerTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/FileUploadControllerTests.cs @@ -23,7 +23,7 @@ namespace DotNetNuke.Tests.Web.InternalServices using NUnit.Framework; - /// Tests FileUploadController methods + /// Tests FileUploadController methods. [TestFixture] public class FileUploadControllerTests { diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config index 0d1aa88f285..b872e07f708 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config @@ -21,7 +21,8 @@ - + + diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj index 3e17a3fa025..3f82ca260bf 100644 --- a/DNN Platform/Website/DotNetNuke.Website.csproj +++ b/DNN Platform/Website/DotNetNuke.Website.csproj @@ -3460,8 +3460,8 @@ - - + + 10.0 diff --git a/DNN Platform/Website/packages.config b/DNN Platform/Website/packages.config index 5875a11e0c2..935850c6409 100644 --- a/DNN Platform/Website/packages.config +++ b/DNN Platform/Website/packages.config @@ -12,7 +12,8 @@ - + + diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs index 93d524e6431..7fb98d0882d 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs @@ -1581,7 +1581,8 @@ private void CopyModulesFromSourceTab(TabInfo tab, TabInfo sourceTab, IEnumerabl UserID = permission.UserID, PermissionKey = permission.PermissionKey, AllowAccess = permission.AllowAccess, - }, true); + }, + true); } ModulePermissionController.SaveModulePermissions(newModule); diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs index d90570375aa..ce7653f8fde 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs @@ -217,8 +217,8 @@ public string ExportPortalTemplate(ExportTemplateRequest request, UserInfo userI request.IncludeProfile, request.IncludeRoles); - success = exportResult.Item1; - return exportResult.Item2; + success = exportResult.Success; + return exportResult.Message; } public int CreatePortal(List errors, string domainName, string serverPath, string siteTemplate, string siteName, string siteAlias, string siteDescription, string siteKeywords, bool isChildSite, string homeDirectory, int siteGroupId, bool useCurrent, string firstname, string lastname, string username, string email, string password, string confirm, string question = "", string answer = "") diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj index 23f3248d373..678b5f0fc65 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj @@ -812,8 +812,8 @@ - - + + diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config index 1e6ed6b37a2..0c839de2d4a 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config @@ -9,7 +9,8 @@ - + + diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/Dnn.EditBar.Library.csproj b/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/Dnn.EditBar.Library.csproj index 007e68350d0..77269471252 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/Dnn.EditBar.Library.csproj +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/Dnn.EditBar.Library.csproj @@ -89,8 +89,8 @@ - - + + diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/packages.config b/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/packages.config index 930d5480836..8afaefa498c 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/packages.config +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/packages.config @@ -3,5 +3,6 @@ - + + \ No newline at end of file diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj index 271b804d090..0e72b165eea 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj @@ -311,8 +311,8 @@ - - + + diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config index 792ff6230c7..efc6b09def8 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config @@ -7,7 +7,8 @@ - + + diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj index 306eaf7ae06..fe057aa1763 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj @@ -206,8 +206,8 @@ - - + + diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config index 498645891f6..7344ad3f52e 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config @@ -10,7 +10,8 @@ - + + diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj index 71d0f0f5b2e..58b4a103b23 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj @@ -316,8 +316,8 @@ - - + + diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config index e80be8ad68a..942d9001061 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config @@ -12,7 +12,8 @@ - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj index eecb1fe0ae2..d28f7cfff0f 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj @@ -176,8 +176,8 @@ - - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config index b84e7d2e7da..ab6d4affebb 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config @@ -15,7 +15,8 @@ - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj index 2c881f163fa..b26ede33444 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj @@ -185,8 +185,8 @@ - - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config index b84e7d2e7da..ab6d4affebb 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config @@ -15,7 +15,8 @@ - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj index 1ea7bcc7a13..c25c3393215 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj @@ -202,8 +202,8 @@ - - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config index 60c1070719b..aedff2b19f8 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config @@ -18,7 +18,8 @@ - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj index 669dc3008ca..ec7ccfe4ef6 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj @@ -193,8 +193,8 @@ - - + + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config index b84e7d2e7da..ab6d4affebb 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config @@ -15,7 +15,8 @@ - + + diff --git a/DotNetNuke.Internal.SourceGenerators/DnnDeprecatedGenerator.cs b/DotNetNuke.Internal.SourceGenerators/DnnDeprecatedGenerator.cs index 42434523eef..a88859e7b07 100644 --- a/DotNetNuke.Internal.SourceGenerators/DnnDeprecatedGenerator.cs +++ b/DotNetNuke.Internal.SourceGenerators/DnnDeprecatedGenerator.cs @@ -28,15 +28,15 @@ public void Initialize(IncrementalGeneratorInitializationContext context) context.RegisterSourceOutput(context.CompilationProvider.Combine(classes.Collect()), Execute); } - private static void Execute(SourceProductionContext context, (Compilation compilation, ImmutableArray members) value) + private static void Execute(SourceProductionContext context, (Compilation Compilation, ImmutableArray Members) value) { - var members = value.members; + var members = value.Members; if (members.IsDefaultOrEmpty) { return; } - var compilation = value.compilation; + var compilation = value.Compilation; var dnnDeprecatedType = compilation.GetTypeByMetadataName(DnnDeprecatedTypeName); if (dnnDeprecatedType is null) diff --git a/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj b/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj index 2a9745e83cd..593b667e934 100644 --- a/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj +++ b/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj @@ -20,7 +20,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive