v9.11.0 Bump peter-evans/create-pull-request from 3.14.0 to 4

.github/workflows/image-actions.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Create Pull Request
         if: | # If it's not a Pull Request then commit any changes as a new PR.
           github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@v3.14.0
+        uses: peter-evans/create-pull-request@v4
         with:
           title: Auto Compress Images
           branch-suffix: timestamp

.github/workflows/updateVersions.yml

@@ -28,7 +28,7 @@ jobs:
         run: yarn install --mode=update-lockfile --no-immutable
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.14.0
+        uses: peter-evans/create-pull-request@v4
         with:
           commit-message: Updates versions as per release candidate creation
           title: Updates versions as per release candidate creation

Build/Tasks/Build.cs

@@ -4,7 +4,7 @@
 namespace DotNetNuke.Build.Tasks
 {
     using System;
-    using System.Collections.Generic;
+    using System.Linq;
 
     using Cake.Common.Build;
     using Cake.Common.Build.AzurePipelines.Data;
@@ -41,18 +41,12 @@ public override void Run(Context context)
             }
             finally
             {
-                var issues = context.ReadIssues(
-                    new List<IIssueProvider>
-                    {
-                        new MsBuildIssuesProvider(
-                            context.Log,
-                            new MsBuildIssuesSettings(cleanLog, context.MsBuildBinaryLogFileFormat())),
-                        new MsBuildIssuesProvider(
-                            context.Log,
-                            new MsBuildIssuesSettings(buildLog, context.MsBuildBinaryLogFileFormat())),
-                    },
-                    context.Directory("."));
-
+                var issueProviders =
+                    from logFilePath in new[] { cleanLog, buildLog, }
+                    where context.FileExists(logFilePath)
+                    let settings = new MsBuildIssuesSettings(logFilePath, context.MsBuildBinaryLogFileFormat())
+                    select new MsBuildIssuesProvider(context.Log, settings);
+                var issues = context.ReadIssues(issueProviders, context.Directory("."));
                 foreach (var issue in issues)
                 {
                     var messageData = new AzurePipelinesMessageData

DNN Platform/Library/Services/Search/Internals/InternalSearchControllerImpl.cs

@@ -38,7 +38,7 @@ namespace DotNetNuke.Services.Search.Internals
     /// -----------------------------------------------------------------------------
     internal class InternalSearchControllerImpl : IInternalSearchController
     {
-        private const string SearchableModuleDefsKey = "{0}-{1}";
+        private const string SearchableModuleDefsKey = "{0}-{1}-{2}";
         private const string SearchableModuleDefsCacheKey = "SearchableModuleDefs";
         private const string LocalizedResxFile = "~/DesktopModules/Admin/SearchResults/App_LocalResources/SearchableModules.resx";
 
@@ -79,7 +79,7 @@ public InternalSearchControllerImpl()
         public IEnumerable<SearchContentSource> GetSearchContentSourceList(int portalId)
         {
             var searchableModuleDefsCacheArgs = new CacheItemArgs(
-                    string.Format(SearchableModuleDefsKey, SearchableModuleDefsCacheKey, portalId),
+                    string.Format(SearchableModuleDefsKey, SearchableModuleDefsCacheKey, portalId, Thread.CurrentThread.CurrentCulture),
                     120, CacheItemPriority.Default);
 
             var list = CBO.GetCachedObject<IList<SearchContentSource>>(
@@ -92,7 +92,7 @@ public IEnumerable<SearchContentSource> GetSearchContentSourceList(int portalId)
         public string GetSearchDocumentTypeDisplayName(SearchResult searchResult)
         {
             // ModuleDefId will be zero for non-module
-            var key = string.Format("{0}-{1}", searchResult.SearchTypeId, searchResult.ModuleDefId);
+            var key = string.Format("{0}-{1}-{2}", searchResult.SearchTypeId, searchResult.ModuleDefId, Thread.CurrentThread.CurrentCulture);
             var keys = CBO.Instance.GetCachedObject<IDictionary<string, string>>(
                             new CacheItemArgs(key, 120, CacheItemPriority.Default), this.SearchDocumentTypeDisplayNameCallBack, false);
 
@@ -340,7 +340,7 @@ private object SearchDocumentTypeDisplayNameCallBack(CacheItemArgs cacheItem)
                 var searchContentSources = this.GetSearchContentSourceList(portal.PortalID);
                 foreach (var searchContentSource in searchContentSources)
                 {
-                    var key = string.Format("{0}-{1}", searchContentSource.SearchTypeId, searchContentSource.ModuleDefinitionId);
+                    var key = string.Format("{0}-{1}-{2}", searchContentSource.SearchTypeId, searchContentSource.ModuleDefinitionId, Thread.CurrentThread.CurrentCulture);
                     if (!data.ContainsKey(key))
                     {
                         data.Add(key, searchContentSource.LocalizedName);

DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/SearchServiceControllerTests.cs

@@ -129,8 +129,8 @@ public void SetUp()
             this.internalSearchController = InternalSearchController.Instance;
 
             this.mockCBO = new Mock<ICBO>();
-            var tabKey = string.Format("{0}-{1}", TabSearchTypeId, 0);
-            var userKey = string.Format("{0}-{1}", UserSearchTypeId, 0);
+            var tabKey = string.Format("{0}-{1}-{2}", TabSearchTypeId, 0, CultureEnUs);
+            var userKey = string.Format("{0}-{1}-{2}", UserSearchTypeId, 0, CultureEnUs);
             this.mockCBO.Setup(c => c.GetCachedObject<IDictionary<string, string>>(It.IsAny<CacheItemArgs>(), It.IsAny<CacheItemExpiredCallback>(), It.IsAny<bool>()))
                     .Returns(new Dictionary<string, string>() { { tabKey, TabSearchTypeName }, { userKey, UserSearchTypeName } });
             CBO.SetTestableInstance(this.mockCBO.Object);

DNN Platform/Website/admin/Skins/Privacy.ascx.cs

@@ -1,73 +1,79 @@
 // 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.UI.Skins.Controls
-{
-    using System;
+namespace DotNetNuke.UI.Skins.Controls
+{
+    using System;
 
-    using DotNetNuke.Abstractions;
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Services.Exceptions;
-    using DotNetNuke.Services.Localization;
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Services.Exceptions;
+    using DotNetNuke.Services.Localization;
     using Microsoft.Extensions.DependencyInjection;
 
-    /// -----------------------------------------------------------------------------
-    /// <summary></summary>
-    /// <returns></returns>
-    /// <remarks></remarks>
-    /// -----------------------------------------------------------------------------
-    public partial class Privacy : SkinObjectBase
-    {
-        private const string MyFileName = "Privacy.ascx";
-        private readonly INavigationManager _navigationManager;
-
-        public Privacy()
-        {
-            this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>();
-        }
-
-        public string Text { get; set; }
-
-        public string CssClass { get; set; }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            this.InitializeComponent();
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            try
-            {
-                if (!string.IsNullOrEmpty(this.CssClass))
-                {
-                    this.hypPrivacy.CssClass = this.CssClass;
-                }
-
-                if (!string.IsNullOrEmpty(this.Text))
-                {
-                    this.hypPrivacy.Text = this.Text;
-                }
-                else
-                {
-                    this.hypPrivacy.Text = Localization.GetString("Privacy", Localization.GetResourceFile(this, MyFileName));
-                }
-
-                this.hypPrivacy.NavigateUrl = this.PortalSettings.PrivacyTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Privacy") : this._navigationManager.NavigateURL(this.PortalSettings.PrivacyTabId);
-                this.hypPrivacy.Attributes["rel"] = "nofollow";
-            }
-            catch (Exception exc)
-            {
-                Exceptions.ProcessModuleLoadException(this, exc);
-            }
-        }
-
-        private void InitializeComponent()
-        {
-        }
-    }
-}
+    /// -----------------------------------------------------------------------------
+    /// <summary></summary>
+    /// <returns></returns>
+    /// <remarks></remarks>
+    /// -----------------------------------------------------------------------------
+    public partial class Privacy : SkinObjectBase
+    {
+        private const string MyFileName = "Privacy.ascx";
+        private readonly INavigationManager _navigationManager;
+
+        public Privacy()
+        {
+            this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>();
+        }
+
+        public string Text { get; set; }
+
+        public string CssClass { get; set; }
+
+        public string Rel { get; set; } = "nofollow";
+
+        protected override void OnInit(EventArgs e)
+        {
+            base.OnInit(e);
+
+            this.InitializeComponent();
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            try
+            {
+                if (!string.IsNullOrEmpty(this.CssClass))
+                {
+                    this.hypPrivacy.CssClass = this.CssClass;
+                }
+
+                if (!string.IsNullOrEmpty(this.Text))
+                {
+                    this.hypPrivacy.Text = this.Text;
+                }
+                else
+                {
+                    this.hypPrivacy.Text = Localization.GetString("Privacy", Localization.GetResourceFile(this, MyFileName));
+                }
+
+                this.hypPrivacy.NavigateUrl = this.PortalSettings.PrivacyTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Privacy") : this._navigationManager.NavigateURL(this.PortalSettings.PrivacyTabId);
+                if (!string.IsNullOrWhiteSpace(this.Rel))
+                {
+                    this.hypPrivacy.Attributes["rel"] = this.Rel;
+                }
+
+            }
+            catch (Exception exc)
+            {
+                Exceptions.ProcessModuleLoadException(this, exc);
+            }
+        }
+
+        private void InitializeComponent()
+        {
+        }
+    }
+}

DNN Platform/Website/admin/Skins/Terms.ascx.cs

@@ -1,74 +1,79 @@
 // 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.UI.Skins.Controls
-{
-    using System;
+namespace DotNetNuke.UI.Skins.Controls
+{
+    using System;
 
-    using DotNetNuke.Abstractions;
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Services.Exceptions;
-    using DotNetNuke.Services.Localization;
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Services.Exceptions;
+    using DotNetNuke.Services.Localization;
     using Microsoft.Extensions.DependencyInjection;
 
-    /// -----------------------------------------------------------------------------
-    /// <summary></summary>
-    /// <returns></returns>
-    /// <remarks></remarks>
-    /// -----------------------------------------------------------------------------
-    public partial class Terms : SkinObjectBase
-    {
-        private const string MyFileName = "Terms.ascx";
-        private readonly INavigationManager _navigationManager;
-
-        public Terms()
-        {
-            this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>();
-        }
-
-        public string Text { get; set; }
-
-        public string CssClass { get; set; }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            this.InitializeComponent();
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            try
-            {
-                if (!string.IsNullOrEmpty(this.CssClass))
-                {
-                    this.hypTerms.CssClass = this.CssClass;
-                }
-
-                if (!string.IsNullOrEmpty(this.Text))
-                {
-                    this.hypTerms.Text = this.Text;
-                }
-                else
-                {
-                    this.hypTerms.Text = Localization.GetString("Terms", Localization.GetResourceFile(this, MyFileName));
-                }
-
-                this.hypTerms.NavigateUrl = this.PortalSettings.TermsTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Terms") : this._navigationManager.NavigateURL(this.PortalSettings.TermsTabId);
-
-                this.hypTerms.Attributes["rel"] = "nofollow";
-            }
-            catch (Exception exc)
-            {
-                Exceptions.ProcessModuleLoadException(this, exc);
-            }
-        }
-
-        private void InitializeComponent()
-        {
-        }
-    }
-}
+    /// -----------------------------------------------------------------------------
+    /// <summary></summary>
+    /// <returns></returns>
+    /// <remarks></remarks>
+    /// -----------------------------------------------------------------------------
+    public partial class Terms : SkinObjectBase
+    {
+        private const string MyFileName = "Terms.ascx";
+        private readonly INavigationManager _navigationManager;
+
+        public Terms()
+        {
+            this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>();
+        }
+
+        public string Text { get; set; }
+
+        public string CssClass { get; set; }
+
+        public string Rel { get; set; } = "nofollow";
+
+        protected override void OnInit(EventArgs e)
+        {
+            base.OnInit(e);
+
+            this.InitializeComponent();
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            try
+            {
+                if (!string.IsNullOrEmpty(this.CssClass))
+                {
+                    this.hypTerms.CssClass = this.CssClass;
+                }
+
+                if (!string.IsNullOrEmpty(this.Text))
+                {
+                    this.hypTerms.Text = this.Text;
+                }
+                else
+                {
+                    this.hypTerms.Text = Localization.GetString("Terms", Localization.GetResourceFile(this, MyFileName));
+                }
+
+                this.hypTerms.NavigateUrl = this.PortalSettings.TermsTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Terms") : this._navigationManager.NavigateURL(this.PortalSettings.TermsTabId);
+                if (!string.IsNullOrWhiteSpace(this.Rel))
+                {
+                    this.hypTerms.Attributes["rel"] = this.Rel;
+                }
+
+            }
+            catch (Exception exc)
+            {
+                Exceptions.ProcessModuleLoadException(this, exc);
+            }
+        }
+
+        private void InitializeComponent()
+        {
+        }
+    }
+}