From 5b0c8d89b61ba379b07b03ce16499eecd6821228 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 2 Jul 2024 09:46:19 +0800 Subject: [PATCH 1/4] Remove `text-muted` class. The .text-muted utility has been deprecated as of v5.3.0 --- .../TagHelpers/Card/AbpCardBodyTagHelperService.cs | 2 +- .../TagHelpers/Form/AbpSelectTagHelperService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs index e50d0a791a..b8462f4b5b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs @@ -32,7 +32,7 @@ public class AbpCardBodyTagHelperService : AbpTagHelperService 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(); From 28b3634fe7bf94e9f4078fa52084815861a420d1 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 2 Jul 2024 10:16:30 +0800 Subject: [PATCH 2/4] Fix unit test. --- .../Mvc/ExceptionHandling/ExceptionTestController_Tests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs index 1b79441de8..40fb77c432 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs +++ b/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("/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 From a9d469a42f060e1f8b9ae31dfd906eaa6d2ee391 Mon Sep 17 00:00:00 2001 From: maliming <6908465+maliming@users.noreply.github.com> Date: Tue, 2 Jul 2024 10:46:06 +0800 Subject: [PATCH 3/4] Update ExceptionTestPage_Tests.cs --- .../AspNetCore/Mvc/ExceptionHandling/ExceptionTestPage_Tests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestPage_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestPage_Tests.cs index 48ccf6499f..c5bce679a0 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestPage_Tests.cs +++ b/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("/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 From 3ac6da34186f1d6d5b99792e121fc76d128f7549 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Tue, 2 Jul 2024 08:19:50 +0300 Subject: [PATCH 4/4] Update Pwa-Configuration.md --- docs/en/UI/Blazor/Pwa-Configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/UI/Blazor/Pwa-Configuration.md b/docs/en/UI/Blazor/Pwa-Configuration.md index c687d040ef..01ba497a52 100644 --- a/docs/en/UI/Blazor/Pwa-Configuration.md +++ b/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: