Merge pull request #7206 from dnnsoftware/release/10.3.1

Released v10.3.1

Author: valadas

.github/BUILD.md

@@ -27,12 +27,12 @@ If you wish to make changes to that project, please keep this in mind.
 
 DNN uses the following technologies to create a working build:
 1. MSBuild. This is Microsoft Visual Studio's built in mechanism to compile C#. It can also run auxiliary tasks (like packaging the included modules). These tasks are specified in `.build` and `.targets` files and can leverage .net assemblies to do its magic. Almost all central MSBuild code is in the `Build/BuildScripts` folder. Main folder location settings can be found in the `DNN_Platform.build` file in the root of the repository which can be overridden using a `DNN_Platform.local.build` file at the same location.
-2. Webpack. The "Admin Experience" (which is the project that contains the UI for managing DNN) contains a number of client-side Javascript projects (mostly React projects). These are built using Webpack. Webpack is triggered in the main build process in the `Build/BuildScripts/AEModule.build` script. But it can be run on individual projects if you need to.
+2. Rsbuild. The "Admin Experience" (which is the project that contains the UI for managing DNN) contains a number of client-side Javascript projects (mostly React projects). These are built using Rsbuild. Rsbuild is triggered in the main build process in the `Build/BuildScripts/AEModule.build` script. But it can be run on individual projects if you need to.
 3. [Cake Build](https://cakebuild.net/). This uses C# code to run build tasks. We use Cake for orchestrating the entire build process (e.g. packaging of the platform) and for auxiliary tasks like creating a dev site. All Cake scripts are found in the `Build/Cake` folder. After Cake first runs it bootstraps itself and creates the `tools` folder where the various assemblies can be found. Note the scripts use the [DNN Cake Utils](https://github.com/DNNCommunity/Dnn.CakeUtils) assembly to do the heavy lifting.
 
 ## Build to create packages
 
-This process uses Cake. Open Powershell at the root of the repository folder and enter:
+This process uses Cake. Open PowerShell at the root of the repository folder and enter:
 
 ```
 .\build.ps1
@@ -115,7 +115,7 @@ To build the .net projects to the right location, you'll need to create your ove
 Once you've created this file every time you click "rebuild" in Visual Studio on a project (or the solution) you'll see the content change in your dev site.
 **Note**: You may have to restart Visual Studio for this new build file to take effect.
 
-For the Webpack projects it is set up to read from the `settings.local.json` file and use the `WebsitePath` to copy generated js files to their right place.
+For the Rsbuild projects it is set up to read from the `settings.local.json` file and use the `WebsitePath` to copy generated js files to their right place.
 
 ## Build React Projects
 

.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.2.3 (latest release)
+    - 10.3.0 (latest release)
     - develop build (unreleased)
   validations:
     required: true

.github/workflows/ossf-scorecard.yml

@@ -1,4 +1,4 @@
-name: "Scorecard supply-chain security"
+name: "Scorecard supply-chain security"
 on:
   # For Branch-Protection check. Only the default branch is supported. See
   # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
@@ -56,6 +56,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@b1bff81932f5cdfc8695c7752dcee935dcd061c8" # v4.33.0
+        uses: "github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13" # v4.35.1
         with:
           sarif_file: "results.sarif"

.gitignore

@@ -85,6 +85,9 @@ UpgradeLog*.XML
 # Node
 node_modules/
 
+# AI Assistants
+.cursor/
+
 ############
 ## DNN
 ############
@@ -148,10 +151,3 @@ yarn-error.log
 
 /DotNetNuke.Internal.SourceGenerators/bin/
 /DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/Snapshots/*.received.*
-/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/scripts/bundles/
-/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/
-/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css
-/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/css/Roles.css
-/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/css/Security.css
-/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/css/Seo.css
-/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/css/Servers.css

Build/BuildScripts/AEPackage.targets

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CompressCss>True</CompressCss>
+    <UseResourceZipWorkingDirectory>True</UseResourceZipWorkingDirectory>
   </PropertyGroup>
 
   <Import Project="Package.Targets" />

Build/BuildScripts/Package.targets

@@ -2,7 +2,6 @@
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <DotNetNukeMSBuildTasksLib>$(BuildScriptsPath)\DotNetNuke.MSBuild.Tasks.dll</DotNetNukeMSBuildTasksLib>
-    <YuiLib>$(BuildScriptsPath)\Yahoo.Yui.Compressor.MsBuild.dll</YuiLib>
   </PropertyGroup>
 
   <UsingTask TaskName="ExtensionPackager" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
@@ -35,8 +34,6 @@
       </Code>
     </Task>
   </UsingTask>
-  <UsingTask AssemblyFile="$(YuiLib)" TaskName="CssCompressorTask" />
-  <!--<UsingTask AssemblyFile="$(YuiLib)" TaskName="JavaScriptCompressorTask" />-->
 
   <Target Name="Package" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <XmlPeek Namespaces="&lt;Namespace Prefix='n' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
@@ -49,9 +46,9 @@
       </Output>
     </ExtensionPackager>
 
-    <CallTarget Condition="'$(CompressCss)' == 'True'" Targets="Minification" />
+    <CallTarget Condition="'$(UseResourceZipWorkingDirectory)' == 'True'" Targets="RezipResources" />
     <Copy SourceFiles="$(DNNFileName).dnn" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-    <Zip Condition="'$(CompressCss)' != 'True'" Files="@(Resources)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />
+    <Zip Condition="'$(UseResourceZipWorkingDirectory)' != 'True'" Files="@(Resources)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />
 
     <ItemGroup>
       <LicenseFiles Include="license.txt"/>
@@ -74,37 +71,14 @@
     <RemoveDir Directories="$(MSBuildProjectDirectory)\Package" ContinueOnError="WarnAndContinue" />
   </Target>
 
-  <Target Name="Minification">
-
+  <Target Name="RezipResources">
     <MakeDir Directories="$(MSBuildProjectDirectory)\Package"/>
     <Zip Files="@(Resources)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />
     <Unzip ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" TargetDirectory="$(MSBuildProjectDirectory)\Package\Resources" />
     <Delete Files="$(MSBuildProjectDirectory)\Package\Resources.zip" />
     <ItemGroup>
-      <!--<_JSFilesToMinify Include="$(MSBuildProjectDirectory)\Package\Resources\**\*.js" Exclude="$(MSBuildProjectDirectory)\Package\Resources\**\*.min.js" />-->
       <_Step2FilesToZip Include="$(MSBuildProjectDirectory)\Package\Resources\**\*" />
     </ItemGroup>
-    <!--
-    <Message Text="Compressing Javascript files" Importance="high" />
-    <JavaScriptCompressorTask Files="@(_JSFilesToMinify)" ContinueOnError="WarnAndContinue" />
-    -->
-
-    <ItemGroup>
-      <_CSSFilesToCompress Include="$(MSBuildProjectDirectory)\*\*.css;$(MSBuildProjectDirectory)\*\*\*.css;$(MSBuildProjectDirectory)\*\*\*\*.css;$(MSBuildProjectDirectory)\*\*\*\*\*.css;" Exclude="Package\**\*;**\node_modules\**;**\WebApps\**" />
-    </ItemGroup>
-    <Message Text="Compressing the following CSS files:" Importance="high" />
-    <Message Text="%(_CSSFilesToCompress.Identity)" Importance="high" />
-
-    <CssCompressorTask
-      SourceFiles="@(_CSSFilesToCompress)"
-      DeleteSourceFiles="false"
-      OutputFile="$(MSBuildProjectDirectory)\Package\Resources\%(RecursiveDir)%(Filename)%(Extension)"
-      CompressionType="Standard"
-      LoggingType="Info"
-      PreserveComments="false"
-      LineBreakPosition="-1"
-      Condition="@(_CSSFilesToCompress->Count())!=0"
-    />
 
     <Zip Files="@(_Step2FilesToZip)" WorkingDirectory="$(ResourceZipWorkingDirectory)"
          ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />

Build/BuildScripts/Yahoo.Yui.Compressor.MsBuild.dll

@@ -4,9 +4,11 @@
 namespace DotNetNuke.Build
 {
     using System;
+    using System.Globalization;
     using System.IO;
 
     using Cake.Common;
+    using Cake.Common.Build;
     using Cake.Common.Diagnostics;
     using Cake.Common.IO;
     using Cake.Common.IO.Paths;
@@ -63,7 +65,11 @@ public Context(ICakeContext context)
                 this.Settings = LoadSettings(context, settingsFile);
                 this.WriteSettings(context, settingsFile);
 
-                this.BuildId = context.EnvironmentVariable("BUILD_BUILDID") ?? "0";
+                this.BuildId = context.AzurePipelines().IsRunningOnAzurePipelines
+                    ? context.AzurePipelines().Environment.Build.Id.ToString(CultureInfo.InvariantCulture)
+                    : context.GitHubActions().IsRunningOnGitHubActions
+                        ? context.GitHubActions().Environment.Workflow.RunId
+                        : "0";
                 context.Information($"BuildId: {this.BuildId}");
                 this.BuildNumber = string.Empty;
                 this.ProductVersion = string.Empty;

Build/BuildScripts/Yahoo.Yui.Compressor.dll

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