Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged release/9.13.6 into main to release v9.13.6 #6209

Merged
merged 26 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c382de3
Bump react-slider from 0.11.2 to 2.0.6
dependabot[bot] Aug 1, 2024
758ff71
Bump @storybook/addon-actions from 6.5.16 to 8.3.6
dependabot[bot] Oct 22, 2024
c12d800
Bump react-slider from 0.11.2 to 2.0.6
dependabot[bot] Oct 27, 2024
11bc7a7
'backup'
valadas Oct 27, 2024
20fae92
Fixed react-slider breaking changes
valadas Oct 27, 2024
592e3a2
Resolved merge conflict
valadas Oct 27, 2024
d9fb7b4
Merge pull request #6101 from dnnsoftware/dependabot/npm_and_yarn/rea…
bdukes Oct 28, 2024
bcdee55
Merge pull request #6168 from dnnsoftware/dependabot/npm_and_yarn/sto…
bdukes Nov 1, 2024
897128f
Bump NSubstitute from 5.1.0 to 5.3.0 in the teststack-dossier group
dependabot[bot] Nov 1, 2024
59a3401
Bump the cake-issues group with 3 updates
dependabot[bot] Nov 1, 2024
5c5f5c9
Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.1
dependabot[bot] Nov 1, 2024
0acea8c
Merge pull request #6182 from dnnsoftware/dependabot/nuget/teststack-…
valadas Nov 4, 2024
46a8ad3
Bump Castle.Core, Moq, System.Runtime.CompilerServices.Unsafe, System…
dependabot[bot] Nov 4, 2024
a6def56
Merge pull request #6183 from dnnsoftware/dependabot/nuget/cake-issue…
valadas Nov 4, 2024
4a22cdd
Merge pull request #6185 from dnnsoftware/dependabot/nuget/Microsoft.…
valadas Nov 4, 2024
f264c2e
Merge pull request #6190 from dnnsoftware/dependabot/nuget/multi-ef17…
valadas Nov 4, 2024
ad8590f
Bumps versions to 9.13.6 for next release
valadas Nov 5, 2024
8a35d20
Merge pull request #6191 from valadas/bump-9.13.6
valadas Nov 5, 2024
059b151
Updated resource-manager dependencies and some polishing
valadas Nov 5, 2024
b579369
Merge pull request #6192 from valadas/rm-updates-2024-11-05
valadas Nov 5, 2024
9462966
Make GitVersion config less ambiguous
bdukes Nov 5, 2024
aa345e9
Bump array.prototype.find from 2.2.1 to 2.2.3
dependabot[bot] Nov 5, 2024
020547c
Merge pull request #6195 from bdukes/fix-gitversion
valadas Nov 6, 2024
30c7f2b
Fix server info error on .NET 4.8
bdukes Nov 7, 2024
395ee6b
Fix bad test assertion
bdukes Nov 7, 2024
7a31fdc
Merge pull request #6201 from bdukes/fix-server-info-version
valadas Nov 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Build/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.1" />
<PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="4.10.1" />
<PackageReference Include="Cake.Issues" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="4.11.0" />
<PackageReference Include="Cake.Json" Version="7.0.1" />
<PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
<PackageReference Include="Dnn.CakeUtils" Version="2.0.2" />
Expand Down
2 changes: 1 addition & 1 deletion Build/Symbols/DotNetNuke_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke_Symbols" type="Library" version="09.13.04" >
<package name="DotNetNuke_Symbols" type="Library" version="09.13.06" >
<friendlyName>DNN Platform Symbols</friendlyName>
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Console" type="Module" version="09.13.04">
<package name="DotNetNuke.Console" type="Module" version="09.13.06">
<friendlyName>Console</friendlyName>
<description>Display children pages as icon links for navigation.</description>
<iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Connectors/Azure/AzureConnector.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.13.04">
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.13.06">
<friendlyName>Dnn Azure Connector</friendlyName>
<description>The Azure Connector allows you to create folders mapped to Azure Storage accounts.</description>
<iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.13.04">
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.13.06">
<friendlyName>Google Analytics (Legacy UA) Connector</friendlyName>
<description>Configure your site's Google Analytics settings using Universal Analytics.</description>
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="09.13.04">
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="09.13.06">
<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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.13.04">
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.13.06">
<friendlyName>Google Tag Manager Connector</friendlyName>
<description>Configure your site's Google Tag Manager settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNNJWT" type="Provider" version="09.13.04">
<package name="DNNJWT" type="Provider" version="09.13.06">
<friendlyName>DNN JWT Auth Handler</friendlyName>
<description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
<dependencies/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.ClientAPI" type="Library" version="09.13.04" >
<package name="DotNetNuke.ClientAPI" type="Library" version="09.13.06" >
<friendlyName>DotNetNuke ClientAPI</friendlyName>
<description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
<dependencies/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DnnPlugins" type="JavaScript_Library" version="09.13.04" isSystem="true">
<package name="DnnPlugins" type="JavaScript_Library" version="09.13.06" isSystem="true">
<friendlyName>DNN jQuery Plugins</friendlyName>
<description>A collection of jQuery plugins for DNN UI components (tabs, panels, tooltips, checkboxes, etc.)</description>
<iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
Expand Down
4 changes: 4 additions & 0 deletions DNN Platform/Library/Common/Globals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,10 @@ public static TimeSpan ElapsedSinceAppStart
/// </value>
public static Version NETFrameworkVersion { get; set; }

/// <summary>Gets the .Net framework version text.</summary>
/// <value>The .Net framework version text.</value>
public static string FormattedNetFrameworkVersion => FormatVersion(NETFrameworkVersion, "0", 3, ".");

/// <summary>Gets or sets the database engine version.</summary>
/// <value>
/// The database engine version.
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.13.04">
<package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.13.06">
<friendlyName>Message Center</friendlyName>
<description>Core Messaging module allows users to message each other.</description>
<iconFile>~/DesktopModules/CoreMessaging/Images/messaging_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/DDRMenu/DDRMenu.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DDRMenu" type="Module" isSystem="true" version="09.13.04">
<package name="DDRMenu" type="Module" isSystem="true" version="09.13.06">
<friendlyName>DDR Menu</friendlyName>
<description>DotNetNuke Navigation Provider.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="SiteExportImport" type="Library" isSystem="false" version="09.13.04">
<package name="SiteExportImport" type="Library" isSystem="false" version="09.13.06">
<friendlyName>Site Export Import</friendlyName>
<description>DotNetNuke Corporation Site Export Import Library</description>
<iconFile>Images/Files_32x32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/Groups/SocialGroups.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Social Groups" type="Module" isSystem="true" version="09.13.04">
<package name="Social Groups" type="Module" isSystem="true" version="09.13.06">
<friendlyName>Social Groups</friendlyName>
<description>DotNetNuke Corporation Social Groups module</description>
<iconFile>~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/HTML/dnn_HTML.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_HTML" type="Module" version="09.13.04">
<package name="DNN_HTML" type="Module" version="09.13.06">
<friendlyName>HTML</friendlyName>
<description>This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version.</description>
<iconFile>DesktopModules\HTML\Images\html.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.13.04" >
<package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.13.06" >
<friendlyName>Html Editor Management</friendlyName>
<iconFile>Images/HtmlEditorManager_Standard_32x32.png</iconFile>
<description>A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider.</description>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/Journal/Journal.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Journal" type="Module" isSystem="true" version="09.13.04">
<package name="Journal" type="Module" isSystem="true" version="09.13.06">
<friendlyName>Journal</friendlyName>
<description>DotNetNuke Corporation Journal module</description>
<iconFile>DesktopModules/Journal/Images/journal_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.Modules.MemberDirectory" type="Module" isSystem="true" version="09.13.04">
<package name="DotNetNuke.Modules.MemberDirectory" type="Module" isSystem="true" version="09.13.06">
<friendlyName>Member Directory</friendlyName>
<description>The Member Directory module displays a list of Members based on role, profile property or relationship.</description>
<iconFile>~/DesktopModules/MemberDirectory/Images/member_list_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/RazorHost/Manifest.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="{0}" type="Module" isSystem="true" version="09.13.04">
<package name="{0}" type="Module" isSystem="true" version="09.13.06">
<friendlyName>{0}</friendlyName>
<description>{1}</description>
<owner>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/RazorHost/RazorHost.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNNCorp.RazorHost" type="Module" version="09.13.04" >
<package name="DNNCorp.RazorHost" type="Module" version="09.13.06" >
<friendlyName>Razor Host</friendlyName>
<description>The Razor Host module allows developers to host Razor Scripts.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -438,4 +438,10 @@
<data name="OpenFile.Text" xml:space="preserve">
<value>Open</value>
</data>
<data name="CollapseFolders.Text" xml:space="preserve">
<value>Collapse Folders</value>
</data>
<data name="ExpandFolders.Text" xml:space="preserve">
<value>Expand Folders</value>
</data>
</root>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dnn-resource-manager",
"version": "9.13.4",
"version": "9.13.6",
"description": "Resource Manager",
"private": true,
"main": "dist/index.cjs.js",
Expand All @@ -26,13 +26,13 @@
"generate": "stencil generate"
},
"dependencies": {
"@stencil/core": "^2.22.3"
"@stencil/core": "^4.22.2"
},
"license": "MIT",
"devDependencies": {
"@dnncommunity/dnn-elements": "^0.15.2",
"@stencil/sass": "^2.0.4",
"@stencil/store": "^2.0.9",
"@types/node": "^20.11.16"
"@dnncommunity/dnn-elements": "^0.24.1",
"@stencil/sass": "^3.0.12",
"@stencil/store": "^2.0.16",
"@types/node": "^22.9.0"
}
}
Loading
Loading