Merge branch 'dev' into OrganizationUnitEto

docs/en/UI/Blazor/Pwa-Configuration.md

@@ -59,7 +59,7 @@ First, you need to create a JSON file named **manifest.json** under the **wwwroo
 
 You can add some icons for your application to be seen in specific screen sizes and define in which screen sizes icons should be displayed in the **manifest.json** file. You can see the **icons** section in the **manifest.json** file as an example above.
 
-> You can use, default icons from our [template](https://github.com/abpframework/abp/tree/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot).
+> You can use, default icons from our [template](https://github.com/abpframework/abp/tree/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/wwwroot).
 
 ### 3-) Configure Service Workers
 
@@ -67,7 +67,7 @@ You can add some icons for your application to be seen in specific screen sizes
 
 You need to create `service-worker.js` and `service-worker.published.js` files under the **wwwroot** folder of your project. These files will be used by your project to determine which PWA features you want to use.
 
-You can get the simple configurations for the [service-worker.js](https://github.com/abpframework/abp/blob/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/service-worker.js) and [service-worker.published.js](https://github.com/abpframework/abp/blob/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/service-worker.published.js) files from our [template](https://github.com/abpframework/abp/tree/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot).
+You can get the simple configurations for the [service-worker.js](https://github.com/abpframework/abp/tree/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/wwwroot/service-worker.js) and [service-worker.published.js](https://github.com/abpframework/abp/tree/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/wwwroot/service-worker.published.js) files from our [template](https://github.com/abpframework/abp/tree/dev/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/wwwroot).
 
 After the related service worker files are added, then we need to define them in our `.csproj` file to notify our application. So open your `*.csproj` file and add the following content:
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs

@@ -32,7 +32,7 @@ public class AbpCardBodyTagHelperService : AbpTagHelperService<AbpCardBodyTagHel
         if (!TagHelper.Subtitle.IsNullOrWhiteSpace())
         {
             var cardSubtitle = new TagBuilder(AbpCardSubtitleTagHelper.DefaultHeading.ToHtmlTag());
-            cardSubtitle.AddCssClass("card-subtitle text-muted mb-2");
+            cardSubtitle.AddCssClass("card-subtitle mb-2");
             cardSubtitle.InnerHtml.AppendHtml(TagHelper.Subtitle!);
             output.PreContent.AppendHtml(cardSubtitle);
         }

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

@@ -250,7 +250,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
 
         var small = new TagBuilder("small");
         small.Attributes.Add("id", idAttr?.Value?.ToString() + "InfoText");
-        small.AddCssClass("form-text text-muted");
+        small.AddCssClass("form-text");
         small.InnerHtml.Append(localizedText);
 
         return small.ToHtmlString();

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs

@@ -108,7 +108,7 @@ public class ExceptionTestController_Tests : AspNetCoreMvcTestBase
 
         var result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>("/api/exception-test/ExceptionOnUowSaveChange", HttpStatusCode.Conflict);
         result.Error.ShouldNotBeNull();
-        result.Error.Message.ShouldBe("The data you have submitted has already changed by another user/client. Please discard the changes you've done and try from the beginning.");
+        result.Error.Message.ShouldBe("The data you have submitted has already been changed by another user. Discard your changes and try again.");
 
      #pragma warning disable 4014
                  _fakeExceptionSubscriber

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestPage_Tests.cs

@@ -156,7 +156,7 @@ public class ExceptionTestPage_Tests : AspNetCoreMvcTestBase
 
         var result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>("/api/exception-test/ExceptionOnUowSaveChange", HttpStatusCode.Conflict);
         result.Error.ShouldNotBeNull();
-        result.Error.Message.ShouldBe("The data you have submitted has already changed by another user/client. Please discard the changes you've done and try from the beginning.");
+        result.Error.Message.ShouldBe("The data you have submitted has already been changed by another user. Discard your changes and try again.");
 
 #pragma warning disable 4014
         _fakeExceptionSubscriber