Merge remote-tracking branch 'dnnsoftware/develop' into release/10.0.0

# Conflicts: # Build/Symbols/DotNetNuke_Symbols.dnn # DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn # DNN Platform/Connectors/Azure/AzureConnector.dnn # DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn # DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn # DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn # DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn # DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn # DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn # DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs # DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn # DNN Platform/Modules/DDRMenu/DDRMenu.dnn # DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn # DNN Platform/Modules/Groups/SocialGroups.dnn # DNN Platform/Modules/HTML/dnn_HTML.dnn # DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn # DNN Platform/Modules/Journal/Journal.dnn # DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn # DNN Platform/Modules/RazorHost/Manifest.dnn # DNN Platform/Modules/RazorHost/RazorHost.dnn # DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json # DNN Platform/Modules/ResourceManager/ResourceManager.dnn # DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn # DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn # DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn # DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn # DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn # DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn # DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn # DNN Platform/Providers/FolderProviders/FolderProviders.dnn # DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn # DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn # DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn # DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn # Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json # Dnn.AdminExperience/ClientSide/Bundle.Web/package.json # Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json # Dnn.AdminExperience/ClientSide/Extensions.Web/package.json # Dnn.AdminExperience/ClientSide/Licensing.Web/package.json # Dnn.AdminExperience/ClientSide/Pages.Web/package.json # Dnn.AdminExperience/ClientSide/Prompt.Web/package.json # Dnn.AdminExperience/ClientSide/Roles.Web/package.json # Dnn.AdminExperience/ClientSide/Security.Web/package.json # Dnn.AdminExperience/ClientSide/Seo.Web/package.json # Dnn.AdminExperience/ClientSide/Servers.Web/package.json # Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json # Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json # Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json # Dnn.AdminExperience/ClientSide/Sites.Web/package.json # Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json # Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json # Dnn.AdminExperience/ClientSide/Themes.Web/package.json # Dnn.AdminExperience/ClientSide/Users.Web/package.json # Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json # Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json # Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn # Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn # Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn # SolutionInfo.cs # yarn.lock
tvatavuk · Sep 24, 2024 · cf0e1a9 · cf0e1a9
2 parents c69ab2f + 2e194e5
commit cf0e1a9
Show file tree

Hide file tree

Showing 294 changed files with 27,958 additions and 21,281 deletions.
diff --git a/.github/PULL_REQUEST_PROCESS.md b/.github/PULL_REQUEST_PROCESS.md
@@ -8,7 +8,7 @@ The following items must all be true prior to a pull request being submitted to
 * Change should represent an entire solution for the issue at hand.  Partial requests will NOT be processed.
 * Change should have a supporting issue logged on the DNN_Platform GitHub account, documenting the issue resolved, following the procedures outlined on the [Contribute Page](/CONTRIBUTING.md)
 * If your change was to an area that already was covered by tests those tests must be updated.  New tests for areas currently un-tested are appreciated
-* **Exception**: Security items can be addressed individually, and should be initially communicated to the [email protected] email address for coordination
+* **Exception**: Security items can be addressed individually, and should be initially communicated via [the GitHub feature for reporting a security vulnerability](https://github.com/dnnsoftware/Dnn.Platform/security/advisories/new)
 * Pull request comment should contain at a minimum the following details (When creating, a default template will also prompt you for the proper information)
   * Issue #, referenced such as “Fixes #24”
   * Release Note: Suggested release note for the change such as “Improvement of user profile to improve performance when searching.”

diff --git a/.github/workflows/image-actions.yml b/.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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: Auto Compress Images
           branch-suffix: timestamp

diff --git a/.github/workflows/updateVersions.yml b/.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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: Updates versions as per release candidate creation
           title: Updates versions as per release candidate creation

diff --git a/.gitignore b/.gitignore
@@ -148,3 +148,5 @@ 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/
diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -18,8 +18,8 @@
     <PackageReference Include="Cake.FileHelpers" Version="7.0.0" />
     <PackageReference Include="Cake.Frosting" Version="4.0.0" />
     <PackageReference Include="Cake.Frosting.Git" Version="4.0.0" />
-    <PackageReference Include="Cake.Issues" Version="4.5.1" />
-    <PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="4.5.1" />
+    <PackageReference Include="Cake.Issues" Version="4.10.1" />
+    <PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="4.10.1" />
     <PackageReference Include="Cake.Json" Version="7.0.1" />
     <PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
     <PackageReference Include="Dnn.CakeUtils" Version="2.0.2" />

diff --git a/Build/Symbols/DotNetNuke_Symbols.dnn b/Build/Symbols/DotNetNuke_Symbols.dnn
@@ -23,4 +23,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn
@@ -90,4 +90,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Connectors/Azure/AzureConnector.dnn b/DNN Platform/Connectors/Azure/AzureConnector.dnn
@@ -36,4 +36,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn
@@ -36,4 +36,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn
@@ -4,14 +4,14 @@
             <friendlyName>Google Analytics 4 Connector</friendlyName>
             <description>Configure your site's Google Analytics 4 settings.</description>
             <iconFile>~/DesktopModules/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png</iconFile>
-          <dependencies>
-            <dependency type="CoreVersion">10.00.00</dependency>
-          </dependencies>
-          <owner>
-              <name>.NET Foundation and Contributors</name>
-            <organization>DNN Community</organization>
-            <url>https://dnncommunity.org</url>
-            <email>[email protected]</email>
+            <dependencies>
+                <dependency type="CoreVersion">10.00.00</dependency>
+            </dependencies>
+            <owner>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
+                <url>https://dnncommunity.org</url>
+                <email>[email protected]</email>
             </owner>
             <license src="license.txt" />
             <releaseNotes src="releaseNotes.txt" />
@@ -36,4 +36,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn
@@ -36,4 +36,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Library/Common/Initialize.cs b/DNN Platform/Library/Common/Initialize.cs
@@ -382,13 +382,19 @@ private static Version GetNETFrameworkVersion()
             // Otherwise utilize release DWORD from registry to determine version
             // Reference List: https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/versions-and-dependencies
             var release = GetDotNet4ReleaseNumberFromRegistry();
+            if (release >= 533320)
+            {
+                return new Version("4.8.1");
+            }
+
             if (release >= 528040)
             {
-                version = "4.8";
+                return new Version("4.8");
             }
-            else
+
+            if (release >= 461808)
             {
-                version = "4.7.2";
+                return new Version("4.7.2");
             }
 
             return new Version(version);

diff --git a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs
@@ -18,7 +18,7 @@ namespace DotNetNuke.Services.GeneratedImage
 
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Extensions;
+    using DotNetNuke.Common.Utilities;
     using DotNetNuke.Entities.Portals;
     using DotNetNuke.Services.FileSystem;
     using DotNetNuke.Services.GeneratedImage.FilterTransform;
@@ -197,7 +197,11 @@ public override ImageInfo GenerateImage(NameValueCollection parameters)
 
                         if (!string.IsNullOrEmpty(parameters["Text"]))
                         {
-                            placeHolderTrans.Text = text;
+                            bool.TryParse(Config.GetSetting("AllowDnnImagePlaceholderText"), out bool allowDnnImagePlaceholderText);
+                            if (allowDnnImagePlaceholderText)
+                            {
+                                placeHolderTrans.Text = text;
+                            }
                         }
 
                         if (!string.IsNullOrEmpty(parameters["BackColor"]))

diff --git a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
@@ -81,4 +81,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn
@@ -106,4 +106,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn
@@ -82,4 +82,4 @@
       </eventMessage>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/Groups/SocialGroups.dnn b/DNN Platform/Modules/Groups/SocialGroups.dnn
@@ -119,4 +119,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/HTML/dnn_HTML.dnn b/DNN Platform/Modules/HTML/dnn_HTML.dnn
@@ -205,4 +205,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/Journal/Journal.dnn b/DNN Platform/Modules/Journal/Journal.dnn
@@ -83,4 +83,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
@@ -96,4 +96,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/RazorHost/Manifest.dnn b/DNN Platform/Modules/RazorHost/Manifest.dnn
@@ -57,4 +57,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Modules/RazorHost/RazorHost.dnn b/DNN Platform/Modules/RazorHost/RazorHost.dnn
@@ -217,4 +217,4 @@
       </components>
     </package>
   </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/...rm/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn b/...rm/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn
@@ -46,4 +46,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn
@@ -56,4 +56,4 @@
             </components>
         </package>
     </packages>
-</dotnetnuke>
+</dotnetnuke>
diff --git a/...Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj b/...Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj
@@ -20,15 +20,15 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+        <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.2" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj
@@ -1252,6 +1252,7 @@
     <Content Include="Providers\DataProviders\SqlDataProvider\09.12.01.SqlDataProvider" />
     <Content Include="Install\Config\09.09.00.config" />
     <Content Include="Install\Config\10.00.00.config" />
+    <Content Include="Install\Config\09.13.04.config" />
     <Content Include="Providers\DataProviders\SqlDataProvider\09.13.04.SqlDataProvider" />
     <None Include="web.Debug.config">
       <DependentUpon>web.config</DependentUpon>

diff --git a/DNN Platform/Website/Install/Config/09.13.04.config b/DNN Platform/Website/Install/Config/09.13.04.config
@@ -0,0 +1,8 @@
+<configuration>
+  <nodes configfile="web.config">
+    <node path="/configuration/appSettings" action="add">
+      <!-- Can be set to true to allow the image handler to display text passed in the querystring. -->
+      <add key="AllowDnnImagePlaceholderText" value="false" />
+    </node>
+  </nodes>
+</configuration>