Skip to content

📈 Update caniuse database #1

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.

Sign up for GitHub

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

Open
github-actions wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

📈 Update caniuse database #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
483b48c
Sometimes we need to get additional keyFound variable to know if Reso…
thienvc Dec 12, 2024
286aba9
Sometimes we need to get additional keyFound variable to know if Reso…
thienvc Dec 12, 2024
ceb7256
Allow manual upgrade CKEditor js version
thienvc Dec 13, 2024
c9469b3
Merge branch 'develop' into patch-3
thienvc Dec 13, 2024
4d3a701
Fix allow manual upgrade CKEditor js, by add "ckeversion" attribute i…
thienvc Dec 13, 2024
07865b6
Merge remote-tracking branch 'origin/patch-2' into develop
thienvc Dec 14, 2024
71d67ae
Merge remote-tracking branch 'origin/patch-1' into develop
thienvc Dec 14, 2024
9b95e2f
Merge remote-tracking branch 'origin/patch-3' into develop
thienvc Dec 14, 2024
5b6b69c
Fix html5 attribute without value
thienvc Dec 20, 2024
4f81a66
Merge branch 'dnnsoftware:develop' into develop
thienvc Dec 26, 2024
925aebd
Merge branch 'develop' of https://github.com/thienvc/Dnn.Platform int…
thienvc Jan 7, 2026
ee3cab3
Merge branch 'develop' of https://github.com/thienvc/Dnn.Platform int…
thienvc Jan 14, 2026
43b9bc5
Update caniuse database
github-actions[bot] Jan 15, 2026
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,5 @@ yarn-error.log
/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 Platform/Library/DotNetNuke.Library.csproj
/DNN_Platform.sln
194 changes: 97 additions & 97 deletions DNN Platform/Library/DotNetNuke.Library.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootDirectory>$(MSBuildProjectDirectory)\..\..</RootDirectory>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<OutputPath>bin</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AssemblyName>DotNetNuke</AssemblyName>
<RootNamespace>DotNetNuke</RootNamespace>
<TargetFramework>net48</TargetFramework>
<Deterministic>true</Deterministic>
<LangVersion>latest</LangVersion>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<AnalysisMode>Recommended</AnalysisMode>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>CS0618,SA1600,CA5350,CA5351</WarningsNotAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AngleSharp" />
<PackageReference Include="AngleSharp.Css" />
<PackageReference Include="BouncyCastle.Cryptography" />
<PackageReference Include="HtmlSanitizer" />
<PackageReference Include="MailKit" />
<PackageReference Include="Microsoft.AspNet.WebPages" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Web.Infrastructure" />
<PackageReference Include="MimeKit" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="PetaPoco.Compiled" />
<PackageReference Include="Portable.BouncyCastle" />
<PackageReference Include="QuickIO.NET" />
<PackageReference Include="SharpZipLib" />
<PackageReference Include="StyleCop.Analyzers">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Collections.Immutable" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Design" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Services" />
</ItemGroup>
<ItemGroup>
<Reference Include="DotNetNuke.WebControls">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Controls\DotNetNuke.WebControls\bin\DotNetNuke.WebControls.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net">
<HintPath>..\Components\Lucene.Net\bin\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net.Contrib.FastVectorHighlighter">
<HintPath>..\Components\Lucene.Net.Contrib\bin\Lucene.Net.Contrib.FastVectorHighlighter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Components\DataAccessBlock\bin\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Internal.SourceGenerators\DotNetNuke.Internal.SourceGenerators.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
<ProjectReference Include="..\Controls\CountryListBox\CountryListBox.csproj" />
<ProjectReference Include="..\DotNetNuke.Abstractions\DotNetNuke.Abstractions.csproj" />
<ProjectReference Include="..\DotNetNuke.DependencyInjection\DotNetNuke.DependencyInjection.csproj" />
<ProjectReference Include="..\DotNetNuke.Instrumentation\DotNetNuke.Instrumentation.csproj" />
<ProjectReference Include="..\DotNetNuke.Log4net\DotNetNuke.Log4Net.csproj" />
<ProjectReference Include="..\DotNetNuke.Web.Client.ResourceManager\DotNetNuke.Web.Client.ResourceManager.csproj" />
<ProjectReference Include="..\DotNetNuke.Web.Client\DotNetNuke.Web.Client.csproj" />
<ProjectReference Include="..\DotNetNuke.WebUtility\DotNetNuke.WebUtility.vbproj" />
<ProjectReference Include="..\Syndication\DotNetNuke.Syndication.csproj" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
<Compile Include="..\..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootDirectory>$(MSBuildProjectDirectory)\..\..</RootDirectory>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<OutputPath>bin</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AssemblyName>DotNetNuke</AssemblyName>
<RootNamespace>DotNetNuke</RootNamespace>
<TargetFramework>net48</TargetFramework>
<Deterministic>true</Deterministic>
<LangVersion>latest</LangVersion>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<AnalysisMode>Recommended</AnalysisMode>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>CS0618,SA1600,CA5350,CA5351</WarningsNotAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AngleSharp" />
<PackageReference Include="AngleSharp.Css" />
<PackageReference Include="BouncyCastle.Cryptography" />
<PackageReference Include="HtmlSanitizer" />
<PackageReference Include="MailKit" />
<PackageReference Include="Microsoft.AspNet.WebPages" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Web.Infrastructure" />
<PackageReference Include="MimeKit" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="PetaPoco.Compiled" />
<PackageReference Include="Portable.BouncyCastle" />
<PackageReference Include="QuickIO.NET" />
<PackageReference Include="SharpZipLib" />
<PackageReference Include="StyleCop.Analyzers">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Collections.Immutable" />
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Design" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Services" />
</ItemGroup>

<ItemGroup>
<Reference Include="DotNetNuke.WebControls">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Controls\DotNetNuke.WebControls\bin\DotNetNuke.WebControls.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net">
<HintPath>..\Components\Lucene.Net\bin\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net.Contrib.FastVectorHighlighter">
<HintPath>..\Components\Lucene.Net.Contrib\bin\Lucene.Net.Contrib.FastVectorHighlighter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Components\DataAccessBlock\bin\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Internal.SourceGenerators\DotNetNuke.Internal.SourceGenerators.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
<ProjectReference Include="..\Controls\CountryListBox\CountryListBox.csproj" />
<ProjectReference Include="..\DotNetNuke.Abstractions\DotNetNuke.Abstractions.csproj" />
<ProjectReference Include="..\DotNetNuke.DependencyInjection\DotNetNuke.DependencyInjection.csproj" />
<ProjectReference Include="..\DotNetNuke.Instrumentation\DotNetNuke.Instrumentation.csproj" />
<ProjectReference Include="..\DotNetNuke.Log4net\DotNetNuke.Log4Net.csproj" />
<ProjectReference Include="..\DotNetNuke.Web.Client.ResourceManager\DotNetNuke.Web.Client.ResourceManager.csproj" />
<ProjectReference Include="..\DotNetNuke.Web.Client\DotNetNuke.Web.Client.csproj" />
<ProjectReference Include="..\DotNetNuke.WebUtility\DotNetNuke.WebUtility.vbproj" />
<ProjectReference Include="..\Syndication\DotNetNuke.Syndication.csproj" />
</ItemGroup>

<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
<Compile Include="..\..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions DNN Platform/Library/Services/Localization/ILocalizationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public interface ILocalizationProvider

string GetString(string key, string resourceFileRoot, string language, PortalSettings portalSettings, bool disableShowMissingKeys);

string GetString(string key, string resourceFileRoot, string language, PortalSettings portalSettings, bool disableShowMissingKeys, out bool keyFound);

/// <summary>Saves a string to a resource file.</summary>
/// <param name="key">The key to save (e.g. "MyWidget.Text").</param>
/// <param name="value">The text value for the key.</param>
Expand Down
14 changes: 14 additions & 0 deletions DNN Platform/Library/Services/Localization/Localization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,20 @@ public static string GetString(string key, string resourceFileRoot, PortalSettin
return LocalizationProvider.Instance.GetString(key, resourceFileRoot, language, portalSettings, disableShowMissingKeys);
}

/// <overloads>One of six overloads.</overloads>
/// <summary>GetString gets the localized string corresponding to the <paramref name="key"/>.</summary>
/// <param name="key">The resource key to find.</param>
/// <param name="resourceFileRoot">The Local Resource root.</param>
/// <param name="portalSettings">The current portals Portal Settings.</param>
/// <param name="language">A specific language to lookup the string.</param>
/// <param name="disableShowMissingKeys">Disables the show missing keys flag.</param>
/// <param name="keyFound">Returns whether a ResourceKey exists in the ResourceFile.</param>
/// <returns>The localized Text.</returns>
public static string GetString(string key, string resourceFileRoot, PortalSettings portalSettings, string language, bool disableShowMissingKeys, out bool keyFound)
{
return LocalizationProvider.Instance.GetString(key, resourceFileRoot, language, portalSettings, disableShowMissingKeys, out keyFound);
}

/// <summary>GetStringUrl gets the localized string corresponding to the <paramref name="key"/>.</summary>
/// <param name="key">The resource key to find.</param>
/// <param name="resourceFileRoot">The Local Resource root.</param>
Expand Down
8 changes: 7 additions & 1 deletion DNN Platform/Library/Services/Localization/LocalizationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ public string GetString(string key, string resourceFileRoot, string language, Po

/// <inheritdoc/>
public string GetString(string key, string resourceFileRoot, string language, PortalSettings portalSettings, bool disableShowMissingKeys)
{
return this.GetString(key, resourceFileRoot, language, portalSettings, disableShowMissingKeys, out _);
}

/// <inheritdoc/>
public string GetString(string key, string resourceFileRoot, string language, PortalSettings portalSettings, bool disableShowMissingKeys, out bool keyFound)
{
// make the default translation property ".Text"
if (key.IndexOf(".", StringComparison.Ordinal) < 1)
Expand All @@ -67,7 +73,7 @@ public string GetString(string key, string resourceFileRoot, string language, Po
}

string resourceValue = Null.NullString;
bool keyFound = TryGetStringInternal(key, language, resourceFileRoot, portalSettings, ref resourceValue);
keyFound = TryGetStringInternal(key, language, resourceFileRoot, portalSettings, ref resourceValue);

// If the key can't be found then it doesn't exist in the Localization Resources
if (Localization.ShowMissingKeys && !disableShowMissingKeys)
Expand Down
Loading