Skip to content

Commit 58dcd34

Browse files
malimingmaliming
authored
Merge branch 'dev' into docs-pdf
2 parents 2027579 + 93d215a commit 58dcd34

File tree

58 files changed

+166
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+166
-122
lines changed

‎Directory.Packages.props‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@
3737
<PackageVersion Include="itext.bouncy-castle-adapter" Version="9.1.0" />
3838
<PackageVersion Include="itext7" Version="9.1.0" />
3939
<PackageVersion Include="itext7.pdfhtml" Version="6.1.0" />
40-
<PackageVersion Include="EphemeralMongo.Core" Version="2.0.0" />
41-
<PackageVersion Include="EphemeralMongo6.runtime.linux-x64" Version="2.0.0" />
42-
<PackageVersion Include="EphemeralMongo6.runtime.osx-x64" Version="1.1.3" />
43-
<PackageVersion Include="EphemeralMongo6.runtime.win-x64" Version="2.0.0" />
44-
<PackageVersion Include="MongoSandbox.Core" Version="1.0.1" />
45-
<PackageVersion Include="MongoSandbox6.runtime.linux-x64" Version="1.0.1" />
46-
<PackageVersion Include="MongoSandbox6.runtime.osx-x64" Version="1.0.1" />
47-
<PackageVersion Include="MongoSandbox6.runtime.win-x64" Version="1.0.1" />
40+
<PackageVersion Include="MongoSandbox.Core" Version="2.0.0" />
41+
<PackageVersion Include="MongoSandbox8.runtime.linux-x64" Version="2.0.0" />
42+
<PackageVersion Include="MongoSandbox8.runtime.osx-arm64" Version="2.0.0" />
43+
<PackageVersion Include="MongoSandbox8.runtime.win-x64" Version="2.0.0" />
4844
<PackageVersion Include="FluentValidation" Version="11.11.0" />
4945
<PackageVersion Include="Google.Cloud.Storage.V1" Version="4.13.0" />
5046
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.18" />

‎abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1889,6 +1889,6 @@
18891889
"FaqIyzicoPaymentIssuesExplanation8": "ABP website doesn't save or process your credit card. We use payment gateways for this and the entire transaction is handled by payment gateways. We have no authority to interfere with the payment process or fix the payment steps. If you have further questions or need additional support, feel free to contact us at <a href='https://abp.io/contact'>abp.io/contact</a>.",
18901890
"BiographyContainsUrlValidationMessage": "Biography cannot contain URL.",
18911891
"CreatePostSEOTitleInfo": "SEO URL is a clean, readable, keyword-rich URL that helps both users and search engines understand what this post is about. Keep it short with 60 characters. SEO titles over 60 characters will be truncated. Use hyphens (-) to separate words (not underscores). Include target keywords near the start. Lowercase only. No stop words unless needed (e.g: \"and\", \"or\", \"the\").",
1892-
"SEOTitle": "SEO Title"
1892+
"SEOTitle": "SEO URL"
18931893
}
18941894
}

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ public class AbpInputTagHelper : AbpTagHelper<AbpInputTagHelper, AbpInputTagHelp
4747
public bool SuppressLabel { get; set; }
4848

4949
[HtmlAttributeName("floating-label")]
50-
5150
public bool FloatingLabel { get; set; }
5251

5352
public CheckBoxHiddenInputRenderMode? CheckBoxHiddenInputRenderMode { get; set; }
5453

54+
[HtmlAttributeName("use-switch-checkbox")]
55+
public bool UseSwitchCheckBox { get; set; } = false;
56+
5557
public bool AddMarginBottomClass { get; set; } = true;
5658

5759
public AbpInputTagHelper(AbpInputTagHelperService tagHelperService)

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,16 @@ out var suppress
6666
}
6767
if (isCheckBox)
6868
{
69-
output.Attributes.AddClass("custom-checkbox");
70-
output.Attributes.AddClass("custom-control");
69+
if (!TagHelper.UseSwitchCheckBox)
70+
{
71+
output.Attributes.AddClass("custom-checkbox");
72+
output.Attributes.AddClass("custom-control");
73+
}
74+
else
75+
{
76+
output.Attributes.AddClass("form-switch");
77+
}
78+
7179
output.Attributes.AddClass("form-check");
7280
}
7381
}
@@ -266,7 +274,7 @@ protected virtual bool IsInputCheckbox(TagHelperContext context, TagHelperOutput
266274
}
267275

268276
protected virtual async Task<string> GetLabelAsHtmlAsync(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag, bool isCheckbox)
269-
{
277+
{
270278
if (IsOutputHidden(inputTag) || TagHelper.SuppressLabel)
271279
{
272280
return string.Empty;
@@ -395,7 +403,7 @@ protected virtual async Task<string> GetLabelAsHtmlUsingTagHelperAsync(TagHelper
395403
}
396404
innerOutput.Content.AppendHtml($" <i class=\"{iconClass}\"></i>");
397405
}
398-
406+
399407
innerOutput.Content.AppendHtml(GetRequiredSymbol(context, output));
400408

401409
return innerOutput.Render(_encoder);

‎framework/src/Volo.Abp.Localization/Volo/Abp/Localization/VirtualFiles/VirtualFileLocalizationResourceContributorBase.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private Dictionary<string, ILocalizationDictionary> CreateDictionaries()
103103
{
104104
continue;
105105
}
106-
106+
107107
if (dictionaries.ContainsKey(dictionary.CultureName))
108108
{
109109
throw new AbpException($"{file.GetVirtualOrPhysicalPathOrNull()} dictionary has a culture name '{dictionary.CultureName}' which is already defined! Localization resource: {_resource.ResourceName}");
@@ -121,7 +121,14 @@ private Dictionary<string, ILocalizationDictionary> CreateDictionaries()
121121
{
122122
using (var stream = file.CreateReadStream())
123123
{
124-
return CreateDictionaryFromFileContent(Utf8Helper.ReadStringFromStream(stream));
124+
try
125+
{
126+
return CreateDictionaryFromFileContent(Utf8Helper.ReadStringFromStream(stream));
127+
}
128+
catch (Exception e)
129+
{
130+
throw new AbpException("Invalid localization file format: " + (file.GetVirtualOrPhysicalPathOrNull() ?? file.Name), e);
131+
}
125132
}
126133
}
127134

‎framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="MongoSandbox.Core" />
19-
<PackageReference Include="MongoSandbox6.runtime.linux-x64" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
20-
<PackageReference Include="MongoSandbox6.runtime.osx-x64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
21-
<PackageReference Include="MongoSandbox6.runtime.win-x64" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
19+
<PackageReference Include="MongoSandbox8.runtime.linux-x64" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
20+
<PackageReference Include="MongoSandbox8.runtime.osx-arm64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
21+
<PackageReference Include="MongoSandbox8.runtime.win-x64" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2323
</ItemGroup>
2424

‎modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1717
<PackageReference Include="MongoSandbox.Core" />
18-
<PackageReference Include="MongoSandbox6.runtime.linux-x64" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
19-
<PackageReference Include="MongoSandbox6.runtime.osx-x64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
20-
<PackageReference Include="MongoSandbox6.runtime.win-x64" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
18+
<PackageReference Include="MongoSandbox8.runtime.linux-x64" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
19+
<PackageReference Include="MongoSandbox8.runtime.osx-arm64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
20+
<PackageReference Include="MongoSandbox8.runtime.win-x64" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
2121
</ItemGroup>
2222

2323
</Project>

‎modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1717
<PackageReference Include="MongoSandbox.Core" />
18-
<PackageReference Include="MongoSandbox6.runtime.linux-x64" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
19-
<PackageReference Include="MongoSandbox6.runtime.osx-x64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
20-
<PackageReference Include="MongoSandbox6.runtime.win-x64" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
18+
<PackageReference Include="MongoSandbox8.runtime.linux-x64" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
19+
<PackageReference Include="MongoSandbox8.runtime.osx-arm64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
20+
<PackageReference Include="MongoSandbox8.runtime.win-x64" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
2121
</ItemGroup>
2222

2323
</Project>

‎modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<meta charset="utf-8">
3636
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
3737
<meta http-equiv="X-UA-Compatible" content="ie=edge">
38+
<link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">
3839
@if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())
3940
{
4041
<base href="@ThemingOptions.Value.BaseUrl" />

‎modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<meta charset="utf-8">
4545
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
4646
<meta http-equiv="X-UA-Compatible" content="ie=edge">
47+
<link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">
4748
@if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())
4849
{
4950
<base href="@ThemingOptions.Value.BaseUrl" />

0 commit comments

Comments
 (0)