Merge branch 'develop' into serilog-2026

# Conflicts:
#	DNN Platform/Admin Modules/Dnn.Modules.Console/ViewConsole.ascx.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/ControlBarController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/EventLogServiceController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/ItemListServiceController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/MessagingServiceController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/ModuleServiceController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/NotificationsServiceController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/RelationshipServiceController.cs
#	DNN Platform/DotNetNuke.Web/InternalServices/UserFileController.cs
#	DNN Platform/Modules/CoreMessaging/Services/MessagingServiceController.cs
#	DNN Platform/Modules/Journal/ServicesController.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ThemesController.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs

Author: bdukes

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -72,7 +72,7 @@ body:
       **NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._
     multiple: true
     options:
-    - 10.3.2 (latest release)
+    - 10.3.3 (latest release)
     - develop build (unreleased)
   validations:
     required: true

.github/workflows/browserslist-update-db.yml

@@ -19,7 +19,7 @@ jobs:
       pull-requests: "write" # creates a pull request if there's an update
     steps:
       - name: "Checkout repository"
-        uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
+        uses: "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" # v7.0.0
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/ci.yml

@@ -59,26 +59,32 @@ jobs:
     name: "Build and Validate"
     runs-on: "windows-2025-vs2026"
     permissions:
-      checks: "write"
-      pull-requests: "write"
+      checks: "write" # needed by EnricoMi/publish-unit-test-result-action
+      pull-requests: "write" # needed by EnricoMi/publish-unit-test-result-action
     defaults:
       run:
         shell: "pwsh"
     steps:
       - name: "Setup Environment Variables"
         run: |
-          "CAKE_TARGET=${{ inputs.CAKE_TARGET || env.CAKE_TARGET }}" >> $env:GITHUB_ENV;
-          "CAKE_VERBOSITY=${{ inputs.CAKE_VERBOSITY || env.CAKE_VERBOSITY }}" >> $env:GITHUB_ENV;
-          "RELEASE_MODE=${{ inputs.RELEASE_MODE || env.RELEASE_MODE }}" >> $env:GITHUB_ENV;
-          "RUN_TESTS=${{ inputs.RUN_TESTS || env.RUN_TESTS }}" >> $env:GITHUB_ENV;
+          "CAKE_TARGET=$env:CAKE_TARGET" >> $env:GITHUB_ENV;
+          "CAKE_VERBOSITY=$env:CAKE_VERBOSITY" >> $env:GITHUB_ENV;
+          "RELEASE_MODE=$env:RELEASE_MODE" >> $env:GITHUB_ENV;
+          "RUN_TESTS=$env:RUN_TESTS" >> $env:GITHUB_ENV;
+        env:
+          CAKE_TARGET: ${{ inputs.CAKE_TARGET || env.CAKE_TARGET }}
+          CAKE_VERBOSITY: ${{ inputs.CAKE_VERBOSITY || env.CAKE_VERBOSITY }}
+          RELEASE_MODE: ${{ inputs.RELEASE_MODE || env.RELEASE_MODE }}
+          RUN_TESTS: ${{ inputs.RUN_TESTS || env.RUN_TESTS }}
 
       - name: "Checkout"
-        uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
+        uses: "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" # v7.0.0
         with:
           fetch-depth: 0 # include all history for GitVersion
+          persist-credentials: false
 
       - name: "Setup Node.js"
-        uses: "actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e" # v6.4.0
+        uses: "actions/setup-node@820762786026740c76f36085b0efc47a31fe5020" # v7.0.0
         with:
           node-version-file: ".node-version"
           package-manager-cache: false
@@ -87,7 +93,7 @@ jobs:
         run: "corepack enable"
 
       - name: "Setup .NET SDK"
-        uses: "actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7" # v5.2.0
+        uses: "actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68" # v6.0.0
         with:
           global-json-file: "global.json"
 
@@ -103,22 +109,22 @@ jobs:
           (Get-Content $path) | ForEach-Object {
             if ($_ -match $pattern3) {
             # We have found the matching line
-            '[assembly: AssemblyStatus(ReleaseMode.{0})]' -f '${{ env.RELEASE_MODE }}'
+            '[assembly: AssemblyStatus(ReleaseMode.{0})]' -f $env:RELEASE_MODE
           } else {
             $_
           }
           } | Set-Content $path
 
       - name: "Run DNN Build via Cake"
-        run: "./build.ps1 --target=${{ env.CAKE_TARGET }} --verbosity=${{ env.CAKE_VERBOSITY }}"
+        run: "./build.ps1 --target=$env:CAKE_TARGET --verbosity=$env:CAKE_VERBOSITY"
 
       - name: "Run Unit Tests via Cake"
         if: ${{ env.RUN_TESTS == 'true' }}
-        run: "./build.ps1 --target=UnitTests --verbosity=${{ env.CAKE_VERBOSITY }}"
+        run: "./build.ps1 --target=UnitTests --verbosity=$env:CAKE_VERBOSITY"
         continue-on-error: true
 
       - name: "Publish Test Results"
-        uses: "EnricoMi/publish-unit-test-result-action/windows@c950f6fb443cb5af20a377fd0dfaa78838901040" # v2.23.0
+        uses: "EnricoMi/publish-unit-test-result-action/windows@d0a4676d0e0b938bc201470d88276b7c74c712b3" # v2.24.0
         if: ${{ !cancelled() && env.RUN_TESTS == 'true' }}
         with:
           files: "**/TestResults/*.trx"
@@ -135,8 +141,8 @@ jobs:
           overwrite: true
 
       - name: "Create GitHub Pull Request"
-        if: ${{ success() && !contains('pull_request', github.event_name) && (contains(fromJSON('["develop", "main"]'), github.ref_name) || startsWith('release/', github.ref_name)) }}
-        run: "./build.ps1 --target=CreateGitHubPullRequest --verbosity=${{ env.CAKE_VERBOSITY }}"
+        if: ${{ success() && github.event_name == 'push' && (github.ref_name == 'develop' || startsWith('release/', github.ref_name)) }}
+        run: "./build.ps1 --target=CreateGitHubPullRequest --verbosity=$env:CAKE_VERBOSITY"
         env:
           GITHUB_APP_ID: ${{ secrets.GITHUB_APP_ID }}
           GITHUB_APP_PRIVATE_KEY: ${{ secrets.GITHUB_APP_PRIVATE_KEY }}
@@ -150,17 +156,17 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     runs-on: "ubuntu-latest"
     permissions:
-      id-token: "write"
+      id-token: "write" # needed by actions/attest
       contents: "read"
-      attestations: "write"
+      attestations: "write" # needed by actions/attest
     steps:
       - name: "Download Artifacts"
         uses: "actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c" # v8.0.1
         with:
           artifact-ids: ${{ needs.build-and-validate.outputs.artifact-id }}
 
       - name: "Generate artifact attestations"
-        uses: "actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26" # v4.1.0
+        uses: "actions/attest@a1948c3f048ba23858d222213b7c278aabede763" # v4.1.1
         with:
           subject-path: |
             *.nupkg
@@ -174,7 +180,7 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     runs-on: "ubuntu-latest"
     permissions:
-      id-token: "write"
+      id-token: "write" # needed by NuGet/login
     defaults:
       run:
         shell: "pwsh"
@@ -191,4 +197,7 @@ jobs:
           user: ${{ secrets.NUGET_USER }}
 
       - name: "NuGet Push"
-        run: "dotnet nuget push *.nupkg --api-key ${{ steps.nuget-login.outputs.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json"
+        run: "dotnet nuget push *.nupkg --api-key $env:NUGET_API_KEY --source https://api.nuget.org/v3/index.json"
+        env:
+          NUGET_API_KEY: ${{ steps.nuget-login.outputs.NUGET_API_KEY }}
+

.github/workflows/dependency-review.yml

@@ -1,9 +1,9 @@
 name: "Dependency Review"
 
-on: 
+on:
   pull_request:
   merge_group:
-      types:
+    types:
       - "checks_requested"
 
 concurrency:
@@ -14,11 +14,17 @@ permissions: {}
 
 jobs:
   dependency-review:
+    name: "Dependency Review"
     runs-on: "ubuntu-latest"
     permissions:
       contents: "read"
     steps:
       - name: "Checkout Repository"
-        uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
+        uses: "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" # v7.0.0
+        with:
+          persist-credentials: false
+
       - name: "Dependency Review"
         uses: "actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294" # v5.0.0
+
+

.github/workflows/image-actions.yml

@@ -36,13 +36,13 @@ jobs:
       contents: "read"
     steps:
       - name: "Checkout Repo"
-        uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
+        uses: "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" # v7.0.0
         with:
           persist-credentials: false
 
       - name: "Compress Images"
         id: "compress_images"
-        uses: "calibreapp/image-actions@f32575787d333b0579f0b7d506ff03be63a669d1" # 1.4.1
+        uses: "calibreapp/image-actions@9d037c06280028c110ff61c433ad4dc7d33c3c43" # 1.5.0
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           compressOnly: ${{ github.event_name != 'pull_request' }} # For non-Pull Requests, run in compressOnly mode and we'll PR after.

.github/workflows/ossf-scorecard.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
+        uses: "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" # v7.0.0
         with:
           persist-credentials: false
 
@@ -58,6 +58,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: "github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e" # v4.35.4
+        uses: "github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9" # v4.37.0
         with:
           sarif_file: "results.sarif"

.github/workflows/zizmor.yml

@@ -28,9 +28,9 @@ jobs:
       actions: read          # Only needed for private repos. Needed for upload-sarif to read workflow run info.
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
+        uses: zizmorcore/zizmor-action@6599ee8b7a49aef6a770f63d261d214911a7ce02 # v0.6.0

.yarnrc.yml

@@ -1,8 +1,12 @@
+approvedGitRepositories: []
+
 compressionLevel: mixed
 
+enableScripts: false
+
 nodeLinker: node-modules
 
-npmMinimalAgeGate: "1d"
+npmMinimalAgeGate: 1d
 
 npmPreapprovedPackages:
   - "@dnncommunity/dnn-elements"

Build/Symbols/DotNetNuke_Symbols.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke_Symbols" type="Library" version="10.03.03" >
+    <package name="DotNetNuke_Symbols" type="Library" version="10.03.04" >
       <friendlyName>DNN Platform Symbols</friendlyName>
       <description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
       <owner>

Build/Tasks/PreparePackaging.cs

@@ -4,11 +4,15 @@
 namespace DotNetNuke.Build.Tasks
 {
     using System;
+    using System.Collections.Generic;
+    using System.Globalization;
     using System.Linq;
+    using System.Reflection;
     using System.Xml.Linq;
 
     using Cake.Common.Diagnostics;
     using Cake.Common.IO;
+    using Cake.Core.IO;
     using Cake.Frosting;
     using Cake.Json;
     using Dnn.CakeUtils;
@@ -60,14 +64,52 @@ private static void CreateWebConfig(Context context)
 
             context.PackagingPatterns = context.DeserializeJsonFromFile<PackagingPatterns>("./Build/Tasks/packaging.json");
             var files = context.GetFilesByPatterns(context.WebsiteDir, BinFolderInclude, context.PackagingPatterns.InstallExclude);
-            var parsedAssemblies = files.ParseAssemblies();
-            parsedAssemblies.RemoveAll(a => a.PublicKeyToken is null);
-            var redirects = parsedAssemblies.ConvertAll(a => a.AssemblyBindingRedirect());
+            var redirects = BuildBindingRedirects(files);
             assemblyBinding.Add(redirects.ToArray<object>());
 
             // save XML document to target file
             var targetFile = context.WebsiteDir + context.File("web.config");
             doc.Save(targetFile);
         }
+
+        private static List<XElement> BuildBindingRedirects(IEnumerable<FilePath> files)
+        {
+            XNamespace asm = "urn:schemas-microsoft-com:asm.v1";
+            var redirects = new List<XElement>();
+
+            foreach (var file in files)
+            {
+                AssemblyName assemblyName;
+                try
+                {
+                    assemblyName = AssemblyName.GetAssemblyName(file.FullPath);
+                }
+                catch
+                {
+                    continue;
+                }
+
+                var tokenBytes = assemblyName.GetPublicKeyToken();
+                if (tokenBytes == null || tokenBytes.Length == 0 || string.IsNullOrEmpty(assemblyName.Name) || assemblyName.Version == null)
+                {
+                    continue;
+                }
+
+                var token = string.Concat(tokenBytes.Select(static b => b.ToString("x2", CultureInfo.InvariantCulture)));
+                redirects.Add(
+                    new XElement(
+                        asm + "dependentAssembly",
+                        new XElement(
+                            asm + "assemblyIdentity",
+                            new XAttribute("name", assemblyName.Name),
+                            new XAttribute("publicKeyToken", token)),
+                        new XElement(
+                            asm + "bindingRedirect",
+                            new XAttribute("oldVersion", "0.0.0.0-32767.32767.32767.32767"),
+                            new XAttribute("newVersion", assemblyName.Version.ToString()))));
+            }
+
+            return redirects;
+        }
     }
 }