Merge branch 'dev' into salihozkara/abpUnited

docs/en/Testing.md

@@ -719,6 +719,37 @@ We've used the `IUnitOfWorkManager` service to create a unit of work scope, then
 
 > Note that we've tested the `FirstOrDefaultAsync` to demonstrate the unit of work problem. Normally, as a good principle, you should write tests only your own code.
 
+You could also use `WithUnitOfWorkAsync` to achieve the same functionality instead of writing the same using block in your tests.
+
+Here is the same test scenario using `WithUnitOfWorkAsync`:
+
+````csharp
+public abstract class IssueRepository_Tests<TStartupModule> : MyProjectDomainTestBase<TStartupModule>
+    where TStartupModule : IAbpModule
+{
+    private readonly IRepository<Issue, Guid> _issueRepository;
+    private readonly IUnitOfWorkManager _unitOfWorkManager;
+
+    protected IssueRepository_Tests()
+    {
+        _issueRepository = GetRequiredService<IRepository<Issue, Guid>>();
+        _unitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
+    }
+
+    public async Task Should_Query_By_Title()
+    {
+        await WithUnitOfWorkAsync(() =>
+        {
+            IQueryable<Issue> queryable = await _issueRepository.GetQueryableAsync();
+            var issue = queryable.FirstOrDefaultAsync(i => i.Title == "My issue title");
+            issue.ShouldNotBeNull();
+        });
+    }
+}
+````
+
+There are multiple overloads of the `WithUnitOfWorkAsync` method that you can use based on your specific needs.
+
 ### Working with DbContext
 
 In some cases, you may want to directory work with the Entity Framework's `DbContext` object to perform database operations in your test methods. In this case, you can use `IDbContextProvider<T>`service to obtain a `DbContext` instance inside a unit of work.

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

@@ -111,7 +111,7 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
             inputHtml + label :
             label + inputHtml;
 
-        return innerContent + infoHtml + validation;
+        return innerContent + validation + infoHtml;
     }
 
     protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml, bool isCheckbox)

framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.Json;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 using Volo.Abp;
@@ -352,64 +353,7 @@ public static class AbpStringExtensions
     /// <returns></returns>
     public static string ToSnakeCase(this string str)
     {
-        if (string.IsNullOrWhiteSpace(str))
-        {
-            return str;
-        }
-
-        var builder = new StringBuilder(str.Length + Math.Min(2, str.Length / 5));
-        var previousCategory = default(UnicodeCategory?);
-
-        for (var currentIndex = 0; currentIndex < str.Length; currentIndex++)
-        {
-            var currentChar = str[currentIndex];
-            if (currentChar == '_')
-            {
-                builder.Append('_');
-                previousCategory = null;
-                continue;
-            }
-
-            var currentCategory = char.GetUnicodeCategory(currentChar);
-            switch (currentCategory)
-            {
-                case UnicodeCategory.UppercaseLetter:
-                case UnicodeCategory.TitlecaseLetter:
-                    if (previousCategory == UnicodeCategory.SpaceSeparator ||
-                        previousCategory == UnicodeCategory.LowercaseLetter ||
-                        previousCategory != UnicodeCategory.DecimalDigitNumber &&
-                        previousCategory != null &&
-                        currentIndex > 0 &&
-                        currentIndex + 1 < str.Length &&
-                        char.IsLower(str[currentIndex + 1]))
-                    {
-                        builder.Append('_');
-                    }
-
-                    currentChar = char.ToLower(currentChar);
-                    break;
-
-                case UnicodeCategory.LowercaseLetter:
-                case UnicodeCategory.DecimalDigitNumber:
-                    if (previousCategory == UnicodeCategory.SpaceSeparator)
-                    {
-                        builder.Append('_');
-                    }
-                    break;
-
-                default:
-                    if (previousCategory != null)
-                    {
-                        previousCategory = UnicodeCategory.SpaceSeparator;
-                    }
-                    continue;
-            }
-
-            builder.Append(currentChar);
-            previousCategory = currentCategory;
-        }
-
-        return builder.ToString();
+        return str.IsNullOrWhiteSpace() ? str : JsonNamingPolicy.SnakeCaseLower.ConvertName(str);
     }
 
     /// <summary>