Released v10.2.0

.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.1.0 (latest v10 release)
+        - 10.1.2 (latest v10 release)
         - Current development branch (unreleased)
     validations:
       required: true

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

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Configure git

.github/workflows/image-actions.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Compress Images
         id: compress_images

.github/workflows/open-merged-pr-to-future.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.merged }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: peterjgrainger/action-create-branch@v3.0.0
         env:

.github/workflows/updateVersions.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/') }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get the release branch version
         uses: valadas/get-release-branch-version@v1.1.0

.yarnrc.yml

@@ -1,3 +1,5 @@
 compressionLevel: mixed
 
 nodeLinker: node-modules
+
+npmMinimalAgeGate: 1440

Build/Build.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <!-- Make sure start same folder .NET Core CLI and Visual Studio -->
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
@@ -15,17 +15,17 @@
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.BuildSystems.Module" Version="7.1.0" />
+    <PackageReference Include="Cake.BuildSystems.Module" Version="8.0.0" />
     <PackageReference Include="Cake.FileHelpers" Version="7.0.0" />
-    <PackageReference Include="Cake.Frosting" Version="5.0.0" />
+    <PackageReference Include="Cake.Frosting" Version="6.0.0" />
     <PackageReference Include="Cake.Frosting.Git" Version="5.0.1" />
-    <PackageReference Include="Cake.Issues" Version="5.5.0" />
-    <PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="5.5.0" />
+    <PackageReference Include="Cake.Issues" Version="5.9.1" />
+    <PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="5.9.1" />
     <PackageReference Include="Cake.Json" Version="7.0.1" />
     <PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
     <PackageReference Include="Dnn.CakeUtils" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Build/BuildScripts/Module.build

@@ -18,7 +18,7 @@
       <Images Include="Images/*.*" />
       <Keys Include="keys/*.*" />
       <ClientScripts Include="ClientScripts/*.*" />
-      <JsFiles Include="js/*.*" />
+      <JsFiles Include="js/*.*;*.js" />
       <Scripts Include="Scripts/*.*" />
       <SharedScripts Include="Scripts/Shared/*.*" />
       <Templates Include="Templates/*.htm" />

Build/ContextExtensions.cs

@@ -4,8 +4,9 @@
 
 namespace DotNetNuke.Build;
 
+using System;
 using System.Diagnostics;
-
+
 using Cake.Common.IO;
 using Cake.Core.IO;
 
@@ -18,6 +19,8 @@ public static class ContextExtensions
     /// <returns>The file version.</returns>
     public static string GetAssemblyFileVersion(this Context context, FilePath assemblyPath)
     {
-        return FileVersionInfo.GetVersionInfo(context.MakeAbsolute(assemblyPath).FullPath).FileVersion;
+        var versionInfo = FileVersionInfo.GetVersionInfo(context.MakeAbsolute(assemblyPath).FullPath);
+        var fileVersion = versionInfo.FileVersion;
+        return Version.TryParse(fileVersion, out _) ? fileVersion : $"{versionInfo.FileMajorPart}.{versionInfo.FileMinorPart}.{versionInfo.FileBuildPart}";
     }
 }

Build/LocalSettings.cs

@@ -33,6 +33,9 @@ public class LocalSettings
         /// <summary>Gets or sets the path to the database files.</summary>
         public string DatabasePath { get; set; } = string.Empty;
 
+        /// <summary>Gets or sets a value indicating whether to copy the sample projects to the build output.</summary>
+        public bool CopySampleProjects { get; set; } = false;
+
         /// <summary>Gets or sets the version to use for the build.</summary>
         public string Version { get; set; } = "auto";
     }

Build/Tasks/BuildToTempFolder.cs

@@ -3,10 +3,10 @@
 // See the LICENSE file in the project root for more information
 namespace DotNetNuke.Build.Tasks
 {
-    using System;
-    using System.Linq;
-
+    using Cake.Common.Diagnostics;
+    using Cake.Common.IO;
     using Cake.Frosting;
+    using Dnn.CakeUtils;
 
     /// <summary>A cake task to build the platform.</summary>
     [IsDependentOn(typeof(SetVersion))]
@@ -16,5 +16,20 @@ namespace DotNetNuke.Build.Tasks
     [IsDependentOn(typeof(OtherPackages))]
     public sealed class BuildToTempFolder : FrostingTask<Context>
     {
+        /// <inheritdoc/>
+        public override void Run(Context context)
+        {
+            if (context.Settings.CopySampleProjects)
+            {
+                context.Information("Copying Sample Projects to Temp Folder");
+                var files = context.GetFilesByPatterns(context.ArtifactsFolder, new[] { "SampleModules/*.zip" });
+                foreach (var file in files)
+                {
+                    var destination = context.File(System.IO.Path.Combine(context.WebsiteFolder, "Install", "Module", file.GetFilename().ToString()));
+                    context.CopyFile(file, destination);
+                    context.Information($"  Copied {file.GetFilename()} to {destination}");
+                }
+            }
+        }
     }
 }

Build/Tasks/OtherPackages.cs

@@ -18,6 +18,7 @@ namespace DotNetNuke.Build.Tasks
     /// <summary>A cake task to include other 3rd party packages.</summary>
     [IsDependentOn(typeof(PackageNewtonsoft))]
     [IsDependentOn(typeof(PackageMailKit))]
+    [IsDependentOn(typeof(PackageHtmlSanitizer))]
     [IsDependentOn(typeof(PackageAspNetWebApi))]
     [IsDependentOn(typeof(PackageAspNetWebPages))]
     [IsDependentOn(typeof(PackageAspNetMvc))]

Build/Tasks/PackageHtmlSanitizer.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.Build.Tasks;
+
+/// <summary>A cake task to generate the MailKit package.</summary>
+public sealed class PackageHtmlSanitizer : PackageComponentTask
+{
+    /// <summary>Initializes a new instance of the <see cref="PackageHtmlSanitizer"/> class.</summary>
+    public PackageHtmlSanitizer()
+        : base("HtmlSanitizer")
+    {
+    }
+}

Build/Tasks/unversionedManifests.txt

@@ -1,8 +1,4 @@
-DNN Platform/Components/MailKit/*.dnn
-DNN Platform/Components/Microsoft.*/**/*.dnn
-DNN Platform/Components/Newtonsoft/*.dnn
-DNN Platform/Components/WebFormsMvp/*.dnn
-DNN Platform/Components/SharpZipLib/*.dnn
+DNN Platform/Components/**/*.dnn
 DNN Platform/JavaScript Libraries/HoverIntent/*.dnn
 DNN Platform/JavaScript Libraries/jQuery*/*.dnn
 DNN Platform/JavaScript Libraries/Knockout*/*.dnn

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

@@ -21,6 +21,8 @@
   <files>
     <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.dll" target="lib\net48\" />
     <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.pdb" target="lib\net48\" />
+    <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.ResourceManager.dll" target="lib\netstandard2.0" />
+    <file src="..\..\..\Website\bin\DotNetNuke.Web.Client.ResourceManager.pdb" target="lib\netstandard2.0" />
     <file src="logo-for-nuget.png" target="images\"/>
   </files>
 </package>

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

@@ -14,6 +14,7 @@ namespace Dnn.Modules.Console
 
     using Dnn.Modules.Console.Components;
     using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.ClientResources;
     using DotNetNuke.Common.Utilities;
     using DotNetNuke.Entities.Modules;
     using DotNetNuke.Entities.Tabs;
@@ -22,10 +23,10 @@ namespace Dnn.Modules.Console
     using DotNetNuke.Instrumentation;
     using DotNetNuke.Security.Permissions;
     using DotNetNuke.Security.Roles;
+    using DotNetNuke.Services.ClientDependency;
     using DotNetNuke.Services.Exceptions;
     using DotNetNuke.Services.Localization;
     using DotNetNuke.Services.Personalization;
-    using DotNetNuke.Web.Client.ClientResourceManagement;
     using Microsoft.Extensions.DependencyInjection;
 
     /// <summary>Implements the module view logic.</summary>
@@ -34,6 +35,7 @@ public partial class ViewConsole : PortalModuleBase
         private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ViewConsole));
         private readonly INavigationManager navigationManager;
         private readonly IJavaScriptLibraryHelper javaScript;
+        private readonly IClientResourceController clientResourceController;
 
         private string defaultSize = string.Empty;
         private string defaultView = string.Empty;
@@ -42,17 +44,19 @@ public partial class ViewConsole : PortalModuleBase
 
         /// <summary>Initializes a new instance of the <see cref="ViewConsole"/> class.</summary>
         public ViewConsole()
-            : this(null, null)
+            : this(null, null, null)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="ViewConsole"/> class.</summary>
         /// <param name="navigationManager">The navigation manager.</param>
         /// <param name="javaScript">The JavaScript library helper.</param>
-        public ViewConsole(INavigationManager navigationManager, IJavaScriptLibraryHelper javaScript)
+        /// <param name="clientResourceController">The client resources controller.</param>
+        public ViewConsole(INavigationManager navigationManager, IJavaScriptLibraryHelper javaScript, IClientResourceController clientResourceController)
         {
             this.navigationManager = navigationManager ?? this.DependencyProvider.GetRequiredService<INavigationManager>();
             this.javaScript = javaScript ?? this.DependencyProvider.GetRequiredService<IJavaScriptLibraryHelper>();
+            this.clientResourceController = clientResourceController ?? this.DependencyProvider.GetRequiredService<IClientResourceController>();
         }
 
         /// <summary>Gets a value indicating whether the module settings allow size change.</summary>
@@ -213,7 +217,7 @@ protected override void OnInit(EventArgs e)
             {
                 this.javaScript.RequestRegistration(CommonJs.jQuery);
 
-                ClientResourceManager.RegisterScript(this.Page, "~/desktopmodules/admin/console/scripts/jquery.console.js");
+                this.clientResourceController.RegisterScript("~/desktopmodules/admin/console/scripts/jquery.console.js");
 
                 this.DetailView.ItemDataBound += this.RepeaterItemDataBound;
 

DNN Platform/Components/HtmlSanitizer/HtmlSanitizer.dnn

@@ -0,0 +1,55 @@
+<dotnetnuke type="Package" version="5.0">
+  <packages>
+    <package name="DotNetNuke.HtmlSanitizer" type="Library" version="1.0.0">
+      <friendlyName>HtmlSanitizer Components</friendlyName>
+      <description>Provides AngleSharp and HtmlSanitizer assemblies for the platform.</description>
+      <dependencies/>
+      <owner>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
+        <url>https://dnncommunity.org</url>
+        <email>info@dnncommunity.org</email>
+      </owner>
+      <license src="License.txt"/>
+      <releaseNotes>
+        This package includes AngleSharp, AngleSharp.Css and HtmlSanitizer assemblies.
+      </releaseNotes>
+      <components>
+        <component type="Assembly">
+          <assemblies>
+            <assembly>
+              <path>bin</path>
+              <name>AngleSharp.dll</name>
+              <version />
+            </assembly>
+            <assembly>
+              <path>bin</path>
+              <name>AngleSharp.Css.dll</name>
+              <version />
+            </assembly>
+            <assembly>
+              <path>bin</path>
+              <name>HtmlSanitizer.dll</name>
+              <version />
+            </assembly>
+            <assembly>
+              <path>bin</path>
+              <name>System.Collections.Immutable.dll</name>
+              <version />
+            </assembly>
+            <assembly>
+              <path>bin</path>
+              <name>System.Text.Encoding.CodePages.dll</name>
+              <version />
+            </assembly>
+            <assembly>
+              <path>bin</path>
+              <name>System.Runtime.CompilerServices.Unsafe.dll</name>
+              <version/>
+            </assembly>
+          </assemblies>
+        </component>
+      </components>
+    </package>
+  </packages>
+</dotnetnuke>

DNN Platform/Components/HtmlSanitizer/License.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (C) 2012-2020 .NET Foundation and Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

DNN Platform/Dnn.AuthServices.Jwt/Components/Common/Controllers/JwtController.cs

@@ -304,7 +304,19 @@ private static string CreateJwtToken(byte[] symmetricKey, string issuer, Persist
 
             var subject = new ClaimsIdentity();
             subject.AddClaim(new Claim(SessionClaimType, persistedToken.TokenId));
-            subject.AddClaims(roles.Select(r => new Claim(ClaimTypes.Role, r)));
+
+            // Add roles using both the standard schema URI (ClaimTypes.Role) for standards compliance
+            // and the legacy "role" claim type for backward compatibility with existing consumers
+            foreach (var role in roles)
+            {
+                subject.AddClaim(new Claim(ClaimTypes.Role, role));
+                subject.AddClaim(new Claim("role", role));
+            }
+
+            // Add deprecation notice for the legacy "role" claim format
+            subject.AddClaim(new Claim(
+                "dnn:deprecation:role",
+                "The role claim is deprecated. Use http://schemas.microsoft.com/ws/2008/06/identity/claims/role instead. The role claim will be removed in DNN v12.0.0."));
 
             var notBefore = DateTime.UtcNow.AddMinutes(-ClockSkew);
             var expires = persistedToken.TokenExpiry;

DNN Platform/Dnn.AuthServices.Jwt/Components/Entity/LoginResultData.cs

@@ -29,5 +29,10 @@ public class LoginResultData
         /// <summary>Gets or sets any error message.</summary>
         [JsonIgnore]
         public string Error { get; set; }
+
+        /// <summary>Gets deprecation warnings about the JWT token format (included in all responses).</summary>
+        [JsonProperty("deprecationNotice")]
+        public string DeprecationNotice =>
+            "The role claim format in JWT tokens is deprecated. Please use http://schemas.microsoft.com/ws/2008/06/identity/claims/role instead. The legacy role claim will be removed in DNN Platform v12.0.0.";
     }
 }