diff --git a/Directory.Build.props b/Directory.Build.props
index dea0a6c6f7..d888f2a60a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,16 +2,16 @@
- 5.0.0
+ 5.0.*
- 16.6.1
+ 16.8.34.2.2
- 3.0.2
+ 4.0.12.4.1
@@ -20,7 +20,7 @@
2.4.1
- 2.4.2
+ 2.4.32.2.14
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
index 6e3c1df3ce..32d3c16a01 100644
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
@@ -194,6 +194,9 @@
"CoverImage": "Cover Image",
"RemoveCacheConfirmationMessage": "Are you sure you remove the cache for \"{0}\" article?",
"SuccessfullyRemoved": "Successfully cleared",
- "RemoveCache": "Remove Cache"
+ "RemoveCache": "Remove Cache",
+ "Language": "Language",
+ "Optional": "Optional",
+ "CreateArticleLanguageInfo": "The language in which the article is written"
}
}
\ No newline at end of file
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json
index b7f7cb41a5..9ac7e39b9e 100644
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json
@@ -156,6 +156,9 @@
"RemainingQuestionCount": "Kalan soru sayısı",
"TotalQuestionMustBeGreaterWarningMessage": "Toplam soru sayısı kalan soru sayısından büyük olmalıdır!",
"QuestionCountsMustBeGreaterThanZero": "Toplam soru sayısı ve kalan soru sayısı sıfır veya sıfırdan daha büyük olmalıdır!",
- "UnlimitedQuestionCount": "Sınırsız soru sayısı"
+ "UnlimitedQuestionCount": "Sınırsız soru sayısı",
+ "Language": "Dil",
+ "Optional": "Opsiyonel",
+ "CreateArticleLanguageInfo": "Makalenin yazıldığı dil"
}
}
\ No newline at end of file
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
index e029499b06..c6eb1ad645 100644
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
@@ -32,6 +32,8 @@
"MyProfile": "My profile",
"EmailNotValid": "Please enter a valid email address.",
"JoinOurMarketingNewsletter": "Join our marketing newsletter",
- "WouldLikeToReceiveMarketingMaterials": "I would like to receive marketing materials like product deals & special offers."
+ "WouldLikeToReceiveMarketingMaterials": "I would like to receive marketing materials like product deals & special offers.",
+ "StartUsingYourLicenseNow": "Start using your license now!",
+ "WelcomePage": "Welcome Page"
}
}
\ No newline at end of file
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json
index c570e6fb1e..a29355b401 100644
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json
@@ -99,6 +99,8 @@
"Marketing": "Marketing",
"CommunityPrivacyPolicyConfirmation": "I agree to the Terms & Conditions and Privacy Policy.",
"ArticleRequestMessageTitle": "Open an issue on the GitHub to request an article/tutorial you want to see on this web site.",
- "ArticleRequestMessageBody": "Here, the list of the requested articles by the community. Do you want to write a requested article? Please click to the request and join to the discussion."
+ "ArticleRequestMessageBody": "Here, the list of the requested articles by the community. Do you want to write a requested article? Please click to the request and join to the discussion.",
+ "Language": "Language",
+ "CreateArticleLanguageInfo": "The language in which the article is written"
}
}
diff --git a/common.props b/common.props
index 1528abbcc6..dee2c22cdc 100644
--- a/common.props
+++ b/common.props
@@ -9,8 +9,16 @@
githttps://github.com/abpframework/abp/true
+
+
+ true
+ snupkg
+
-
+
+ all
+ runtime; build; native; contentfiles; analyzers
+
\ No newline at end of file
diff --git a/docs/en/Authorization.md b/docs/en/Authorization.md
index bceca3548f..fbb71bb3d4 100644
--- a/docs/en/Authorization.md
+++ b/docs/en/Authorization.md
@@ -280,21 +280,11 @@ public async Task CreateAsync(CreateAuthorDto input)
## Check a Permission in JavaScript
-You may need to check a policy/permission on the client side.
+See the following documents to learn how to re-use the authorization system on the client side:
-### MVC UI
-
-For ASP.NET Core MVC / Razor Pages applications, you can use the `abp.auth` API.
-
-**Example: Check if a given permission has been granted for the current user**
-
-```js
-abp.auth.isGranted('MyPermissionName');
-```
-
-### Angular UI
-
-See the [permission management document](UI/Angular/Permission-Management.md) for the Angular UI.
+* [ASP.NET Core MVC / Razor Pages UI: Authorization](UI/AspNetCore/JavaScript-API/Auth.md)
+* [Angular UI Authorization](UI/Angular/Permission-Management.md)
+* [Blazor UI Authorization](UI/Blazor/Authorization.md)
## Permission Management
diff --git a/docs/en/Blog-Posts/2020-12-18 v4_1_Preview/POST.md b/docs/en/Blog-Posts/2020-12-18 v4_1_Preview/POST.md
new file mode 100644
index 0000000000..c504b7068f
--- /dev/null
+++ b/docs/en/Blog-Posts/2020-12-18 v4_1_Preview/POST.md
@@ -0,0 +1,79 @@
+# ABP Framework 4.1 RC Has Been Published
+
+Today, we have released the [ABP Framework](https://abp.io/) (and the [ABP Commercial](https://commercial.abp.io/)) 4.1.0 RC. This blog post introduces the new features, important changes in the new version.
+
+> **The planned release date for the [4.1.0 final](https://github.com/abpframework/abp/milestone/47) version is January 4, 2021**.
+
+## Get Started with the 4.1 RC
+
+If you want to try the version `4.1.0` today, follow the steps below;
+
+1) **Upgrade** the ABP CLI to the version `4.1.0-rc.1` using a command line terminal:
+
+````bash
+dotnet tool update Volo.Abp.Cli -g --version 4.1.0-rc.1
+````
+
+**or install** if you haven't installed before:
+
+````bash
+dotnet tool install Volo.Abp.Cli -g --version 4.1.0-rc.1
+````
+
+2) Create a **new application** with the `--preview` option:
+
+````bash
+abp new BookStore --preview
+````
+
+See the [ABP CLI documentation](https://docs.abp.io/en/abp/3.3/CLI) for all the available options.
+
+> You can also use the *Direct Download* tab on the [Get Started](https://abp.io/get-started) page by selecting the **Preview checkbox**.
+
+## What's new with the ABP Framework 4.1
+
+TODO
+
+## What's new with the ABP Commercial 4.0
+
+TODO
+
+## Other News
+
+### ABP Community Contents
+
+A lot of new contents have been published in the ABP Community Web Site in the last two weeks:
+
+* [Using DevExpress Blazor UI Components With the ABP Framework](https://community.abp.io/articles/using-devexpress-blazor-ui-components-with-the-abp-framework-wrpoa8rw) by [@berkansasmaz](https://github.com/berkansasmaz)
+* [Creating a new UI theme by copying the Basic Theme (for MVC UI)](https://community.abp.io/articles/creating-a-new-ui-theme-by-copying-the-basic-theme-for-mvc-ui-yt9b18io) by [@ebubekirdinc](https://github.com/ebubekirdinc)
+* [Using Angular Material Components With the ABP Framework](https://community.abp.io/members/muhammedaltug) by [@muhammedaltug](https://github.com/muhammedaltug)
+* [How to export Excel files from the ABP framework](https://community.abp.io/articles/how-to-export-excel-files-from-the-abp-framework-wm7nnw3n) by [bartvanhoey](https://github.com/bartvanhoey)
+* [Creating an Event Organizer Application with the ABP Framework & Blazor UI](https://community.abp.io/articles/creating-an-event-organizer-application-with-the-blazor-ui-wbe0sf2z) by [@hikalkan](https://github.com/hikalkan)
+
+Thanks to all of the contributors. We are waiting for your contributions too. If you want to create content for the ABP Community, please visit [community.abp.io](https://community.abp.io/) website and submit your article.
+
+#### Be a Superhero on Day 1 with ABP.IO
+
+Thanks to [@lprichar](http://github.com/lprichar) prepared an awesome introduction video for the ABP.IO Platform: "[Be a Superhero on Day 1 with ABP.IO](https://www.youtube.com/watch?v=ea0Zx9DLcGA)".
+
+#### New Sample Application: Event Organizer
+
+This is a new example application developed using the ABP Framework and the Blazor UI. See [this article](https://community.abp.io/articles/creating-an-event-organizer-application-with-the-blazor-ui-wbe0sf2z) for a step by step implementation guide.
+
+
+
+### Github Discussions
+
+We enabled the [GitHub Discussions for the abp repository](https://github.com/abpframework/abp/discussions) as another place to discuss ideas or get help for the ABP Framework. The ABP core team is spending time participating in discussions and answering to questions as much as possible.
+
+## About the Next Release(s)
+
+Beginning from the next version (4.2.0), we are starting to spend more effort on the **CMS Kit module**. The purpose of this module is to provide CMS primitives (e.g. **comments, tags, reactions, contents**...) and features (e.g. **blog, pages, surveys**) as pre-built and reusable components. Current blog module will be a part of the CMS Kit module. We will continue to prepare documents, guides, tutorials and examples. And surely, we will continue to make enhancements and optimizations on the current features.
+
+> The planned preview release date for the version 4.2.0 is January 14, 2021 and the final (stable) version release date is January 28, 2021.
+
+Follow the [GitHub milestones](https://github.com/abpframework/abp/milestones) for all the planned ABP Framework version release dates.
+
+## Feedback
+
+Please check out the ABP Framework 4.1.0 RC and [provide feedback](https://github.com/abpframework/abp/issues/new) to help us to release a more stable version. **The planned release date for the [4.1.0 final](https://github.com/abpframework/abp/milestone/45) version is January 4, 2021.**.
diff --git a/docs/en/Blog-Posts/2020-12-18 v4_1_Preview/event-list-ui.png b/docs/en/Blog-Posts/2020-12-18 v4_1_Preview/event-list-ui.png
new file mode 100644
index 0000000000..4f049c2339
Binary files /dev/null and b/docs/en/Blog-Posts/2020-12-18 v4_1_Preview/event-list-ui.png differ
diff --git a/docs/en/CLI.md b/docs/en/CLI.md
index d51dd91b5d..c5eb38bbbe 100644
--- a/docs/en/CLI.md
+++ b/docs/en/CLI.md
@@ -129,6 +129,7 @@ abp update [options]
* `--solution-path` or `-sp`: Specify the solution path. Use the current directory by default
* `--solution-name` or `-sn`: Specify the solution name. Search `*.sln` files in the directory by default.
* `--check-all`: Check the new version of each package separately. Default is `false`.
+* `--version` or `-v`: Specifies the version to use for update. If not specified, latest version is used.
### add-package
diff --git a/docs/en/Community-Articles/2020-04-27-Use-Azure-Active-Directory-Authentication-for-MVC-Razor-Page-Applications/POST.md b/docs/en/Community-Articles/2020-04-27-Use-Azure-Active-Directory-Authentication-for-MVC-Razor-Page-Applications/POST.md
index c7b0258d55..417fa7da3e 100644
--- a/docs/en/Community-Articles/2020-04-27-Use-Azure-Active-Directory-Authentication-for-MVC-Razor-Page-Applications/POST.md
+++ b/docs/en/Community-Articles/2020-04-27-Use-Azure-Active-Directory-Authentication-for-MVC-Razor-Page-Applications/POST.md
@@ -6,9 +6,9 @@ Adding Azure Active Directory is pretty straightforward in ABP framework. Couple
Two different **alternative approaches** for AzureAD integration will be demonstrated for better coverage.
-1. **AddAzureAD**: This approach uses Microsoft [AzureAD UI nuget package](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.AzureAD.UI/) which is very popular when users search the web about how to integrate AzureAD to their web application.
-
+1. ~~**AddAzureAD**: This approach uses Microsoft [AzureAD UI nuget package](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.AzureAD.UI/) which is very popular when users search the web about how to integrate AzureAD to their web application.~~ Now marked **Obsolete** (see https://github.com/aspnet/Announcements/issues/439).
2. **AddOpenIdConnect**: This approach uses default [OpenIdConnect](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.OpenIdConnect/) which can be used for not only AzureAD but for all OpenId connections.
+3. **AddMicrosoftIdentityWebAppAuthentication:** This approach uses newly introduced [Microsoft.Identity.Web nuget package](https://www.nuget.org/packages/Microsoft.Identity.Web/) to replace AddAzureAD.
> There is **no difference** in functionality between these approaches. AddAzureAD is an abstracted way of OpenIdConnection ([source](https://github.com/dotnet/aspnetcore/blob/c56aa320c32ee5429d60647782c91d53ac765865/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs#L122)) with predefined cookie settings.
>
@@ -134,13 +134,50 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
And that's it, integration is completed. Keep on mind that you can connect any other external authentication providers.
+## 3. AddMicrosoftIdentityWebAppAuthentication
+
+With .Net 5.0, AzureAd is marked [obsolute](https://github.com/dotnet/aspnetcore/issues/25807) and will not be supported in the near future. However its expanded functionality is available in [microsoft-identity-web](https://github.com/AzureAD/microsoft-identity-web/wiki) packages.
+
+Add (or replace with) the new nuget package Microsoft.Identity.Web nuget package](https://www.nuget.org/packages/Microsoft.Identity.Web/).
+
+In your **.Web** project; you update the `ConfigureAuthentication` method located in your **ApplicationWebModule** with the following while having the AzureAd appsettings section as defined before:
+
+````csharp
+private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+ {
+ JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+ JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
+ context.Services.AddAuthentication()
+ .AddIdentityServerAuthentication(options =>
+ {
+ options.Authority = configuration["AuthServer:Authority"];
+ options.RequireHttpsMetadata = false;
+ options.ApiName = "Acme.BookStore";
+ });
+
+ context.Services.AddMicrosoftIdentityWebAppAuthentication(
+ configuration: configuration,
+ configSectionName: "AzureAd",
+ openIdConnectScheme:"AzureAD",
+ cookieScheme:null);
+ }
+````
+
+And that's all to add new Microsoft-Identity-Web.
+
+> **Don't forget to:**
+>
+> * Pass **cookieScheme** parameter as **null** or your [*GetExternalLoginInfoAsync* method will always return null](https://github.com/AzureAD/microsoft-identity-web/issues/133#).
+
+Keep in mind that [Microsoft-Identity-Web](https://github.com/AzureAD/microsoft-identity-web) is relatively new and keeps getting new enhancements, features and documentation.
+
## The Source Code
You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization).
# FAQ
-* Help! `GetExternalLoginInfoAsync` returns `null`!
+* Help! `GetExternalLoginInfoAsync` returns `null`! (Using obsolute **AddAzureAD**)
* There can be 2 reasons for this;
@@ -158,6 +195,11 @@ You can find the source code of the completed example [here](https://github.com/
````
+* Help! `GetExternalLoginInfoAsync` returns `null`! (Using **AddMicrosoftIdentityWebAppAuthentication**)
+
+
+ * Pass cookieScheme parameter as **null**. (See [this issue](https://github.com/AzureAD/microsoft-identity-web/issues/133)).
+
* Help! I am getting ***System.ArgumentNullException: Value cannot be null. (Parameter 'userName')*** error!
diff --git a/docs/en/Community-Articles/2020-09-16-How-to-Setup-Azure-Active-Directory-and-Integrate-Abp-Angular-Application/POST.md b/docs/en/Community-Articles/2020-09-16-How-to-Setup-Azure-Active-Directory-and-Integrate-Abp-Angular-Application/POST.md
index b286bb509d..c7f4f40917 100644
--- a/docs/en/Community-Articles/2020-09-16-How-to-Setup-Azure-Active-Directory-and-Integrate-Abp-Angular-Application/POST.md
+++ b/docs/en/Community-Articles/2020-09-16-How-to-Setup-Azure-Active-Directory-and-Integrate-Abp-Angular-Application/POST.md
@@ -1,22 +1,22 @@
-# How to Setup Azure Active Directory and Integrate Abp Angular Application
+# How to Setup Azure Active Directory and Integrate ABP Angular Application
-This guide demonstrates how to register an application to Azure Active Directory and integrate AzureAD to an ABP angular application that enables users to sign in using OAuth 2.0 with credentials from **Azure Active Directory**.
+This guide demonstrates how to register an application to Azure Active Directory and integrate AzureAD to an ABP Angular application that enables users to sign in using OAuth 2.0 with credentials from **Azure Active Directory**.
## Authentication Flow
-Abp angular applications use **Authentication Code with PKCE** (specs [here](https://tools.ietf.org/html/rfc7636)) which is the most suitable flow for spa applications by the time this article is written since implicit flow is deprecated.
+ABP Angular application uses **Authentication Code with PKCE** (specs [here](https://tools.ietf.org/html/rfc7636)) which is the most suitable flow for SPA applications by the time this article is written since implicit flow is deprecated.
The most common question is;
-> Where to put OpenId connection code in angular project?
+> Where to put OpenId connection code in the Angular project?
-The answer is, **you don't**. Abp angular application is integrated with backend code (HttpApi.Host project) where it loads the configurations, **permissions** etc. For none-tiered angular applications, **HttpApi.Host** project also has IdentityServer4 embedded; also serving as **Authorization Server**. Angular application authentication flow is shown below.
+The answer is, **you don't**. ABP Angular application is integrated with the backend (HttpApi.Host project) where it loads the configurations, **permissions** etc. For none-tiered angular applications, **HttpApi.Host** project also has IdentityServer4 embedded; also serving as **Authorization Server**. Angular application authentication flow is shown below.
> What if I want Azure AD as my authorization server and not IdentityServer?
-This means your application will be using AzureAD user store for authentication. By registering both angular app and HttpApi to AzureAD, authentication might work but **authorization won't**. Users need to be registered to Abp identity system for auditing, permissions etc. So the flow should be 3rd party registration.
+This means your application will be using AzureAD user store for authentication. By registering both Angular app and HttpApi to AzureAD, authentication might work but **authorization won't**. Users need to be registered to ABP identity system for auditing, permissions etc. So the flow should be 3rd party registration.
## Setting up OpenId Connection
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/POST.md b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/POST.md
new file mode 100644
index 0000000000..4f2f5556eb
--- /dev/null
+++ b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/POST.md
@@ -0,0 +1,110 @@
+## Using DevExpress Blazor UI Components With the ABP Framework
+
+Hi, in this step by step article, I will show you how to integrate [DevExpress](https://demos.devexpress.com/blazor/) blazor UI components into ABP Framework-based applications.
+
+
+
+*(A screenshot from the example application developed in this article)*
+
+## Create the Project
+
+> ABP Framework offers startup templates to get into business faster.
+
+In this article, I will create a new startup template with EF Core as a database provider and Blazor for UI framework. But if you already have a project with Blazor UI, you don't need to create a new startup template, you can directly implement the following steps to your existing project.
+
+> If you already have a project with the Blazor UI, you can skip this section.
+
+* Before starting to development, we will create a solution named `DevExpressSample` (or whatever you want). We will create a new startup template with EF Core as a database provider and Blazor for UI framework by using [ABP CLI](https://docs.abp.io/en/abp/latest/CLI):
+
+````bash
+abp new DevExpressSample -u blazor
+````
+
+
+
+* Our project boilerplate will be ready after the download is finished. Then, we can open the solution in the Visual Studio (or any other IDE) and run the `DevExpressSample.DbMigrator` to create the database and seed initial data (which creates the admin user, admin role, permissions etc.)
+
+* After database and initial data created,
+* Run the `DevExpressSample.HttpApi.Host` to see our server side working and
+* Run the `DevExpressSample.Blazor` to see our UI working properly.
+
+> _Default login credentials for admin: username is **admin** and password is **1q2w3E\***_
+
+## Install DevExpress
+
+You can follow [this documentation](https://docs.devexpress.com/Blazor/401986/getting-started/install-components-and-create-an-application/without-devexpress-installer/microsoft-templates) to install DevExpress packages into your computer.
+
+> Don't forget to add _"DevExpress NuGet Feed"_ to your **Nuget Package Sources**.
+
+### Adding DevExpress NuGet Packages
+
+Add the `DevExpress.Blazor` NuGet package to the `DevExpressSample.Blazor` project.
+
+```
+Install-Package DevExpress.Blazor
+```
+
+### Register DevExpress Resources
+
+1. Add the following line to the HEAD section of the `wwwroot/index.html` file within the `DevExpressSample.Blazor` project:
+
+ ```Razor
+
+
+
+
+ ```
+
+2. In the `DevExpressSampleBlazorModule` class, call the `AddDevExpressBlazor()` method from your project's `ConfigureServices()` method:
+
+ ```csharp
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ var environment = context.Services.GetSingletonInstance();
+ var builder = context.Services.GetSingletonInstance();
+ // ...
+ builder.Services.AddDevExpressBlazor();
+ }
+ ```
+
+3. Register the **DevExpressSample.Blazor** namespace in the `_Imports.razor` file:
+
+ ```Razor
+ @using DevExpress.Blazor
+ ```
+
+### Result
+
+The installation step was done. You can use any DevExpress Blazor UI component in your application:
+
+Example: A Scheduler:
+
+
+
+This example has been created by following [this documentation](https://demos.devexpress.com/blazor/SchedulerViewTypes).
+
+## The Sample Application
+
+We have created a sample application with [Data Grid](https://docs.devexpress.com/Blazor/DevExpress.Blazor.DxDataGrid-1) example.
+
+### The Source Code
+
+You can download the source code from [here](https://github.com/abpframework/abp-samples/tree/master/DevExpress-Blazor).
+
+The related files for this example are marked in the following screenshots.
+
+
+
+
+
+
+
+### Additional Notes
+
+#### Data Storage
+
+I've used an in-memory list to store data for this example, instead of a real database. Because it is not related to DevExpress usage. There is a `SampleDataService.cs` file in `Data` folder at `DevExpressSample.Application.Contracts` project. All the data is stored here.
+
+## Conclusion
+
+In this article, I've explained how to use [DevExpress](https://www.devexpress.com/blazor/) components in your application. ABP Framework is designed so that it can work with any UI library/framework.
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/both-example-result.png b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/both-example-result.png
new file mode 100644
index 0000000000..cc437ed6e7
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/both-example-result.png differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/cover-image.png b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/cover-image.png
new file mode 100644
index 0000000000..2dc0aed011
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/cover-image.png differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-app-contract.png b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-app-contract.png
new file mode 100644
index 0000000000..536251b7b9
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-app-contract.png differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-application.png b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-application.png
new file mode 100644
index 0000000000..a169b9f9f7
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-application.png differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-blazor.png b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-blazor.png
new file mode 100644
index 0000000000..af1857a4e0
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/data-grid-blazor.png differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/initial-project.png b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/initial-project.png
new file mode 100644
index 0000000000..c2a2af265e
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/initial-project.png differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/sample-appointment.gif b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/sample-appointment.gif
new file mode 100644
index 0000000000..cde15e8f74
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-DevExpress-Blazor-Component/sample-appointment.gif differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md
new file mode 100644
index 0000000000..4bdebb6234
--- /dev/null
+++ b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md
@@ -0,0 +1,534 @@
+# How to Integrate the Telerik Blazor Components to the ABP Blazor UI?
+
+## Introduction
+
+Hi, in this step by step article, we will see how we can integrate the Telerik Blazor Components to our Blazor UI.
+
+## Creating the Solution
+
+> ABP Framework offers startup templates to get into business faster.
+
+In this article, I will create a new startup template with EF Core as a database provider and Blazor for UI framework. But if you already have a project with Blazor UI, you don't need to create a new startup template, you can directly implement the following steps to your existing project.
+
+> If you already have a project with the Blazor UI, you can skip this section.
+
+* Before starting to development, we will create a solution named `TelerikComponents` (or whatever you want). We will create a new startup template with EF Core as a database provider and Blazor for UI framework by using [ABP CLI](https://docs.abp.io/en/abp/latest/CLI):
+
+```bash
+abp new TelerikComponents --ui blazor --database-provider ef
+```
+
+* Our project boilerplate will be ready after the download is finished. Then, we can open the solution in the Visual Studio (or any other IDE) and run the `TelerikComponents.DbMigrator` to create the database and seed initial data (which creates the admin user, admin role, permissions, etc.)
+
+* After the database and initial data created,
+* Run the `TelerikComponents.HttpApi.Host` to see our server-side working and
+* Run the `TelerikComponents.Blazor` to see our UI working.
+
+> _Default login credentials for admin: username is **admin** and password is **1q2w3E\***_
+
+## Starting the Development
+
+### Pre-requisite
+
+* First thing we need to do is downloading the [Progress Control Panel](https://www.telerik.com/download-trial-file/v2/control-panel?_ga=2.212029332.1667119438.1607582144-1944255175.1605161949) to get Telerik Blazor Components on our development machine.
+
+* If you will use the Telerik Blazor Components for the first time or you don't have an active license you can click [here](https://www.telerik.com/login/v2/download-b?ReturnUrl=https%3a%2f%2fwww.telerik.com%2fdownload-trial-file%2fv2-b%2fui-for-blazor%3f_ga%3d2.212029332.1667119438.1607582144-1944255175.1605161949#register) to download free trial.
+
+> You can find the more installation details from [here](https://docs.telerik.com/blazor-ui/getting-started/client-blazor?_ga=2.55603115.1667119438.1607582144-1944255175.1605161949&_gac=1.261851647.1607669357.CjwKCAiAq8f-BRBtEiwAGr3DgUDhBT25rs7hU0EQ8K-AfeUVxs3hSoIuIAuBOZ17CNPI4ZEArORPExoCyd4QAvD_BwE#step-0---download-the-components).
+
+>**Notes:** To download Telerik Blazor packages via NuGet, we need to setup Telerik NuGet package source. We can state it in the installer as below. In this way, we can download the required Telerik Blazor packages via NuGet.
+
+
+
+### Step 1 (Configurations)
+
+* We need to install the `Telerik.UI.for.Blazor` Nuget package to our Blazor project (`*.Blazor`). We need to choose package source to **telerik.com** for Visual Studio to see this package.
+
+* If you use trial version of Telerik, you can download **Telerik.UI.for.Blazor.Trial** package via NuGet.
+
+* After the installation finished, we need to open **index.html** (it's under *wwwroot* folder) to add css and js files in our application.
+
+* Add the following lines just before the closing head tag (**/head**).
+
+```html
+ ...
+
+
+
+
+```
+
+* After that, we need to add the Telerik Blazor Components to our application's service collection. So just open the `TelerikComponentsBlazorModule` and update the `ConfigureServices` method with the following content.
+
+```csharp
+public override void ConfigureServices(ServiceConfigurationContext context)
+{
+ var environment = context.Services.GetSingletonInstance();
+ var builder = context.Services.GetSingletonInstance();
+
+ ConfigureAuthentication(builder);
+ ConfigureHttpClient(context, environment);
+ ConfigureBlazorise(context);
+ ConfigureRouter(context);
+ ConfigureUI(builder);
+ ConfigureMenu(context);
+ ConfigureAutoMapper(context);
+
+ //add this line to be able to use the components
+ builder.Services.AddTelerikBlazor();
+}
+```
+
+* After the service added we will continue by opening **_Imports.razor** file and add the global using statements as below. This will bring our Telerik components into scope throughout the application.
+
+
+
+* After all of these steps, the Telerik UI Components are ready to be used anywhere in our application. We can use the Telerik Blazor Components by wrapping our components or pages between `` and `` tags.
+
+### Step 2 - Checking Configurations
+
+* We should check, have we done the right configurations or not. For that, we can open the **Index.razor** file and we can update the component with the following content.
+
+```razor
+@page "/"
+@using Volo.Abp.MultiTenancy
+@inherits TelerikComponentsComponentBase
+@inject ICurrentTenant CurrentTenant
+@inject AuthenticationStateProvider AuthenticationStateProvider
+@using System.Timers
+
+@implements IDisposable
+
+
+
+
Telerik Progress Bar Component
+
+
+
+
+@code {
+ private const int TimerInterval = 1000;
+ private const int TotalTime = 10 * TimerInterval;
+ private double ProgressValue = 0;
+ private int ProgressStep = 100 / (TotalTime / TimerInterval);
+ private Timer Timer { get; set; } = new Timer();
+
+ private void Dispose()
+ {
+ StopProgress();
+ Timer?.Close();
+ }
+
+ protected override void OnAfterRender(bool firstRender)
+ {
+ if (Timer.Enabled == false)
+ {
+ Timer.Interval = TimerInterval;
+ Timer.Elapsed -= OnTimerElapsed;
+ Timer.Elapsed += OnTimerElapsed;
+ Timer.AutoReset = true;
+ Timer.Start();
+ }
+ }
+
+ private void OnTimerElapsed(Object source, ElapsedEventArgs e)
+ {
+ if (ProgressValue < 100)
+ {
+ UpdateProgress();
+ }
+ else
+ {
+ StopProgress();
+ }
+ }
+
+ private void UpdateProgress()
+ {
+ ProgressValue += ProgressStep;
+
+ InvokeAsync(StateHasChanged);
+ }
+
+ private void StopProgress()
+ {
+ Timer?.Stop();
+ }
+}
+
+
+```
+
+* In here, we've just added the `TelerikProgressBar` component to check the integration configured properly.
+
+* When we run `*.HttpApi.Host` and `*.Blazor` projects, we should see that the `TelerikProgressBar` component works and has similar view as the below gif.
+
+
+
+* If you haven't seen this component like above, you should check the above configurations and be assure every step done as stated.
+
+### Step 3 - Using The Telerik Blazor Components (Sample Application)
+
+* Let's create a sample application for use other Telerik Blazor Components (like DataGrid).
+
+* We will use [jsonplaceholder](https://jsonplaceholder.typicode.com/) as **mock data** to the listing, adding, updating and deleting posts.
+
+* Firstly, we can create a folder named `Posts` and inside this folder, we can create the classes which are highlighted in the following screenshot.
+
+
+
+* After classes created we can fill the classes with the following contents.
+
+**Post.cs**
+```csharp
+using System;
+
+namespace TelerikComponents.Posts
+{
+ [Serializable]
+ public class Post
+ {
+ public int Id { get; set; }
+
+ public string Title { get; set; }
+
+ public string Body { get; set; }
+
+ public int UserId { get; set; }
+ }
+}
+```
+
+**Comment.cs**
+```csharp
+using System;
+
+namespace TelerikComponents.Posts
+{
+ [Serializable]
+ public class Comment
+ {
+ public int PostId { get; set; }
+
+ public int Id { get; set; }
+
+ public string Name { get; set; }
+
+ public string Email { get; set; }
+
+ public string Body { get; set; }
+ }
+}
+```
+
+**IPostAppService.cs**
+```csharp
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace TelerikComponents.Posts
+{
+ public interface IPostAppService : IApplicationService
+ {
+ Task> GetPostsAsync();
+
+ Task AddPostAsync(Post post);
+
+ Task UpdatePostAsync(int postId, Post post);
+
+ Task DeletePostAsync(int postId);
+
+ Task GetFirstCommentByPostIdAsync(int postId);
+ }
+}
+```
+* In here, we basically created two class (which are **Post** and **Comment**). These classes are used to hold data returned as JSON.
+
+* After that, we need to implement `IPostAppService`. For achieve this, we can create a folder named `Posts` in **\*.Application** layer and inside this folder we can create a class named `PostAppService` with the following content.
+
+**PostAppService.cs**
+```csharp
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace TelerikComponents.Posts
+{
+ public class PostAppService : ApplicationService, IPostAppService
+ {
+ private JsonSerializerOptions _options = new JsonSerializerOptions
+ {
+ IncludeFields = true,
+ PropertyNameCaseInsensitive = true
+ };
+
+ public async Task> GetPostsAsync()
+ {
+ var url = "https://jsonplaceholder.typicode.com/posts";
+ List _posts = new List();
+
+ using (var client = new HttpClient())
+ {
+ var result = await client.GetAsync(url);
+
+ if (result.IsSuccessStatusCode)
+ {
+ var content = await result.Content.ReadAsStringAsync();
+ var deserializedPosts = JsonSerializer.Deserialize>(content, _options);
+
+ _posts = deserializedPosts;
+ }
+ }
+
+ return _posts;
+ }
+
+ public async Task AddPostAsync(Post post)
+ {
+ var url = "https://jsonplaceholder.typicode.com/posts";
+ Post addedPost = null;
+
+ using (var client = new HttpClient())
+ {
+ var serializePost = JsonSerializer.Serialize(post);
+ var content = new StringContent(serializePost, Encoding.UTF8, "application/json");
+ var result = await client.PostAsync(url, content);
+
+ if (result.IsSuccessStatusCode)
+ {
+ var response = await result.Content.ReadAsStringAsync();
+ addedPost = JsonSerializer.Deserialize(response);
+ }
+ }
+
+ return addedPost;
+ }
+
+ public async Task UpdatePostAsync(int postId, Post post)
+ {
+ var url = $"https://jsonplaceholder.typicode.com/posts/{postId}";
+ Post updatedPost = null;
+
+ using (var client = new HttpClient())
+ {
+ var serializePost = JsonSerializer.Serialize(post);
+ var content = new StringContent(serializePost, Encoding.UTF8, "application/json");
+ var result = await client.PutAsync(url, content);
+
+ if (result.IsSuccessStatusCode)
+ {
+ var response = await result.Content.ReadAsStringAsync();
+ updatedPost = JsonSerializer.Deserialize(response);
+ }
+ }
+
+ return updatedPost;
+ }
+
+ public async Task DeletePostAsync(int postId)
+ {
+ var url = $"https://jsonplaceholder.typicode.com/posts/{postId}";
+
+ using (var client = new HttpClient())
+ {
+ await client.DeleteAsync(url);
+ }
+ }
+
+ public async Task GetFirstCommentByPostIdAsync(int postId)
+ {
+ var url = $"https://jsonplaceholder.typicode.com/posts/{postId}/comments";
+
+ List _comments = new List();
+
+ using (var client = new HttpClient())
+ {
+ var result = await client.GetAsync(url);
+
+ if (result.IsSuccessStatusCode)
+ {
+ var content = await result.Content.ReadAsStringAsync();
+ var deserializedPosts = JsonSerializer.Deserialize>(content, _options);
+
+ _comments = deserializedPosts;
+ }
+ }
+
+ return _comments[0];
+ }
+ }
+}
+```
+
+* In here, we've implemented `IPostAppService` methods by using [jsonplaceholder](https://jsonplaceholder.typicode.co) API. These endpoints provide us basic crud functionallity.
+
+* After the implemenation, we can start to create the user interface.
+
+#### Blazor UI
+
+* We can create **/Posts** page for listing, updating, deleting and creating our posts. So, create a razor page named `Posts.razor` under **Pages** folder in `*.Blazor` project.
+
+**Posts.razor**
+```razor
+@page "/Posts"
+@using TelerikComponents.Posts
+@using IconName = Telerik.Blazor.IconName
+@inject IPostAppService PostAppService
+
+
+
+
+
+```
+
+**Post.razor.cs**
+```csharp
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Telerik.Blazor.Components;
+using TelerikComponents.Posts;
+
+namespace TelerikComponents.Blazor.Pages
+{
+ public partial class Posts
+ {
+ private List GridData { get; set; }
+ private TelerikGrid Grid { get; set; }
+ private bool ModalVisible { get; set; } = false;
+ private Comment Comment { get; set; }
+
+ public Posts()
+ {
+ Comment = new Comment();
+ }
+
+ protected override async Task OnInitializedAsync()
+ {
+ await LoadDataAsync();
+ }
+
+ private async Task LoadDataAsync()
+ {
+ GridData = await PostAppService.GetPostsAsync();
+ }
+
+ private async Task UpdateHandler(GridCommandEventArgs args)
+ {
+ var post = (Post) args.Item;
+
+ await PostAppService.UpdatePostAsync(post.Id, post);
+
+ var matchingPost = GridData.FirstOrDefault(x => x.Id == post.Id);
+
+ if (matchingPost != null)
+ {
+ matchingPost.Body = post.Body;
+ matchingPost.Title = post.Title;
+ }
+ }
+
+ private async Task DeleteHandler(GridCommandEventArgs args)
+ {
+ var post = (Post) args.Item;
+
+ GridData.Remove(post);
+ }
+
+ private async Task CreateHandler(GridCommandEventArgs args)
+ {
+ var post = (Post) args.Item;
+
+ var addedPost = await PostAppService.AddPostAsync(post);
+
+ GridData.Insert(0, addedPost);
+ }
+
+ private async Task PostDetailAsync(GridCommandEventArgs args)
+ {
+ var post = (Post) args.Item;
+
+ Comment = await PostAppService.GetFirstCommentByPostIdAsync(post.Id);
+
+ ModalVisible = true;
+ }
+ }
+}
+```
+
+* In here, we've used `TelerikGrid` component.
+
+* The `Telerik Grid` is a powerful component, which allows you to visualize and edit data via its table representation. It provides a variety of options about how to present and perform operations over the underlying data, such as paging, sorting, filtering and editing.
+
+* The Blazor UI Grid allows flexible customization of its items exposing rows, columns and edit templates for this purpose.
+
+### Final Result
+
+* After all of these steps, we can finally run our application.
+ * Run `*.HttpApi.Host` project for use the required endpoints,
+ * Run `*.Blazor` project for see the Blazor UI.
+
+* When we navigate to `Posts` route, we should see the following screenshot in this page.
+
+
+
+## Conclusion
+
+In this article, I've tried to explain how we can integrate [Telerik Blazor Component](https://www.telerik.com/blazor-ui) to our Blazor UI. ABP Framework designed as modular, so that it can work with any UI library/framework.
\ No newline at end of file
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/automated-nuget-feed-setup.png b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/automated-nuget-feed-setup.png
new file mode 100644
index 0000000000..236135b30f
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/automated-nuget-feed-setup.png differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/final-result.jpg b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/final-result.jpg
new file mode 100644
index 0000000000..244711a962
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/final-result.jpg differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/sample-application.jpg b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/sample-application.jpg
new file mode 100644
index 0000000000..27e9dbe9fc
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/sample-application.jpg differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/telerik-blazor-component-1.jpg b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/telerik-blazor-component-1.jpg
new file mode 100644
index 0000000000..7a204d97f3
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/telerik-blazor-component-1.jpg differ
diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/telerik-progress-bar.gif b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/telerik-progress-bar.gif
new file mode 100644
index 0000000000..e1eff85986
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/telerik-progress-bar.gif differ
diff --git a/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/POST.md b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/POST.md
new file mode 100644
index 0000000000..7b1ae846af
--- /dev/null
+++ b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/POST.md
@@ -0,0 +1,1581 @@
+# Using Angular Material Components With the ABP Framework
+
+## Introduction
+
+Angular Material library is a popular and well-known library in the community. We will implement Angular Material components with the ABP framework in this article. We will follow the Book Store tutorial which documented in [ABP Documentation](https://docs.abp.io/en/abp/latest/Tutorials/Part-1)
+
+> This article doesn't include server-side parts except the **Author With Books Form**
+> section. Please follow the tutorial for server-side parts.
+
+## Installation
+
+Create a project with ABP CLI. Run following command in terminal:
+
+```bash
+ abp new Acme.BookStore.AngularMaterial -u angular -o AcmeBookStoreAngularMaterial
+```
+
+Add Angular Material package to the created project. Run this command in the terminal at the `angular` directory:
+
+```
+ ng add @angular/material
+```
+
+## Book CRUD Actions
+
+> Please complete the following steps before starting this section:
+>
+> - Follow the server-side steps at [Web Application Development Tutorial - Part 1: Creating the Server Side](https://docs.abp.io/en/abp/latest/Tutorials/Part-1) with remembering our application name is **Acme.BookStore.AngularMaterial**
+> - Follow the localization part of [Web Application Development Tutorial - Part 2: The Book List Page](https://docs.abp.io/en/abp/latest/Tutorials/Part-2?UI=NG&DB=EF#localization)
+> - Run following command in terminal at `angular` directory
+> `abp generate-proxy`
+
+In this section, we will create the book list page, book create and update dialog using the Angular Material Modules.
+
+Add material modules to `SharedModule`'s imports and exports arrays which placed in `angular/src/app/shared/shared.module.ts`:
+
+```typescript
+import { MatCardModule } from "@angular/material/card";
+import { MatTableModule } from "@angular/material/table";
+import { MatPaginatorModule } from "@angular/material/paginator";
+import { MatSortModule } from "@angular/material/sort";
+import { MatButtonModule } from "@angular/material/button";
+
+@NgModule({
+ imports: [
+ CoreModule,
+ ThemeSharedModule,
+ ThemeBasicModule,
+ NgbDropdownModule,
+ NgxValidateCoreModule,
+
+ MatCardModule, // added this line
+ MatTableModule, // added this line
+ MatPaginatorModule, // added this line
+ MatSortModule, // added this line
+ MatButtonModule, // added this line
+ ],
+ exports: [
+ CoreModule,
+ ThemeSharedModule,
+ ThemeBasicModule,
+ NgbDropdownModule,
+ NgxValidateCoreModule,
+
+ MatCardModule, // added this line
+ MatTableModule, // added this line
+ MatPaginatorModule, // added this line
+ MatSortModule, // added this line
+ MatButtonModule, // added this line
+ ],
+})
+export class SharedModule {}
+```
+
+Run the following command in the terminal at the `angular` directory to create the book module:
+
+```
+yarn ng generate module book --module app --routing --route books
+```
+
+Remove `CommonModule` form and import `SharedModule` from imports array at `book.module.ts`:
+
+```typescript
+import { NgModule } from "@angular/core";
+import { BookRoutingModule } from "./book-routing.module";
+import { BookComponent } from "./book.component";
+import { SharedModule } from "../shared/shared.module";
+
+@NgModule({
+ declarations: [BookComponent],
+ imports: [
+ BookRoutingModule,
+ SharedModule, // this line added
+ ],
+})
+export class BookModule {}
+```
+
+> We deleted the `CommonModule` because `CommonModule` in `CoreModule`'s exports array and `CoreModule` in `SharedModule`'s exports array.
+
+We will add routes by adding items to the return array of the `routesProvider` created when creating a project for adding navigation elements for books route. For more information, see the [`RoutesService` document](https://docs.abp.io/en/abp/latest/UI/Angular/Modifying-the-Menu#via-routesservice).
+
+Open the `src/app/route.provider.ts` file replace the `configureRoutes` function declaration as shown below:
+
+```typescript
+import { eLayoutType, RoutesService } from "@abp/ng.core";
+
+function configureRoutes(routes: RoutesService) {
+ return () => {
+ routes.add([
+ {
+ path: "/",
+ name: "::Menu:Home",
+ iconClass: "fas fa-home",
+ order: 1,
+ layout: eLayoutType.application,
+ },
+ {
+ path: "/book-store",
+ name: "::Menu:BookStore",
+ iconClass: "fas fa-book",
+ order: 2,
+ layout: eLayoutType.application,
+ },
+ {
+ path: "/books",
+ name: "::Menu:Books",
+ parentName: "::Menu:BookStore",
+ layout: eLayoutType.application,
+ },
+ ]);
+ };
+}
+```
+
+### Book List
+
+Replace `BookComponent` with the following code placed at `angular/src/book/book.component.ts` :
+
+```typescript
+import { Component, OnInit } from "@angular/core";
+import { ListService, PagedResultDto } from "@abp/ng.core";
+import { BookDto, BookService } from "@proxy/books";
+import { PageEvent } from "@angular/material/paginator";
+import { Sort } from "@angular/material/sort";
+
+@Component({
+ selector: "app-book",
+ templateUrl: "./book.component.html",
+ styleUrls: ["./book.component.scss"],
+ providers: [ListService],
+})
+export class BookComponent implements OnInit {
+ book = { items: [], totalCount: 0 } as PagedResultDto;
+ columns: string[] = ["name", "type", "price"];
+
+ constructor(
+ public readonly list: ListService,
+ private bookService: BookService
+ ) {
+ this.list.maxResultCount = 2;
+ }
+
+ ngOnInit() {
+ const bookStreamCreator = (query) => this.bookService.getList(query);
+
+ this.list.hookToQuery(bookStreamCreator).subscribe((response) => {
+ this.book = response;
+ });
+ }
+
+ changePage(pageEvent: PageEvent) {
+ this.list.page = pageEvent.pageIndex;
+ }
+
+ changeSort(sort: Sort) {
+ this.list.sortKey = sort.active;
+ this.list.sortOrder = sort.direction;
+ }
+}
+```
+
+- We imported and injected the generated `BookService`.
+- We used the [ListService](https://docs.abp.io/en/abp/latest/UI/Angular/List-Service), a utility service of the ABP Framework which provides easy pagination, sorting and searching.
+- We set `this.list.maxResultCount` to 2 in the constructor, it can be changed programmatically for example changing value with the dropdown in the template
+
+Replace the `book.component.html` in the `angular/src/book/` with following code:
+
+```html
+
+
+
+ {{ '::Menu:Books' | abpLocalization }}
+
+
+
+
+
+
+
+```
+
+- We used the [Material Card](https://material.angular.io/components/card/overview) component as a container
+- We used [Material Table](https://material.angular.io/components/table/overview) and we made `name` and `type` columns sortable. `changeSort` method executes when sorting change.
+- We used the [Material Pagination](https://material.angular.io/components/paginator/overview). `changePage` method executes when the page changed
+
+
+
+### Book Create
+
+In this section, we will create `BookDialogComponent` and we will display this component via [`Material Dialog`](https://material.angular.io/components/dialog/overview). We will use also [Material Input](https://material.angular.io/components/input/overview), [Material Select](https://material.angular.io/components/select/overview), [Material DatePicker](https://material.angular.io/components/datepicker/overview) modules in this component for book form.
+
+Create a new component named `BookDialogComponent` in the `angular/src/book/components` folder with the following command:
+
+```
+yarn ng generate component book/components/BookDialog --module book
+```
+
+> We used --module option for declaring in the component to a specific module.
+
+Add Material modules to `SharedModule`'s imports and exports arrays:
+
+```typescript
+import { MatDialogModule } from "@angular/material/dialog";
+import { MatDatepickerModule } from "@angular/material/datepicker";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatSelectModule } from "@angular/material/select";
+import { MatIconModule } from "@angular/material/icon";
+import { MatNativeDateModule } from '@angular/material/core';
+
+@NgModule({
+ imports: [
+ // other imports
+ MatDialogModule,
+ MatDatepickerModule,
+ MatNativeDateModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatSelectModule,
+ MatIconModule,
+ ],
+ exports: [
+ // other exports
+ MatDialogModule,
+ MatDatepickerModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatSelectModule,
+ MatIconModule,
+ ],
+})
+export class SharedModule {}
+```
+
+Replace `book-dialog.component.ts` in `angular/src/book/` with following code:
+
+```typescript
+import { Component, Inject, OnInit } from "@angular/core";
+import {
+ MAT_DIALOG_DATA,
+ MAT_DIALOG_DEFAULT_OPTIONS,
+} from "@angular/material/dialog";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { bookTypeOptions } from "@proxy/books";
+
+@Component({
+ selector: "app-book-dialog",
+ templateUrl: "./book-dialog.component.html",
+ styleUrls: ["./book-dialog.component.scss"],
+ providers: [
+ {
+ provide: MAT_DIALOG_DEFAULT_OPTIONS,
+ useValue: { hasBackdrop: true, width: "50vw" },
+ },
+ ],
+})
+export class BookDialogComponent implements OnInit {
+ form: FormGroup;
+
+ bookTypes = bookTypeOptions;
+
+ constructor(private fb: FormBuilder) {}
+
+ ngOnInit(): void {
+ this.buildForm();
+ }
+
+ buildForm() {
+ this.form = this.fb.group({
+ name: [null, Validators.required],
+ type: [null, Validators.required],
+ publishDate: [null, Validators.required],
+ price: [null, Validators.required],
+ });
+ }
+
+ getFormValue() {
+ const { publishDate } = this.form.value;
+ return {
+ ...this.form.value,
+ publishDate: `${publishDate?.getFullYear()}-${
+ publishDate?.getMonth() + 1
+ }-${publishDate?.getDate()}`,
+ };
+ }
+}
+```
+
+- We made a form which form controls' names are the same as BookDto
+- We provided the `MAT_DIALOG_DEFAULT_OPTIONS` token to change Material Dialog options for this component. Provided options are only available for this component.
+
+Replace the `book-dialog.component.html` with following code:
+
+```html
+
{{ '::NewBook' | abpLocalization }}
+
+
+
+
+
+
+
+```
+
+- We created a form with material form field components.
+- We added 2 buttons for closing dialog and saving form in the `mat-dialog-actions` element.
+
+Create the `createBook` method and inject `MatDialog` in `book.component.ts`. Then use the material dialog's `open` method inside the `createBook` method:
+
+```typescript
+import { BookDialogComponent } from "./components/book-dialog";
+
+export class BookComponent {
+ constructor(
+ // ...
+ // inject dialog
+ public dialog: MatDialog
+ ) {
+ //...
+ }
+ //... other methods
+ createBook() {
+ const dialogRef = this.dialog.open(BookDialogComponent);
+ dialogRef.afterClosed().subscribe((result) => {
+ if (result) {
+ this.bookService.create(result).subscribe(() => {
+ this.list.get();
+ });
+ }
+ });
+ }
+}
+```
+
+- We displayed BookDialogComponent via Material Dialog. If the result has data after the dialog closes we made 2 HTTP requests for creating a book and refreshing the book list.
+
+Add create book button near the `mat-card-title` element in `book.component.html`:
+
+```html
+{{ '::Menu:Books' | abpLocalization }}
+
+```
+
+The final UI looks like below:
+
+
+
+### Edit Book
+
+We will use the same dialog component for editing the book. And we will add the `actions` column to the book list table. The actions column is a simple dropdown. We will use [Material Menu](https://material.angular.io/components/menu/overview) for creating dropdown
+
+Add `MatMenuModule` to `SharedModule` metadata's imports and exports array like this:
+
+```typescript
+import { MatMenuModule } from "@angular/material/menu";
+
+@NgModule({
+ imports: [
+ // other imports
+ MatMenuModule,
+ ],
+ exports: [
+ // other exports
+ MatMenuModule,
+ ],
+})
+export class SharedModule {}
+```
+
+Edit `columns` array and add `editBook` method in `book.component.ts` as shown below:
+
+```typescript
+columns: string[] = ['actions', /* ... other columns*/];
+
+editBook(id: string) {
+ this.bookService.get(id).subscribe((book) => {
+ const dialogRef = this.dialog.open(BookDialogComponent, {
+ data: book
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ if (result) {
+ this.bookService.update(id, result).subscribe(() => {
+ this.list.get();
+ });
+ }
+ });
+ });
+}
+```
+
+- We passed the data to `BookDialogComponent` with passing the data property `open` method of the material dialog.
+- We checked data after closing the dialog for sending HTTP requests as in the `Create Book` section.
+
+Add actions column before name column and add `mat-menu` end of file in the `book.component.html` as shown below:
+
+```html
+
+
+
+
{{'::Actions' | abpLocalization}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+Get passed data which passed with material dialog's `open` method and use this data to create a form with initial values in `book-dialog.component.ts` as shown below:
+
+```typescript
+ constructor(
+ //inject data
+ @Inject(MAT_DIALOG_DATA) public data: BookDto,
+ ) {
+ }
+
+ buildForm() {
+ this.form = this.fb.group({
+ name: [this.data?.name /*modified*/, Validators.required],
+ type: [this.data?.type /*modified*/, Validators.required],
+ publishDate: [this.data?.publishDate ? new Date(this.data.publishDate) : null, /*modified*/, Validators.required],
+ price: [this.data?.price /*modified*/, Validators.required],
+ });
+ }
+```
+
+Edit the dialog title if component has data, display **Edit Book** text otherwise **New Book** in `book-dialog.component.html`:
+
+```html
+
+
+
+
+
+
+
+
+
+
+```
+
+Open the `en.json` file under the `Localization/BookStore` folder of the `Acme.BookStore.AngularMaterial.Domain.Shared project` and add the following entries:
+
+```json
+ "Menu:Authors": "Authors",
+ "Authors": "Authors",
+ "AuthorDeletionConfirmationMessage": "Are you sure to delete the author '{0}'?",
+ "BirthDate": "Birth date",
+ "NewAuthor": "New author",
+ "EditAuthor": "Edit Author"
+```
+
+
+
+## Author And Book Relation
+
+> Please complete the following steps before starting this section
+>
+> - Complete server-side parts [Web Application Development Tutorial - Part 10: Book to Author Relation](https://docs.abp.io/en/abp/latest/Tutorials/Part-10) until [The User Interface](https://docs.abp.io/en/abp/latest/Tutorials/Part-10?UI=NG&DB=EF#the-user-interface) section
+> - Run following command in terminal at `angular` directory:
+> `abp generate-proxy`
+
+In this section, we will add author selection to the book creation form, create one form for adding an author with books using Material Stepper and display the author's name in the book list page.
+
+### Author Selection
+
+We will add the author select box using Material Select and we will get authors from the server in `BookDialogComponent`.
+
+Replace `book-dialog.component.ts` in `app/src/book/components/book-dialog` with following code:
+
+```typescript
+import { Component, Inject, OnInit } from "@angular/core";
+import {
+ MAT_DIALOG_DATA,
+ MAT_DIALOG_DEFAULT_OPTIONS,
+} from "@angular/material/dialog";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import {
+ AuthorLookupDto,
+ BookDto,
+ BookService,
+ bookTypeOptions,
+} from "@proxy/books";
+import { Observable } from "rxjs";
+import { map } from "rxjs/operators";
+
+@Component({
+ selector: "app-book-dialog",
+ templateUrl: "./book-dialog.component.html",
+ styleUrls: ["./book-dialog.component.scss"],
+ providers: [
+ {
+ provide: MAT_DIALOG_DEFAULT_OPTIONS,
+ useValue: { hasBackdrop: true, width: "50vw" },
+ },
+ ],
+})
+export class BookDialogComponent implements OnInit {
+ form: FormGroup;
+
+ bookTypes = bookTypeOptions;
+
+ authors$: Observable; // this line added
+
+ constructor(
+ private fb: FormBuilder,
+ @Inject(MAT_DIALOG_DATA) public data: BookDto,
+ bookService: BookService // inject bookService
+ ) {
+ this.authors$ = bookService.getAuthorLookup().pipe(map((r) => r.items)); // this line added
+ }
+
+ ngOnInit(): void {
+ this.buildForm();
+ }
+
+ buildForm() {
+ this.form = this.fb.group({
+ name: [this.data?.name, Validators.required],
+ type: [this.data?.type, Validators.required],
+ publishDate: [this.data?.publishDate, Validators.required],
+ price: [this.data?.price, Validators.required],
+ authorId: [this.data?.authorId, Validators.required], // this line added
+ });
+ }
+}
+```
+
+Add author select box before name field in `book-dialog.component.html` as shown below:
+
+```html
+
+
+ {{'::Author' | abpLocalization}} *
+
+ {{ author.name }}
+
+
+
+
+ {{'::Name' | abpLocalization}} *
+
+
+```
+
+### Author Name Column
+
+Add the `authorName` item to columns array in `BookComponent`:
+
+```typescript
+columns: string[] = [/* ...other columns*/, 'authorName'];
+```
+
+Add the `authorName` column after price column in `book.component.html`:
+
+```html
+
+
+
+
+```
+
+### Author With Books Form
+
+In this section, we will create an endpoint that takes author information and book list in the request body for creating an author and books by one request.
+
+Create a class named `CreateBookDto` in `Application.Contracts/Books` folder:
+
+```csharp
+using System;
+using System.ComponentModel.DataAnnotations;
+using Acme.BookStore.Books;
+using Volo.Abp.Application.Dtos;
+
+namespace Acme.BookStore.AngularMaterial.Books
+{
+ public class CreateBookDto: AuditedEntityDto
+ {
+ [Required]
+ [StringLength(128)]
+ public string Name { get; set; }
+
+ [Required]
+ public BookType Type { get; set; } = BookType.Undefined;
+
+ [Required]
+ [DataType(DataType.Date)]
+ public DateTime PublishDate { get; set; } = DateTime.Now;
+
+ [Required]
+ public float Price { get; set; }
+ }
+}
+```
+
+Create a class named `CreateAuthorWithBookDto` in `Application.Contracts/Books` folder:
+
+```csharp
+using System.Collections.Generic;
+using Acme.BookStore.AngularMaterial.Authors;
+
+namespace Acme.BookStore.AngularMaterial.Books
+{
+ public class CreateAuthorWithBookDto: CreateAuthorDto
+ {
+ public List Books { get; set; }
+
+ public CreateAuthorWithBookDto()
+ {
+ Books = new List();
+ }
+ }
+}
+```
+
+Create a class named `AuthorWithDetailsDto` in `Application.Contracts/Books` folder:
+
+```csharp
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Acme.BookStore.AngularMaterial.Authors;
+
+namespace Acme.BookStore.AngularMaterial.Books
+{
+ public class AuthorWithDetailsDto: AuthorDto
+ {
+ [Required]
+ public List Books { get; set; }
+
+ public AuthorWithDetailsDto()
+ {
+ Books = new List();
+ }
+ }
+}
+```
+
+Add following line to `IBookAppService` interface which placed in `Application.Contracts/Books`:
+
+```csharp
+Task CreateAuthorWithBooksAsync(CreateAuthorWithBookDto input);
+```
+
+Add mappings for the above DTO's lines to `AngularMaterialApplicationAutoMapperProfile.cs`
+
+```csharp
+CreateMap();
+CreateMap();
+CreateMap();
+```
+
+Inject `AuthorManager` and add `CreateAuthorWithBooksAsync` method to `BookAppService.cs`:
+
+```csharp
+namespace Acme.BookStore.AngularMaterial.Books
+{
+ [Authorize(AngularMaterialPermissions.Books.Default)]
+ public class BookAppService:
+ CrudAppService<
+ Book,
+ BookDto,
+ Guid,
+ PagedAndSortedResultRequestDto,
+ CreateUpdateBookDto>,
+ IBookAppService
+ {
+ private readonly IAuthorRepository _authorRepository;
+ private readonly AuthorManager _authorManager; // this line added
+ public BookAppService(
+ IRepository repository,
+ IAuthorRepository authorRepository,
+ // inject AuthorManager
+ AuthorManager authorManager)
+ : base(repository)
+ {
+ _authorRepository = authorRepository;
+ _authorManager = authorManager;// this line added
+ GetPolicyName = AngularMaterialPermissions.Books.Default;
+ GetListPolicyName = AngularMaterialPermissions.Books.Default;
+ CreatePolicyName = AngularMaterialPermissions.Books.Create;
+ UpdatePolicyName = AngularMaterialPermissions.Books.Edit;
+ DeletePolicyName = AngularMaterialPermissions.Books.Delete;
+ }
+
+ // Other class methods
+
+ // This method added
+ public async Task CreateAuthorWithBooksAsync(CreateAuthorWithBookDto input)
+ {
+ var author = await _authorManager.CreateAsync(
+ input.Name,
+ input.BirthDate,
+ input.ShortBio
+ );
+
+ var createdAuthor = await _authorRepository.InsertAsync(author);
+ var authorWithBooks = ObjectMapper.Map(createdAuthor);
+ foreach (var book in input.Books)
+ {
+ var bookEntity = ObjectMapper.Map(book);
+ bookEntity.AuthorId = author.Id;
+ var createdBook = await Repository.InsertAsync(bookEntity);
+ var bookDto = ObjectMapper.Map(createdBook);
+ bookDto.AuthorName = author.Name;
+ authorWithBooks.Books.Add(bookDto);
+ }
+
+ return authorWithBooks;
+ }
+ }
+}
+```
+
+Open the `en.json` file under the `Localization/BookStore` folder of the `Acme.BookStore.AngularMaterial.Domain.Shared project` and add the following entries:
+
+```json
+ "AuthorInfo": "Author Info",
+ "BookInfo": "Book Info",
+ "AddBook": "Add Book",
+ "NewAuthorWithBook": "New Author With Book",
+ "AuthorWithBook:Success": "{0} added with books successfully"
+```
+
+Run generate-proxy command in the terminal at `angular` directory:
+
+```
+abp generate-proxy
+```
+
+We will create `AuthorWithBooksModule` with components and we will use Material Stepper inside the component.
+
+Run the following command for creating `AuthorWithBooksModule`:
+
+```
+yarn ng generate module author-with-books --module app --routing --route author-with-books
+```
+
+Add `SharedModule` to `AuthorWithBooksModule`'s imports array as shown below:
+
+```typescript
+import { SharedModule } from "../shared/shared.module";
+
+@NgModule({
+ declarations: [AuthorWithBooksComponent],
+ imports: [
+ SharedModule, // this line added
+ AuthorWithBooksRoutingModule,
+ ],
+})
+export class AuthorWithBooksModule {}
+```
+
+Add `MatStepperModule` to `SharedModule`'s imports array as shown below:
+
+```typescript
+import { MatStepperModule } from "@angular/material/stepper";
+
+@NgModule({
+ imports: [
+ // other imports
+ MatStepperModule,
+ ],
+ exports: [
+ // other exports
+ MatStepperModule,
+ ],
+})
+export class SharedModule {}
+```
+
+We will create one form which includes author form group and book form array. We will use these form elements at the [Material Stepper](https://material.angular.io/components/stepper/overview) integration.
+
+Replace `author-with-books.component.ts` with the following code:
+
+```typescript
+import { Component, OnInit } from "@angular/core";
+import { bookTypeOptions } from "@proxy/books";
+import { FormArray, FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { STEPPER_GLOBAL_OPTIONS } from "@angular/cdk/stepper";
+
+@Component({
+ selector: "app-author-with-book",
+ templateUrl: "./author-with-book.component.html",
+ styleUrls: ["./author-with-book.component.scss"],
+ providers: [
+ {
+ provide: STEPPER_GLOBAL_OPTIONS,
+ useValue: { displayDefaultIndicatorType: false },
+ },
+ ],
+})
+export class AuthorWithBooksComponent implements OnInit {
+ form: FormGroup;
+
+ bookTypes = bookTypeOptions;
+
+ get bookFormArray(): FormArray {
+ return this.form.get("books") as FormArray;
+ }
+
+ constructor(
+ private fb: FormBuilder,
+ private bookService: BookService,
+ private toasterService: ToasterService
+ ) {}
+
+ ngOnInit(): void {
+ this.form = this.fb.group({
+ author: this.fb.group({
+ name: [null, Validators.required],
+ birthDate: [null, Validators.required],
+ }),
+ books: this.fb.array([this.getBookForm()]),
+ });
+ }
+
+ getBookForm() {
+ return this.fb.group({
+ name: [null, Validators.required],
+ type: [null, Validators.required],
+ publishDate: [null, Validators.required],
+ price: [null, Validators.required],
+ });
+ }
+
+ addBook() {
+ this.bookFormArray.push(this.getBookForm());
+ }
+
+ deleteBook(i: number) {
+ this.bookFormArray.removeAt(i);
+ }
+
+ save() {
+ if (this.form.invalid) {
+ return;
+ }
+ const authorWithBook: CreateAuthorWithBookDto = {
+ ...this.form.value.author,
+ books: this.form.value.books,
+ };
+ this.bookService.createAuthorWithBooks(authorWithBook).subscribe((res) => {
+ this.toasterService.success("::AuthorWithBook:Success", "", {
+ messageLocalizationParams: [res.name],
+ });
+ });
+ }
+}
+```
+
+- We created form until component initialization in the `ngOnInit` method
+- In the `getBookForm` method, returned
+- In the `addBook` method, we pushed a form group instance created in the `getBookForm` method to the book form array. We will execute this method when clicked on the **Add Book** button
+- We deleted a form group instance by index from the book form array in the `deleteBook` method
+- In the `save` method, we send an HTTP request for creating author and books if creation will be successful toaster message will be display
+
+Replace the `author-with-books.component.html` content with following code:
+
+```html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ person
+
+
+ book
+
+
+```
+
+- We created the same author form where we created in `AuthorDialogComponent` and we gave the author form group to mat-step's stepConrol input
+- We created the same book form which we created at `BookDialogComponent` except the author selection
+
+Replace `author-with-books.component.scss` content with following code:
+
+```scss
+.book-form {
+ margin-top: 20px;
+}
+.button-container {
+ display: flex;
+ width: 100%;
+ justify-content: space-between;
+ margin-top: 25px;
+}
+```
+
+Finally add Create Author With Books button near the Create Author button in `author.component.html`:
+
+```html
+
+
+
+
+```
+
+Final UI looks as shown below:
+
+
+
+## Conclusion
+
+We implemented Angular Material Components to our angular application which was created with ABP Framework. There is no blocker case of using angular libraries with the ABP framework.
diff --git a/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/author-crud.gif b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/author-crud.gif
new file mode 100644
index 0000000000..be7e2246ed
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/author-crud.gif differ
diff --git a/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/author-with-books.gif b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/author-with-books.gif
new file mode 100644
index 0000000000..698507f780
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/author-with-books.gif differ
diff --git a/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-create.gif b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-create.gif
new file mode 100644
index 0000000000..613ccf4a45
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-create.gif differ
diff --git a/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-delete.gif b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-delete.gif
new file mode 100644
index 0000000000..a10d8a3536
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-delete.gif differ
diff --git a/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-edit.gif b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-edit.gif
new file mode 100644
index 0000000000..387274aa38
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-edit.gif differ
diff --git a/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-list.gif b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-list.gif
new file mode 100644
index 0000000000..1a88413e40
Binary files /dev/null and b/docs/en/Community-Articles/2020-12-11-Using-Angular-Material-Components-With-ABP-Framework/book-list.gif differ
diff --git a/docs/en/Exception-Handling.md b/docs/en/Exception-Handling.md
index 04cc6fc695..8c84157878 100644
--- a/docs/en/Exception-Handling.md
+++ b/docs/en/Exception-Handling.md
@@ -1,11 +1,11 @@
# Exception Handling
-ABP provides a built-in infrastructure and offers a standard model for handling exceptions in a web application.
+ABP provides a built-in infrastructure and offers a standard model for handling exceptions.
* Automatically **handles all exceptions** and sends a standard **formatted error message** to the client for an API/AJAX request.
* Automatically hides **internal infrastructure errors** and returns a standard error message.
-* Provides a configurable way to **localize** exception messages.
-* Automatically maps standard exceptions to **HTTP status codes** and provides a configurable option to map these to custom exceptions.
+* Provides an easy and configurable way to **localize** exception messages.
+* Automatically maps standard exceptions to **HTTP status codes** and provides a configurable option to map custom exceptions.
## Automatic Exception Handling
diff --git a/docs/en/Module-Entity-Extensions.md b/docs/en/Module-Entity-Extensions.md
index 61a7093dc5..042c10b815 100644
--- a/docs/en/Module-Entity-Extensions.md
+++ b/docs/en/Module-Entity-Extensions.md
@@ -1,3 +1,393 @@
# Module Entity Extensions
-See https://docs.abp.io/en/commercial/latest/guides/module-entity-extensions (it will be moved here soon).
\ No newline at end of file
+## Introduction
+
+Module entity extension system is a **high level** extension system that allows you to **define new properties** for existing entities of the depended modules. It automatically **adds properties to the entity, database, HTTP API and the user interface** in a single point.
+
+> The module must be developed the *Module Entity Extensions* system in mind. All the **official modules** supports this system wherever possible.
+
+## Quick Example
+
+Open the *YourProjectNameModuleExtensionConfigurator* class inside the `Domain.Shared` project of your solution and change the `ConfigureExtraProperties`method as shown below to add a `SocialSecurityNumber` property to the `IdentityUser` entity of the [Identity Module](Modules/Identity.md).
+
+````csharp
+public static void ConfigureExtraProperties()
+{
+ OneTimeRunner.Run(() =>
+ {
+ ObjectExtensionManager.Instance.Modules()
+ .ConfigureIdentity(identity =>
+ {
+ identity.ConfigureUser(user =>
+ {
+ user.AddOrUpdateProperty( //property type: string
+ "SocialSecurityNumber", //property name
+ property =>
+ {
+ //validation rules
+ property.Attributes.Add(new RequiredAttribute());
+ property.Attributes.Add(
+ new StringLengthAttribute(64) {
+ MinimumLength = 4
+ }
+ );
+
+ //...other configurations for this property
+ }
+ );
+ });
+ });
+ });
+}
+````
+
+>This method is called inside the `YourProjectNameDomainSharedModule` at the beginning of the application. `OneTimeRunner` is a utility class that guarantees to execute this code only one time per application, since multiple calls are unnecessary.
+
+* `ObjectExtensionManager.Instance.Modules()` is the starting point to configure a module. `ConfigureIdentity(...)` method is used to configure the entities of the Identity Module.
+* `identity.ConfigureUser(...)` is used to configure the user entity of the identity module. Not all entities are designed to be extensible (since it is not needed). Use the intellisense to discover the extensible modules and entities.
+* `user.AddOrUpdateProperty(...)` is used to add a new property to the user entity with the `string` type (`AddOrUpdateProperty` method can be called multiple times for the same property of the same entity. Each call can configure the options of the same property, but only one property is added to the entity with the same property name). You can call this method with different property names to add more properties.
+* `SocialSecurityNumber` is the name of the new property.
+* `AddOrUpdateProperty` gets a second argument (the `property =>` lambda expression) to configure additional options for the new property.
+ * We can add data annotation attributes like shown here, just like adding a data annotation attribute to a class property.
+
+#### Create & Update Forms
+
+Once you define a property, it appears in the create and update forms of the related entity:
+
+
+
+`SocialSecurityNumber` field comes into the form. Next sections will explain the localization and the validation for this new property.
+
+### Data Table
+
+New properties also appear in the data table of the related page:
+
+
+
+`SocialSecurityNumber` column comes into the table. Next sections will explain the option to hide this column from the data table.
+
+## Property Options
+
+There are some options that you can configure while defining a new property.
+
+### Display Name
+
+You probably want to set a different (human readable) display name for the property that is shown on the user interface.
+
+#### Don't Want to Localize?
+
+If your application is not localized, you can directly set the `DisplayName` for the property to a `FixedLocalizableString` object. Example:
+
+````csharp
+property =>
+{
+ property.DisplayName = new FixedLocalizableString("Social security no");
+}
+````
+
+#### Localizing the Display Name
+
+If you want to localize the display name, you have two options.
+
+##### Localize by Convention
+
+Instead of setting the `property.DisplayName`, you can directly open your localization file (like `en.json`) and add the following entry to the `texts` section:
+
+````json
+"SocialSecurityNumber": "Social security no"
+````
+
+Define the same `SocialSecurityNumber` key (the property name you've defined before) in your localization file for each language you support. That's all!
+
+In some cases, the localization key may conflict with other keys in your localization files. In such cases, you can use the `DisplayName:` prefix for display names in the localization file (`DisplayName:SocialSecurityNumber` as the localization key for this example). Extension system looks for prefixed version first, then fallbacks to the non prefixed name (it then fallbacks to the property name if you haven't localized it).
+
+> This approach is recommended since it is simple and suitable for most scenarios.
+
+##### Localize using the `DisplayName` Property
+
+If you want to specify the localization key or the localization resource, you can still set the `DisplayName` option:
+
+````csharp
+property =>
+{
+ property.DisplayName =
+ LocalizableString.Create(
+ "UserSocialSecurityNumberDisplayName"
+ );
+}
+````
+
+* `MyProjectNameResource` is the localization resource and `UserSocialSecurityNumberDisplayName` is the localization key in the localization resource.
+
+> See [the localization document](Localization.md) if you want to learn more about the localization system.
+
+#### Default Value
+
+A default value is automatically set for the new property, which is the natural default value for the property type, like `null` for `string`, `false` for `bool` or `0` for `int`.
+
+There are two ways to override the default value:
+
+##### DefaultValue Option
+
+`DefaultValue` option can be set to any value:
+
+````csharp
+property =>
+{
+ property.DefaultValue = 42;
+}
+````
+
+##### DefaultValueFactory Options
+
+`DefaultValueFactory` can be set to a function that returns the default value:
+
+````csharp
+property =>
+{
+ property.DefaultValueFactory = () => DateTime.Now;
+}
+````
+
+`options.DefaultValueFactory` has a higher priority than the `options.DefaultValue` .
+
+> Tip: Use `DefaultValueFactory` option only if the default value may change over the time (like `DateTime.Now` in this example). If it is a constant value, then use the `DefaultValue` option.
+
+### Validation
+
+Entity extension system allows you to define validation for extension properties in a few ways.
+
+#### Data Annotation Attributes
+
+`Attributes` is a list of attributes associated to this property. The example code below adds two [data annotation validation attributes](https://docs.microsoft.com/en-us/aspnet/core/mvc/models/validation) to the property:
+
+````csharp
+property =>
+{
+ property.Attributes.Add(new RequiredAttribute());
+ property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4});
+}
+````
+
+When you run the application, you see that the validation works out of the box:
+
+
+
+Since we've added the `RequiredAttribute`, it doesn't allow to left it blank. The validation system works;
+
+* On the user interface (with automatic localization).
+* On the HTTP API. Even if you directly perform an HTTP request, you get validation errors with a proper HTTP status code.
+* On the `SetProperty(...)` method on the entity (see [the document](Entities.md) if you wonder what is the `SetProperty()` method).
+
+So, it automatically makes a full stack validation.
+
+> See the [ASP.NET Core MVC Validation document](https://docs.microsoft.com/en-us/aspnet/core/mvc/models/validation) to learn more about the attribute based validation.
+
+##### Default Validation Attributes
+
+There are some attributes **automatically added** when you create certain type of properties;
+
+* `RequiredAttribute` is added for **non nullable** primitive property types (e.g. `int`, `bool`, `DateTime`...) and `enum` types. If you want to allow nulls, make the property nullable (e.g. `int?`).
+* `EnumDataTypeAttribute` is added for **enum types**, to prevent to set invalid enum values.
+
+Use `property.Attributes.Clear();` if you don't want these attributes.
+
+#### Validation Actions
+
+Validation actions allows you to execute a custom code to perform the validation. The example below checks if the `SocialSecurityNumber` starts with `B` and adds a validation error if so:
+
+````csharp
+property =>
+{
+ property.Attributes.Add(new RequiredAttribute());
+ property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4});
+
+ property.Validators.Add(context =>
+ {
+ if (((string) context.Value).StartsWith("B"))
+ {
+ context.ValidationErrors.Add(
+ new ValidationResult(
+ "Social security number can not start with the letter 'B', sorry!",
+ new[] {"extraProperties.SocialSecurityNumber"}
+ )
+ );
+ }
+ });
+
+}
+````
+
+Using a `RegularExpressionAttribute` might be better in this case, but this is just an example. Anyway, if you enter a value starts with the letter `B` you get the following error **while saving the form**:
+
+
+
+##### The Context Object
+
+The `context` object has useful properties that can be used in your custom validation action. For example, you can use the `context.ServiceProvider` to resolve services from the [dependency injection system](Dependency-Injection.md). The example below gets the localizer and adds a localized error message:
+
+````csharp
+if (((string) context.Value).StartsWith("B"))
+{
+ var localizer = context.ServiceProvider
+ .GetRequiredService>();
+
+ context.ValidationErrors.Add(
+ new ValidationResult(
+ localizer["SocialSecurityNumberCanNotStartWithB"],
+ new[] {"extraProperties.SocialSecurityNumber"}
+ )
+ );
+}
+````
+
+>`context.ServiceProvider` is nullable! It can be `null` only if you use the `SetProperty(...)` method on the object. Because DI system is not available on this time. While this is a rare case, you should perform a fallback logic when `context.ServiceProvider` is `null`. For this example, you would add a non-localized error message. This is not a problem since setting an invalid value to a property generally is a programmer mistake and you mostly don't need to localization in this case. In any way, you would not be able to use localization even in a regular property setter. But, if you are serious about localization, you can throw a business exception (see the [exception handling document](https://docs.abp.io/en/abp/latest/Exception-Handling) to learn how to localize a business exception).
+
+### UI Visibility
+
+When you define a property, it appears on the data table, create and edit forms on the related UI page. However, you can control each one individually. Example:
+
+````csharp
+property =>
+{
+ property.UI.OnTable.IsVisible = false;
+ //...other configurations
+}
+````
+
+Use `property.UI.OnCreateForm` and `property.UI.OnEditForm` to control forms too. If a property is required, but not added to the create form, you definitely get a validation exception, so use this option carefully. But a required property may not be in the edit form if that's your requirement.
+
+### HTTP API Availability
+
+Even if you disable a property on UI, it can be still available through the HTTP API. By default, a property is available on all APIs.
+
+Use the `property.Api` options to make a property unavailable in some API endpoints.
+
+````csharp
+property =>
+{
+ property.Api.OnUpdate.IsAvailable = false;
+}
+````
+
+In this example, Update HTTP API will not allow to set a new value to this property. In this case, you also want to disable this property on the edit form:
+
+````csharp
+property =>
+{
+ property.Api.OnUpdate.IsAvailable = false;
+ property.UI.OnEditForm.IsVisible = false;
+}
+````
+
+In addition to the `property.Api.OnUpdate`, you can set `property.Api.OnCreate` and `property.Api.OnGet` for a fine control the API endpoint.
+
+## Special Types
+
+### Enum
+
+Module extension system naturally supports the `enum` types.
+
+An example enum type:
+
+````csharp
+public enum UserType
+{
+ Regular,
+ Moderator,
+ SuperUser
+}
+````
+
+You can add enum properties just like others:
+
+````csharp
+user.AddOrUpdateProperty("Type");
+````
+
+An enum properties is shown as combobox (select) in the create/edit forms:
+
+
+
+#### Localization
+
+Enum member name is shown on the table and forms by default. If you want to localize it, just create a new entry on your [localization](https://docs.abp.io/en/abp/latest/Localization) file:
+
+````json
+"UserType.SuperUser": "Super user"
+````
+
+One of the following names can be used as the localization key:
+
+* `Enum:UserType.SuperUser`
+* `UserType.SuperUser`
+* `SuperUser`
+
+Localization system searches for the key with the given order. Localized text are used on the table and the create/edit forms.
+
+## Database Mapping
+
+For relational databases, all extension property values are stored in a single field in the table:
+
+
+
+`ExtraProperties` field stores the properties as a JSON object. While that's fine for some scenarios, you may want to create a dedicated field for your new property. Fortunately, it is very easy to configure.
+
+If you are using the Entity Framework Core database provider, you can configure the database mapping as shown below:
+
+````csharp
+ObjectExtensionManager.Instance
+ .MapEfCoreProperty(
+ "SocialSecurityNumber",
+ (entityBuilder, propertyBuilder) =>
+ {
+ propertyBuilder.HasMaxLength(64);
+ }
+ );
+````
+
+Write this inside the `YourProjectNameEfCoreEntityExtensionMappings` class in your `.EntityFrameworkCore` project. Then you need to use the standard `Add-Migration` and `Update-Database` commands to create a new database migration and apply the change to your database.
+
+Add-Migration create a new migration as shown below:
+
+````csharp
+public partial class Added_SocialSecurityNumber_To_IdentityUser : Migration
+{
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "SocialSecurityNumber",
+ table: "AbpUsers",
+ maxLength: 128,
+ nullable: true);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "SocialSecurityNumber",
+ table: "AbpUsers");
+ }
+}
+````
+
+Once you update your database, you will see that the `AbpUsers` table has the new property as a standard table field:
+
+
+
+> If you first created a property without a database table field, then you later needed to move this property to a database table field, it is suggested to execute an SQL command in your migration to copy the old values to the new field.
+>
+> However, if you don't make it, the ABP Framework seamlessly manages it. It uses the new database field, but fallbacks to the `ExtraProperties` field if it is null. When you save the entity, it moves the value to the new field.
+
+See the [Extending Entities](Customizing-Application-Modules-Extending-Entities.md) document for more.
+
+## More
+
+See the [Customizing the Modules](Customizing-Application-Modules-Guide.md) guide for an overall index for all the extensibility options.
+
+Here, a few things you can do:
+
+* You can create a second entity that maps to the same database table with the extra property as a standard class property (if you've defined the EF Core mapping). For the example above, you can add a `public string SocialSecurityNumber {get; set;}` property to the `AppUser` entity in your application, since the `AppUser` entity is mapped to the same `AbpUser` table. Do this only if you need it, since it brings more complexity to your application.
+* You can override a domain or application service to perform custom logics with your new property.
+* You can low level control how to add/render a field in the data table on the UI.
+
diff --git a/docs/en/Modules/Identity.md b/docs/en/Modules/Identity.md
index a88087eaa8..8cd7bf3966 100644
--- a/docs/en/Modules/Identity.md
+++ b/docs/en/Modules/Identity.md
@@ -1,6 +1,6 @@
# Identity Management Module
-Identity module is used to manage [organization units](Organization-Units.md), roles, users and their permissions, based on the Microsoft Identity library.
+Identity module is used to manage organization units, roles, users and their permissions, based on the Microsoft Identity library.
> **See [the source code](https://github.com/abpframework/abp/tree/dev/modules/identity). Documentation will come soon...**
diff --git a/docs/en/Tutorials/Part-3.md b/docs/en/Tutorials/Part-3.md
index 2106e82069..e58857ec89 100644
--- a/docs/en/Tutorials/Part-3.md
+++ b/docs/en/Tutorials/Part-3.md
@@ -1386,7 +1386,7 @@ Open the `Books.razor` page and add the following `EntityAction` under the "Edit
+ ConfirmationMessage="() => GetDeleteConfirmationMessage(context)" />
````
* `DeleteEntityAsync` is defined in the base class that deletes the entity by performing a call to the server.
@@ -1429,6 +1429,7 @@ Here the complete code to create the book management CRUD page, that has been de
diff --git a/docs/en/Tutorials/Part-4.md b/docs/en/Tutorials/Part-4.md
index 8dab28a8db..2262598544 100644
--- a/docs/en/Tutorials/Part-4.md
+++ b/docs/en/Tutorials/Part-4.md
@@ -53,7 +53,7 @@ This part covers the **server side** tests. There are several test projects in t
Each project is used to test the related project. Test projects use the following libraries for testing:
* [Xunit](https://xunit.github.io/) as the main test framework.
-* [Shoudly](http://shouldly.readthedocs.io/en/latest/) as the assertion library.
+* [Shoudly](https://github.com/shouldly/shouldly) as the assertion library.
* [NSubstitute](http://nsubstitute.github.io/) as the mocking library.
{{if DB=="EF"}}
diff --git a/docs/en/Tutorials/Part-7.md b/docs/en/Tutorials/Part-7.md
index 5cae52a4b1..97d28691ae 100644
--- a/docs/en/Tutorials/Part-7.md
+++ b/docs/en/Tutorials/Part-7.md
@@ -150,7 +150,7 @@ namespace Acme.BookStore.Authors
}
````
-* Inherited from the `EfCoreAuthorRepository`, so it inherits the standard repository method implementations.
+* Inherited from the `EfCoreRepository`, so it inherits the standard repository method implementations.
* `WhereIf` is a shortcut extension method of the ABP Framework. It adds the `Where` condition only if the first condition meets (it filters by name, only if the filter was provided). You could do the same yourself, but these type of shortcut methods makes our life easier.
* `sorting` can be a string like `Name`, `Name ASC` or `Name DESC`. It is possible by using the [System.Linq.Dynamic.Core](https://www.nuget.org/packages/System.Linq.Dynamic.Core) NuGet package.
@@ -211,7 +211,7 @@ namespace Acme.BookStore.Authors
}
```
-* Inherited from the `MongoDbAuthorRepository`, so it inherits the standard repository method implementations.
+* Inherited from the `MongoDbRepository`, so it inherits the standard repository method implementations.
* `WhereIf` is a shortcut extension method of the ABP Framework. It adds the `Where` condition only if the first condition meets (it filters by name, only if the filter was provided). You could do the same yourself, but these type of shortcut methods makes our life easier.
* `sorting` can be a string like `Name`, `Name ASC` or `Name DESC`. It is possible by using the [System.Linq.Dynamic.Core](https://www.nuget.org/packages/System.Linq.Dynamic.Core) NuGet package.
@@ -221,4 +221,4 @@ namespace Acme.BookStore.Authors
## The Next Part
-See the [next part](Part-8.md) of this tutorial.
\ No newline at end of file
+See the [next part](Part-8.md) of this tutorial.
diff --git a/docs/en/Tutorials/Part-9.md b/docs/en/Tutorials/Part-9.md
index 65a59f39e1..a1b4b03e21 100644
--- a/docs/en/Tutorials/Part-9.md
+++ b/docs/en/Tutorials/Part-9.md
@@ -1188,4 +1188,4 @@ That's all! This is a fully working CRUD page, you can create, edit and delete t
## The Next Part
-See the [next part](Part-10.md) of this tutorial.
\ No newline at end of file
+See the [next part](Part-10.md) of this tutorial.
diff --git a/docs/en/UI/Angular/List-Service.md b/docs/en/UI/Angular/List-Service.md
index 7cc31a46fd..016b891159 100644
--- a/docs/en/UI/Angular/List-Service.md
+++ b/docs/en/UI/Angular/List-Service.md
@@ -68,6 +68,50 @@ Bind `ListService` to ngx-datatable like this:
```
+## Extending query with custom variables
+
+You can extend the query parameter of the `ListService`'s `hookToQuery` method.
+
+Firstly, you should pass your own type to `ListService` as shown below:
+
+```typescript
+constructor(public readonly list: ListService) { }
+```
+
+Then update the `bookStreamCreator` constant like following:
+
+```typescript
+const bookStreamCreator = (query) => this.bookService.getList({...query, name: 'name here'});
+```
+
+You can also create your params object.
+
+Define a variable like this:
+
+```typescript
+booksSearchParams = {} as BooksSearchParamsDto;
+```
+
+Update the `bookStreamCreator` constant:
+
+```typescript
+const bookStreamCreator = (query) => this.bookService.getList({...query, ...this.booksSearchParams});
+```
+
+Then you can place inputs to the HTML:
+
+```html
+
+
+
+```
+
+`ListService` emits the hookToQuery stream when you call the `this.list.get()` method.
## Usage with Observables
diff --git a/docs/en/UI/AspNetCore/Data-Table-Column-Extensions.md b/docs/en/UI/AspNetCore/Data-Table-Column-Extensions.md
new file mode 100644
index 0000000000..fec0ac71fb
--- /dev/null
+++ b/docs/en/UI/AspNetCore/Data-Table-Column-Extensions.md
@@ -0,0 +1,161 @@
+# Data Table Column Extensions for ASP.NET Core UI
+
+## Introduction
+
+Data table column extension system allows you to add a **new table column** on the user interface. The example below adds a new column with the "Social security no" title:
+
+
+
+You can use the standard column options to fine control the table column.
+
+> Note that this is a low level API to find control the table column. If you want to show an extension property on the table, see the [module entity extension](../../Module-Entity-Extensions.md) document.
+
+## How to Set Up
+
+### Create a JavaScript File
+
+First, add a new JavaScript file to your solution. We added inside the `/Pages/Identity/Users` folder of the `.Web` project:
+
+
+
+Here, the content of this JavaScript file:
+
+```js
+abp.ui.extensions.tableColumns
+ .get('identity.user')
+ .addContributor(function (columnList) {
+ columnList.addTail({ //add as the last column
+ title: 'Social security no',
+ data: 'extraProperties.SocialSecurityNumber',
+ orderable: false,
+ render: function (data, type, row) {
+ if (row.extraProperties.SocialSecurityNumber) {
+ return '' +
+ row.extraProperties.SocialSecurityNumber +
+ '';
+ } else {
+ return 'undefined';
+ }
+ }
+ });
+ });
+```
+
+This example defines a custom `render` function to return a custom HTML to render in the column.
+
+### Add the File to the User Management Page
+
+Then you need to add this JavaScript file to the user management page. You can take the power of the [Bundling & Minification system](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Bundling-Minification).
+
+Write the following code inside the `ConfigureServices` of your module class:
+
+```csharp
+Configure(options =>
+{
+ options.ScriptBundles.Configure(
+ typeof(Volo.Abp.Identity.Web.Pages.Identity.Users.IndexModel).FullName,
+ bundleConfiguration =>
+ {
+ bundleConfiguration.AddFiles(
+ "/Pages/Identity/Users/my-user-extensions.js"
+ );
+ });
+});
+```
+
+This configuration adds `my-user-extensions.js` to the user management page of the Identity Module. `typeof(Volo.Abp.Identity.Web.Pages.Identity.Users.IndexModel).FullName` is the name of the bundle in the user management page. This is a common convention used for all the ABP Commercial modules.
+
+### Rendering the Column
+
+This example assumes that you've defined a `SocialSecurityNumber` extra property using the [module entity extension](../../Module-Entity-Extensions.md) system. However;
+
+* You can add a new column that is related to an existing property of the user (that was not added to the table by default). Example:
+
+````js
+abp.ui.extensions.tableColumns
+ .get('identity.user')
+ .addContributor(function (columnList) {
+ columnList.addTail({
+ title: 'Phone confirmed?',
+ data: 'phoneNumberConfirmed',
+ render: function (data, type, row) {
+ if (row.phoneNumberConfirmed) {
+ return 'YES';
+ } else {
+ return 'NO';
+ }
+ }
+ });
+ });
+````
+
+* You can add a new custom column that is not related to any entity property, but a completely custom information. Example:
+
+````js
+abp.ui.extensions.tableColumns
+ .get('identity.user')
+ .addContributor(function (columnList) {
+ columnList.addTail({
+ title: 'Custom column',
+ data: {},
+ orderable: false,
+ render: function (data) {
+ if (data.phoneNumber) {
+ return "call: " + data.phoneNumber;
+ } else {
+ return '';
+ }
+ }
+ });
+ });
+````
+
+## API
+
+This section explains details of the `abp.ui.extensions.tableColumns` JavaScript API.
+
+### abp.ui.extensions.tableColumns.get(entityName)
+
+This method is used to access the table columns for an entity of a specific module. It takes one parameter:
+
+* **entityName**: The name of the entity defined by the related module.
+
+### abp.ui.extensions.tableColumns.get(entityName).columns
+
+The `columns` property is used to retrieve a [doubly linked list](../Common/Utils/Linked-List.md) of previously defined columns for a table. All contributors are executed in order to prepare the final column list. This is normally called by the modules to show the columns in the table. However, you can use it if you are building your own extensible UIs.
+
+### abp.ui.extensions.tableColumns.get(entityName).addContributor(contributeCallback [, order])
+
+The `addContributor` method covers all scenarios, e.g. you want to add your column in a different position in the list, change or remove an existing column. `addContributor` has the following parameters:
+
+* **contributeCallback**: A callback function that is called whenever the column list should be created. You can freely modify the column list inside this callback method.
+* **order** (optional): The order of the callback in the callback list. Your callback is added to the end of the list (so, you have opportunity to modify columns added by the previous contributors). You can set it `0` to add your contributor as the first item.
+
+#### Example
+
+```js
+var myColumnDefinition = {
+ title: 'Custom column',
+ data: {},
+ orderable: false,
+ render: function(data) {
+ if (data.phoneNumber) {
+ return "call: " + data.phoneNumber;
+ } else {
+ return '';
+ }
+ }
+};
+
+abp.ui.extensions.tableColumns
+ .get('identity.user')
+ .addContributor(function (columnList) {
+ // Remove an item from actionList
+ columnList.dropHead();
+
+ // Add a new item to the actionList
+ columnList.addHead(myColumnDefinition);
+ });
+```
+
+> `columnList` is [linked list](../Common/Utils/Linked-List.md). You can use its methods to build a list of columns however you need.
diff --git a/docs/en/UI/AspNetCore/Data-Tables.md b/docs/en/UI/AspNetCore/Data-Tables.md
index a9dbf1eecf..b97d49d562 100644
--- a/docs/en/UI/AspNetCore/Data-Tables.md
+++ b/docs/en/UI/AspNetCore/Data-Tables.md
@@ -105,6 +105,32 @@ The `abp.libs.datatables.createAjax` method (used in the example above) adapts r
This works automatically, so most of the times you don't need to know how it works. See the [DTO document](../../Data-Transfer-Objects.md) if you want to learn more about `IPagedAndSortedResultRequest`, `IPagedResult` and other standard interfaces and base DTO classes those are used in client to server communication.
+The `createAjax` also supports you to customize request parameters and handle the responses.
+
+**Example:**
+
+````csharp
+var inputAction = function () {
+ return {
+ id: $('#Id').val(),
+ name: $('#Name').val(),
+ };
+};
+
+var responseCallback = function(result) {
+
+ // your custom code.
+
+ return {
+ recordsTotal: result.totalCount,
+ recordsFiltered: result.totalCount,
+ data: result.items
+ };
+};
+
+ajax: abp.libs.datatables.createAjax(acme.bookStore.books.book.getList, inputAction, responseCallback)
+````
+
### Row Actions
`rowAction` is an option defined by the ABP Framework to the column definitions to show a drop down button to take actions for a row in the table.
@@ -260,4 +286,4 @@ Assuming that the possible values for a column data is `f` and `m`, the `gender`
## Other Data Grids
-You can use any library you like. For example, [see this article](https://community.abp.io/articles/using-devextreme-components-with-the-abp-framework-zb8z7yqv) to learn how to use DevExtreme Data Grid in your applications.
\ No newline at end of file
+You can use any library you like. For example, [see this article](https://community.abp.io/articles/using-devextreme-components-with-the-abp-framework-zb8z7yqv) to learn how to use DevExtreme Data Grid in your applications.
diff --git a/docs/en/UI/AspNetCore/Entity-Action-Extensions.md b/docs/en/UI/AspNetCore/Entity-Action-Extensions.md
new file mode 100644
index 0000000000..f6e865375d
--- /dev/null
+++ b/docs/en/UI/AspNetCore/Entity-Action-Extensions.md
@@ -0,0 +1,108 @@
+# Entity Action Extensions for ASP.NET Core UI
+
+## Introduction
+
+Entity action extension system allows you to add a **new action** to the action menu for an entity. A **Click Me** action was added to the *User Management* page below:
+
+
+
+You can take any action (open a modal, make an HTTP API call, redirect to another page... etc) by writing your custom code. You can access to the current entity in your code.
+
+## How to Set Up
+
+In this example, we will add a "Click Me!" action and execute a JavaScript code for the user management page of the [Identity Module](../../Modules/Identity.md).
+
+### Create a JavaScript File
+
+First, add a new JavaScript file to your solution. We added inside the `/Pages/Identity/Users` folder of the `.Web` project:
+
+
+
+Here, the content of this JavaScript file:
+
+```js
+var clickMeAction = {
+ text: 'Click Me!',
+ action: function(data) {
+ //TODO: Write your custom code
+ alert(data.record.userName);
+ }
+};
+
+abp.ui.extensions.entityActions
+ .get('identity.user')
+ .addContributor(function(actionList) {
+ actionList.addTail(clickMeAction);
+ });
+```
+
+In the `action` function, you can do anything you need. See the API section for a detailed usage.
+
+### Add the File to the User Management Page
+
+Then you need to add this JavaScript file to the user management page. You can take the power of the [Bundling & Minification System](Bundling-Minification.md).
+
+Write the following code inside the `ConfigureServices` of your module class:
+
+```csharp
+Configure(options =>
+{
+ options.ScriptBundles.Configure(
+ typeof(Volo.Abp.Identity.Web.Pages.Identity.Users.IndexModel).FullName,
+ bundleConfiguration =>
+ {
+ bundleConfiguration.AddFiles(
+ "/Pages/Identity/Users/my-user-extensions.js"
+ );
+ });
+});
+```
+
+This configuration adds `my-user-extensions.js` to the user management page of the Identity Module. `typeof(Volo.Abp.Identity.Web.Pages.Identity.Users.IndexModel).FullName` is the name of the bundle in the user management page. This is a common convention used for all the ABP Commercial modules.
+
+That's all. Run your application to see the result.
+
+## API
+
+This section explains details of the `abp.ui.extensions.entityActions` JavaScript API.
+
+### abp.ui.extensions.entityActions.get(entityName)
+
+This method is used to access the entity actions of a specific module. It takes one parameter:
+
+* **entityName**: The name of the entity defined by the related module.
+
+### abp.ui.extensions.entityActions.get(entityName).actions
+
+The `actions` property is used to retrieve a [doubly linked list](../Common/Utils/Linked-List.md) of previously defined actions for an entity. All contributors are executed in order to prepare the final actions list. This is normally called by the modules to show the actions in the grid. However, you can use it if you are building your own extensible UIs.
+
+### abp.ui.extensions.entityActions.get(entityName).addContributor(contributeCallback)
+
+The `addContributor` method covers all scenarios, e.g. you want to add your action in a different position in the list, change or remove an existing action item. `addContributor` with the following parameter:
+
+* **contributeCallback**: A callback function that is called whenever the action list should be created. You can freely modify the action list inside this callback method.
+
+#### Example
+
+```js
+var clickMe2Action = {
+ text: 'Click Me 2!',
+ icon: 'fas fa-hand-point-right',
+ action: function(data) {
+ //TODO: Write your custom code
+ alert(data.record.userName);
+ }
+};
+
+abp.ui.extensions.entityActions
+ .get('identity.user')
+ .addContributor(function(actionList) {
+ // Remove an item from actionList
+ actionList.dropHead();
+
+ // Add the new item to the actionList
+ actionList.addHead(clickMe2Action);
+ });
+```
+
+> `actionList` is [linked list](../Common/Utils/Linked-List.md). You can use its methods to build a list of columns however you need.
diff --git a/docs/en/UI/AspNetCore/Theming.md b/docs/en/UI/AspNetCore/Theming.md
index 8c680973b8..85acf65433 100644
--- a/docs/en/UI/AspNetCore/Theming.md
+++ b/docs/en/UI/AspNetCore/Theming.md
@@ -32,7 +32,7 @@ All the themes must depend on the [@abp/aspnetcore.mvc.ui.theme.shared](https://
* [Twitter Bootstrap](https://getbootstrap.com/) as the fundamental HTML/CSS framework.
* [JQuery](https://jquery.com/) for DOM manipulation.
* [DataTables.Net](https://datatables.net/) for data grids.
-* [JQuery Validation](https://jqueryvalidation.org/) for client side & [unobtrusive](https://github.com/aspnet/jquery-validation-unobtrusive) validation
+* [JQuery Validation](https://github.com/jquery-validation/jquery-validation) for client side & [unobtrusive](https://github.com/aspnet/jquery-validation-unobtrusive) validation
* [FontAwesome](https://fontawesome.com/) as the fundamental CSS font library.
* [SweetAlert](https://sweetalert.js.org/) to show fancy alert message and confirmation dialogs.
* [Toastr](https://github.com/CodeSeven/toastr) to show toast notifications.
diff --git a/docs/en/UI/Blazor/Authentication.md b/docs/en/UI/Blazor/Authentication.md
index 6c1cdb31f5..9dc34ebce5 100644
--- a/docs/en/UI/Blazor/Authentication.md
+++ b/docs/en/UI/Blazor/Authentication.md
@@ -1,3 +1,11 @@
# Blazor UI: Authentication
-TODO
\ No newline at end of file
+The [application startup template](../../Startup-Templates/Application.md) is properly configured to use OpenId Connect to authenticate the user through the server side login form;
+
+* When the Blazor application needs to authenticate, it is redirected to the server side.
+* Users can enter username & password to login if they already have an account. If not, they can use the register form to create a new user. They can also use forgot password and other features. The server side uses IdentityServer4 to handle the authentication.
+* Finally, they are redirected back to the Blazor application to complete the login process.
+
+This is a typical and recommended approach to implement authentication in Single-Page Applications. The client side configuration is done in the startup template, so you can change it.
+
+See the [Blazor Security document](https://docs.microsoft.com/en-us/aspnet/core/blazor/security) to understand and customize the authentication process.
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Authorization.md b/docs/en/UI/Blazor/Authorization.md
new file mode 100644
index 0000000000..7325c8e57b
--- /dev/null
+++ b/docs/en/UI/Blazor/Authorization.md
@@ -0,0 +1,75 @@
+# Blazor UI: Authorization
+
+Blazor applications can use the same authorization system and permissions defined in the server side.
+
+> This document is only for authorizing on the Blazor UI. See the [Server Side Authorization](../../Authorization.md) to learn how to define permissions and control the authorization system.
+
+## Basic Usage
+
+> ABP Framework is **100% compatible** with the Authorization infrastructure provided by the Blazor. See the [Blazor Security Document](https://docs.microsoft.com/en-us/aspnet/core/blazor/security/) to learn all authorization options. This section **only shows some common scenarios**.
+
+### Authorize Attribute
+
+`[Authorize]` attribute can be used to show a page only to the authenticated users.
+
+````csharp
+@page "/"
+@attribute [Authorize]
+
+You can only see this if you're signed in.
+````
+
+The `[Authorize]` attribute also supports role-based or policy-based authorization. For example, you can check permissions defined in the server side:
+
+````csharp
+@page "/"
+@attribute [Authorize("MyPermission")]
+
+You can only see this if you have the necessary permission.
+````
+
+### AuthorizeView
+
+`AuthorizeView` component can be used in a page/component to conditionally render a part of the content:
+
+````html
+
+
You can only see this if you satisfy the "MyPermission" policy.
+
+````
+
+### IAuthorizationService
+
+`IAuthorizationService` can be injected and used to programmatically check permissions:
+
+````csharp
+public partial class Index
+{
+ protected override async Task OnInitializedAsync()
+ {
+ if (await AuthorizationService.IsGrantedAsync("MyPermission"))
+ {
+ //...
+ }
+ }
+}
+````
+
+If your component directly or indirectly inherits from the `AbpComponentBase`, `AuthorizationService` becomes pre-injected and ready to use. If not, you can always [inject](../../Dependency-Injection.md) the `IAuthorizationService` yourself.
+
+`IAuthorizationService` can also be used in the view side where `AuthorizeView` component is not enough.
+
+There are some useful extension methods for the `IAuthorizationService`:
+
+* `IsGrantedAsync` simply returns `true` or `false` for the given policy/permission.
+* `CheckAsync` checks and throws `AbpAuthorizationException` if given policy/permission hasn't granted. You don't have to handle these kind of exceptions since ABP Framework automatically [handles errors](Error-Handling.md).
+* `AuthorizeAsync` returns `AuthorizationResult` as the standard way provided by the ASP.NET Core authorization system.
+
+> See the [Blazor Security Document](https://docs.microsoft.com/en-us/aspnet/core/blazor/security/) to learn all authorization options
+
+## See Also
+
+* [Authorization](../../Authorization.md) (server side)
+* [Blazor Security](https://docs.microsoft.com/en-us/aspnet/core/blazor/security/) (Microsoft documentation)
+* [ICurrentUser Service](CurrentUser.md)
+
diff --git a/docs/en/UI/Blazor/CurrentTenant.md b/docs/en/UI/Blazor/CurrentTenant.md
new file mode 100644
index 0000000000..0ccee9966c
--- /dev/null
+++ b/docs/en/UI/Blazor/CurrentTenant.md
@@ -0,0 +1,23 @@
+# Blazor UI: Current Tenant
+
+`ICurrentTenant` service can be used to get information about the current tenant in a [multi-tenant](../../Multi-Tenancy.md) application. `ICurrentTenant` defines the following properties;
+
+* `Id` (`Guid`): Id of the current tenant. Can be `null` if the current user is a host user or the tenant could not be determined.
+* `Name` (`string`): Name of the current tenant. Can be `null` if the current user is a host user or the tenant could not be determined.
+* `IsAvailable` (`bool`): Returns `true` if the `Id` is not `null`.
+
+**Example: Show the current tenant name on a page**
+
+````csharp
+@page "/"
+@using Volo.Abp.MultiTenancy
+@inject ICurrentTenant CurrentTenant
+@if (CurrentTenant.IsAvailable)
+{
+
Current tenant name: @CurrentTenant.Name
+}
+````
+
+## See Also
+
+* [Multi-Tenancy](../../Multi-Tenancy.md)
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/CurrentUser.md b/docs/en/UI/Blazor/CurrentUser.md
new file mode 100644
index 0000000000..d0d761420a
--- /dev/null
+++ b/docs/en/UI/Blazor/CurrentUser.md
@@ -0,0 +1,22 @@
+# Blazor UI: Current User
+
+`ICurrentUser` service is used to obtain information about the currently authenticated user. Inject the `ICurrentUser` into any component/page and use its properties and methods.
+
+**Example: Show username & email on a page**
+
+````csharp
+@page "/"
+@using Volo.Abp.Users
+@inject ICurrentUser CurrentUser
+@if (CurrentUser.IsAuthenticated)
+{
+
Welcome @CurrentUser.UserName
+}
+````
+
+> If you (directly or indirectly) derived your component from the `AbpComponentBase`, you can directly use the base `CurrentUser` property.
+
+`ICurrentUser` provides `Id`, `Name`, `SurName`, `Email`, `Roles` and some other properties.
+
+> See the [Server Side Current User](../../CurrentUser) service for more information.
+
diff --git a/docs/en/UI/Blazor/Error-Handling.md b/docs/en/UI/Blazor/Error-Handling.md
new file mode 100644
index 0000000000..f43456e3a7
--- /dev/null
+++ b/docs/en/UI/Blazor/Error-Handling.md
@@ -0,0 +1,62 @@
+# Blazor UI: Error Handling
+
+Blazor, by default, shows a yellow line at the bottom of the page if any unhandled exception occurs. However, this is not useful in a real application.
+
+ABP provides an automatic error handling system for the Blazor UI.
+
+* Handles all unhandled exceptions and shows nice and useful messages to the user.
+* It distinguishes different kind of exceptions. Hides internal/technical error details from the user (shows a generic error message in these cases).
+* It is well integrated to the [server side exception handling](../../Exception-Handling.md) system.
+
+## Basic Usage
+
+There are different type of `Exception` classes handled differently by the ABP Framework.
+
+### UserFriendlyException
+
+`UserFriendlyException` is a special type of exception. You can directly show a error message dialog to the user by throwing such an exception.
+
+**Example**
+
+````csharp
+@page "/"
+@using Volo.Abp
+
+
+
+@code
+{
+ private void TestException()
+ {
+ throw new UserFriendlyException("A user friendly error message!");
+ }
+}
+````
+
+ABP automatically handle the exception and show an error message to the user:
+
+
+
+> You can derive from `UserFriendlyException` or directly implement `IUserFriendlyException` interface to create your own `Exception` class if you need.
+
+> You can use the [localization system](Localization.md) to show localized error messages.
+
+### BusinessException and Other Exception Types
+
+See the [exception handling document](../../Exception-Handling.md) to understand different kind of Exception class and interfaces and other capabilities of the Exception Handling system.
+
+## Generic Errors
+
+If the thrown `Exception` is not a special type, it is considered as generic error and a generic error message is shown to the user:
+
+
+
+> All error details (including stack trace) are still written in the browser's console.
+
+## Server Side Errors
+
+Errors (like Validation, Authorization and User Friendly Errors) sent by the server are processed as you expect and properly shown to the user. So, error handling system works end to end without need to manually handle exceptions or manually transfer server-to-client error messages.
+
+## See Also
+
+* [Exception Handling System](../../Exception-Handling.md)
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Overall.md b/docs/en/UI/Blazor/Overall.md
index cf8287f0de..a249dd354b 100644
--- a/docs/en/UI/Blazor/Overall.md
+++ b/docs/en/UI/Blazor/Overall.md
@@ -150,6 +150,12 @@ ABP makes this possible by auto registering components to and resolving the comp
Resolving a component from the Dependency Injection system makes it possible to easily replace components of a depended module.
+## Error Handling
+
+Blazor, by default, shows a yellow line at the bottom of the page if any unhandled exception occurs. However, this is not useful in a real application.
+
+ABP provides an [automatic error handling system](Error-Handling.md) for the Blazor UI.
+
## Customization
While the theme and some modules come as NuGet packages, you can still replace/override and customize them on need. See the [Customization / Overriding Components](Customization-Overriding-Components.md) document.
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Page-Header.md b/docs/en/UI/Blazor/Page-Header.md
new file mode 100644
index 0000000000..2c7921bbd2
--- /dev/null
+++ b/docs/en/UI/Blazor/Page-Header.md
@@ -0,0 +1,3 @@
+# Blazor UI: Page Header
+
+TODO
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Routing.md b/docs/en/UI/Blazor/Routing.md
new file mode 100644
index 0000000000..31a5637b51
--- /dev/null
+++ b/docs/en/UI/Blazor/Routing.md
@@ -0,0 +1,24 @@
+# Blazor UI: Routing
+
+Blazor has its own [routing system](https://docs.microsoft.com/en-us/aspnet/core/blazor/fundamentals/routing) and you can use it in your applications. ABP doesn't add any new feature to it, except one small improvement for the [modular development](../../Module-Development-Basics.md).
+
+## AbpRouterOptions
+
+Blazor `Router` component requires to define `AdditionalAssemblies` when you have components in assemblies/projects other than the main application's entrance assembly. So, if you want to create razor class libraries as ABP modules, you typically want to add the module's assembly to the `AdditionalAssemblies`. In this case, you need to add your module's assembly to the `AbpRouterOptions`.
+
+**Example**
+
+````csharp
+Configure(options =>
+{
+ options.AdditionalAssemblies.Add(typeof(MyBlazorModule).Assembly);
+});
+````
+
+Write this code in the `ConfigureServices` method of your [module](../../Module-Development-Basics.md).
+
+`AbpRouterOptions` has another property, `AppAssembly`, which should be the entrance assembly of the application and typically set in the final application's module. If you've created your solution with the [application startup template](../../Startup-Templates/Application.md), it is already configured for you.
+
+## See Also
+
+* [Blazor Routing](https://docs.microsoft.com/en-us/aspnet/core/blazor/fundamentals/routing) (Microsoft Documentation)
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Testing.md b/docs/en/UI/Blazor/Testing.md
new file mode 100644
index 0000000000..08562c5861
--- /dev/null
+++ b/docs/en/UI/Blazor/Testing.md
@@ -0,0 +1,3 @@
+# Blazor: Testing
+
+Coming soon.
\ No newline at end of file
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 197bbaf988..dcaf236fa9 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -634,39 +634,76 @@
"text": "Localization",
"path": "UI/Blazor/Localization.md"
},
- {
- "text": "Settings",
- "path": "UI/Blazor/Settings.md"
- },
- {
- "text": "Notification",
- "path": "UI/Blazor/Notification.md"
- },
- {
- "text": "Message",
- "path": "UI/Blazor/Message.md"
- },
{
"text": "Theming",
- "path": "UI/Blazor/Theming.md",
"items": [
+ {
+ "text": "Overall",
+ "path": "UI/Blazor/Theming.md"
+ },
{
"text": "The Basic Theme",
"path": "UI/Blazor/Basic-Theme.md"
+ },
+ {
+ "text": "Branding",
+ "path": "UI/Blazor/Branding.md"
+ },
+ {
+ "text": "Page Header",
+ "path": "UI/Blazor/Page-Header.md"
+ },
+ {
+ "text": "Toolbars",
+ "path": "UI/Blazor/Toolbars.md"
}
]
},
{
- "text": "Toolbars",
- "path": "UI/Blazor/Toolbars.md"
+ "text": "Security",
+ "items": [
+ {
+ "text": "Authentication",
+ "path": "UI/Blazor/Authentication.md"
+ },
+ {
+ "text": "Authorization",
+ "path": "UI/Blazor/Authorization.md"
+ }
+ ]
},
{
- "text": "Page Alerts",
- "path": "UI/Blazor/Page-Alerts.md"
+ "text": "Services",
+ "items": [
+ {
+ "text": "Current User",
+ "path": "UI/Blazor/CurrentUser.md"
+ },
+ {
+ "text": "Current Tenant",
+ "path": "UI/Blazor/CurrentTenant.md"
+ },
+ {
+ "text": "Notification",
+ "path": "UI/Blazor/Notification.md"
+ },
+ {
+ "text": "Message",
+ "path": "UI/Blazor/Message.md"
+ },
+ {
+ "text": "Page Alerts",
+ "path": "UI/Blazor/Page-Alerts.md"
+ }
+ ]
},
{
- "text": "Branding",
- "path": "UI/Blazor/Branding.md"
+ "text": "Settings",
+ "path": "UI/Blazor/Settings.md"
+ },
+ {
+ "text": "Error Handling",
+ "path": "UI/Blazor/Error-Handling.md"
},
{
"text": "Customization / Overriding Components",
@@ -677,8 +714,8 @@
"path": "UI/Blazor/Global-Scripts-Styles.md"
},
{
- "text": "Authentication",
- "path": "UI/Blazor/Authentication.md"
+ "text": "Routing",
+ "path": "UI/Blazor/Routing.md"
}
]
},
diff --git a/docs/en/images/add-new-propert-to-user-database-extra-properties.png b/docs/en/images/add-new-propert-to-user-database-extra-properties.png
new file mode 100644
index 0000000000..90c697461e
Binary files /dev/null and b/docs/en/images/add-new-propert-to-user-database-extra-properties.png differ
diff --git a/docs/en/images/add-new-propert-to-user-database-field.png b/docs/en/images/add-new-propert-to-user-database-field.png
new file mode 100644
index 0000000000..334ba0aa35
Binary files /dev/null and b/docs/en/images/add-new-propert-to-user-database-field.png differ
diff --git a/docs/en/images/add-new-property-enum.png b/docs/en/images/add-new-property-enum.png
new file mode 100644
index 0000000000..34a14b1bfb
Binary files /dev/null and b/docs/en/images/add-new-property-enum.png differ
diff --git a/docs/en/images/add-new-property-to-user-form-validation-error-custom.png b/docs/en/images/add-new-property-to-user-form-validation-error-custom.png
new file mode 100644
index 0000000000..6bb1799e19
Binary files /dev/null and b/docs/en/images/add-new-property-to-user-form-validation-error-custom.png differ
diff --git a/docs/en/images/add-new-property-to-user-form-validation-error.png b/docs/en/images/add-new-property-to-user-form-validation-error.png
new file mode 100644
index 0000000000..dd2eb8ad1d
Binary files /dev/null and b/docs/en/images/add-new-property-to-user-form-validation-error.png differ
diff --git a/docs/en/images/add-new-property-to-user-form.png b/docs/en/images/add-new-property-to-user-form.png
new file mode 100644
index 0000000000..bc12a6d5ad
Binary files /dev/null and b/docs/en/images/add-new-property-to-user-form.png differ
diff --git a/docs/en/images/add-new-property-to-user-table.png b/docs/en/images/add-new-property-to-user-table.png
new file mode 100644
index 0000000000..a2a15087cc
Binary files /dev/null and b/docs/en/images/add-new-property-to-user-table.png differ
diff --git a/docs/en/images/blazor-generic-exception-message.png b/docs/en/images/blazor-generic-exception-message.png
new file mode 100644
index 0000000000..5e128003cf
Binary files /dev/null and b/docs/en/images/blazor-generic-exception-message.png differ
diff --git a/docs/en/images/blazor-user-friendly-exception.png b/docs/en/images/blazor-user-friendly-exception.png
new file mode 100644
index 0000000000..fa2a70d931
Binary files /dev/null and b/docs/en/images/blazor-user-friendly-exception.png differ
diff --git a/docs/en/images/table-column-extension-example.png b/docs/en/images/table-column-extension-example.png
new file mode 100644
index 0000000000..84d87bf46c
Binary files /dev/null and b/docs/en/images/table-column-extension-example.png differ
diff --git a/docs/en/images/user-action-extension-click-me.png b/docs/en/images/user-action-extension-click-me.png
new file mode 100644
index 0000000000..4046630f48
Binary files /dev/null and b/docs/en/images/user-action-extension-click-me.png differ
diff --git a/docs/en/images/user-action-extension-on-solution.png b/docs/en/images/user-action-extension-on-solution.png
new file mode 100644
index 0000000000..5f58d3f302
Binary files /dev/null and b/docs/en/images/user-action-extension-on-solution.png differ
diff --git a/docs/zh-Hans/CLI.md b/docs/zh-Hans/CLI.md
index 3390ce99b3..4c63dcd818 100644
--- a/docs/zh-Hans/CLI.md
+++ b/docs/zh-Hans/CLI.md
@@ -126,6 +126,7 @@ abp update [options]
* `--solution-path` 或 `-sp`: 指定解决方案路径/目录. 默认使用当前目录
* `--solution-name` 或 `-sn`: 指定解决方案名称. 默认在目录中搜索`*.sln`文件.
* `--check-all`: 分别检查每个包的新版本. 默认是 `false`.
+* `--version` or `-v`: 指定用于升级的版本. 如果没有指定,则使用最新版本.
### add-package
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
index 4810320664..ac629423ce 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
@@ -1,3 +1,3 @@
@using Volo.Abp.Ui.Branding
@inject IBrandingProvider BrandingProvider
-@BrandingProvider.AppName
+@BrandingProvider.AppName
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs
index 1b5c5893d5..84f9743a1e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs
@@ -3,6 +3,8 @@ using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Configuration;
using Microsoft.JSInterop;
using Volo.Abp.DependencyInjection;
@@ -12,14 +14,28 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
{
private readonly IJSRuntime _jsRuntime;
- public AbpBlazorClientHttpMessageHandler(IJSRuntime jsRuntime)
+ private readonly ICookieService _cookieService;
+
+ private readonly NavigationManager _navigationManager;
+
+ private const string AntiForgeryCookieName = "XSRF-TOKEN";
+
+ private const string AntiForgeryHeaderName = "RequestVerificationToken";
+
+ public AbpBlazorClientHttpMessageHandler(
+ IJSRuntime jsRuntime,
+ ICookieService cookieService,
+ NavigationManager navigationManager)
{
_jsRuntime = jsRuntime;
+ _cookieService = cookieService;
+ _navigationManager = navigationManager;
}
protected async override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
await SetLanguageAsync(request, cancellationToken);
+ await SetAntiForgeryTokenAsync(request);
return await base.SendAsync(request, cancellationToken);
}
@@ -38,5 +54,28 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(selectedLanguage));
}
}
+
+ private async Task SetAntiForgeryTokenAsync(HttpRequestMessage request)
+ {
+ if (request.Method == HttpMethod.Get || request.Method == HttpMethod.Head ||
+ request.Method == HttpMethod.Trace || request.Method == HttpMethod.Options)
+ {
+ return;
+ }
+
+ var selfUri = new Uri(_navigationManager.Uri);
+
+ if (request.RequestUri.Host != selfUri.Host || request.RequestUri.Port != selfUri.Port)
+ {
+ return;
+ }
+
+ var token = await _cookieService.GetAsync(AntiForgeryCookieName);
+
+ if (!token.IsNullOrWhiteSpace())
+ {
+ request.Headers.Add(AntiForgeryHeaderName, token);
+ }
+ }
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
index 10208aa5e9..e24aa6d37b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
@@ -86,12 +86,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
{
selectTagHelper.Items = GetSelectItems(context, output);
}
- else
+ else if(!TagHelper.AutocompleteSelectedItemName.IsNullOrEmpty())
{
- selectTagHelper.Items = new SelectListItem[]
- {
- new SelectListItem(TagHelper.AutocompleteSelectedItemName,TagHelper.AutocompleteSelectedItemValue,true)
- };
+ selectTagHelper.Items = new[]
+ {
+ new SelectListItem(TagHelper.AutocompleteSelectedItemName,
+ TagHelper.AutocompleteSelectedItemValue, false)
+ };
}
var selectTagHelperOutput = await selectTagHelper.ProcessAndGetOutputAsync(GetInputAttributes(context, output), context, "select", TagMode.StartTagAndEndTag);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js
index 6b9e348f1d..63b9d577d1 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js
@@ -9,7 +9,7 @@
});
tenantSwitchModal.onResult(function() {
- location.reload();
+ location.assign(location.href);
});
});
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/CmsKit/CmsKitScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/CmsKit/CmsKitScriptContributor.cs
new file mode 100644
index 0000000000..9d022fb85e
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/CmsKit/CmsKitScriptContributor.cs
@@ -0,0 +1,11 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.StarRatingSvg;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.CmsKit
+{
+ [DependsOn(typeof(StarRatingSvgScriptContributor))]
+ public class CmsKitScriptContributor : BundleContributor
+ {
+ }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/CmsKit/CmsKitStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/CmsKit/CmsKitStyleContributor.cs
new file mode 100644
index 0000000000..e2654827e4
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/CmsKit/CmsKitStyleContributor.cs
@@ -0,0 +1,11 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.StarRatingSvg;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.CmsKit
+{
+ [DependsOn(typeof(StarRatingSvgStyleContributor))]
+ public class CmsKitStyleContributor : BundleContributor
+ {
+ }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
index 2bbd1aa7a3..b0c4873b59 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@@ -325,7 +325,14 @@
* AJAX extension for datatables *
*************************************************************************/
(function () {
- datatables.createAjax = function (serverMethod, inputAction) {
+ datatables.createAjax = function (serverMethod, inputAction, responseCallback) {
+ responseCallback = responseCallback || function(result) {
+ return {
+ recordsTotal: result.totalCount,
+ recordsFiltered: result.totalCount,
+ data: result.items
+ };
+ }
return function (requestData, callback, settings) {
var input = inputAction ? inputAction(requestData, settings) : {};
@@ -359,11 +366,7 @@
if (callback) {
serverMethod(input).then(function (result) {
- callback({
- recordsTotal: result.totalCount,
- recordsFiltered: result.totalCount,
- data: result.items
- });
+ callback(responseCallback(result));
});
}
};
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
index 208cfa1376..ad0066db55 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/StandardLayouts.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/StandardLayouts.cs
index 3e1b751262..338d12f531 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/StandardLayouts.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/StandardLayouts.cs
@@ -4,6 +4,7 @@
{
public const string Application = "Application";
public const string Account = "Account";
+ public const string Public = "Public";
public const string Empty = "Empty";
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs
index ad6e5f49d1..9583fd57cf 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs
@@ -12,9 +12,14 @@
return theme.GetLayout(StandardLayouts.Account, fallbackToDefault);
}
+ public static string GetPublicLayout(this ITheme theme, bool fallbackToDefault = true)
+ {
+ return theme.GetLayout(StandardLayouts.Public, fallbackToDefault);
+ }
+
public static string GetEmptyLayout(this ITheme theme, bool fallbackToDefault = true)
{
return theme.GetLayout(StandardLayouts.Empty, fallbackToDefault);
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj
index fde96ac65c..53e3c7f503 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertiesDictionaryModelBinderProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertiesDictionaryModelBinderProvider.cs
index 2aadddbb8b..faa490acfa 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertiesDictionaryModelBinderProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertiesDictionaryModelBinderProvider.cs
@@ -23,7 +23,8 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
return null;
}
- if (!context.Metadata.ContainerType.IsAssignableTo())
+ if (context.Metadata.ContainerType == null ||
+ !context.Metadata.ContainerType.IsAssignableTo())
{
return null;
}
diff --git a/framework/src/Volo.Abp.Authorization/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions.cs b/framework/src/Volo.Abp.Authorization/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions.cs
index 45650b06a4..bb820c3a83 100644
--- a/framework/src/Volo.Abp.Authorization/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions.cs
+++ b/framework/src/Volo.Abp.Authorization/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions.cs
@@ -95,7 +95,8 @@ namespace Microsoft.AspNetCore.Authorization
{
if (!await authorizationService.IsGrantedAsync(policyName))
{
- throw new AbpAuthorizationException("Authorization failed! Given policy has not granted: " + policyName);
+ throw new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenPolicyHasNotGrantedWithPolicyName)
+ .WithData("PolicyName", policyName);
}
}
@@ -103,7 +104,8 @@ namespace Microsoft.AspNetCore.Authorization
{
if (!await authorizationService.IsGrantedAsync(resource, requirement))
{
- throw new AbpAuthorizationException("Authorization failed! Given requirement has not granted for given resource: " + resource);
+ throw new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenRequirementHasNotGrantedForGivenResource)
+ .WithData("ResourceName", resource);
}
}
@@ -111,7 +113,8 @@ namespace Microsoft.AspNetCore.Authorization
{
if (!await authorizationService.IsGrantedAsync(resource, policy))
{
- throw new AbpAuthorizationException("Authorization failed! Given policy has not granted for given resource: " + resource);
+ throw new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenPolicyHasNotGrantedForGivenResource)
+ .WithData("ResourceName", resource);
}
}
@@ -119,7 +122,7 @@ namespace Microsoft.AspNetCore.Authorization
{
if (!await authorizationService.IsGrantedAsync(policy))
{
- throw new AbpAuthorizationException("Authorization failed! Given policy has not granted.");
+ throw new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenPolicyHasNotGranted);
}
}
@@ -127,7 +130,8 @@ namespace Microsoft.AspNetCore.Authorization
{
if (!await authorizationService.IsGrantedAsync(resource, requirements))
{
- throw new AbpAuthorizationException("Authorization failed! Given requirements have not granted for given resource: " + resource);
+ throw new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenRequirementsHasNotGrantedForGivenResource)
+ .WithData("ResourceName", resource);
}
}
@@ -135,7 +139,8 @@ namespace Microsoft.AspNetCore.Authorization
{
if (!await authorizationService.IsGrantedAsync(resource, policyName))
{
- throw new AbpAuthorizationException("Authorization failed! Given polist has not granted for given resource: " + resource);
+ throw new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenPolicyHasNotGrantedForGivenResource)
+ .WithData("ResourceName", resource);
}
}
@@ -149,4 +154,4 @@ namespace Microsoft.AspNetCore.Authorization
return abpAuthorizationService;
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj b/framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj
index 9e355531fa..66dd574322 100644
--- a/framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj
+++ b/framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj
@@ -19,7 +19,12 @@
-
+
+
+
+
+
+
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationErrorCodes.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationErrorCodes.cs
new file mode 100644
index 0000000000..0d4562eba3
--- /dev/null
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationErrorCodes.cs
@@ -0,0 +1,15 @@
+namespace Volo.Abp.Authorization
+{
+ public static class AbpAuthorizationErrorCodes
+ {
+ public const string GivenPolicyHasNotGranted = "Volo.Authorization:010001";
+
+ public const string GivenPolicyHasNotGrantedWithPolicyName = "Volo.Authorization:010002";
+
+ public const string GivenPolicyHasNotGrantedForGivenResource = "Volo.Authorization:010003";
+
+ public const string GivenRequirementHasNotGrantedForGivenResource = "Volo.Authorization:010004";
+
+ public const string GivenRequirementsHasNotGrantedForGivenResource = "Volo.Authorization:010005";
+ }
+}
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs
index b16e08a214..b4d5795b9c 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs
@@ -3,17 +3,20 @@ using System.Collections.Generic;
using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
+using Volo.Abp.Authorization.Localization;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Security;
+using Volo.Abp.VirtualFileSystem;
namespace Volo.Abp.Authorization
{
[DependsOn(
typeof(AbpSecurityModule),
- typeof(AbpLocalizationAbstractionsModule),
+ typeof(AbpLocalizationModule),
typeof(AbpMultiTenancyModule)
)]
public class AbpAuthorizationModule : AbpModule
@@ -38,6 +41,23 @@ namespace Volo.Abp.Authorization
options.ValueProviders.Add();
options.ValueProviders.Add();
});
+
+ Configure(options =>
+ {
+ options.FileSets.AddEmbedded();
+ });
+
+ Configure(options =>
+ {
+ options.Resources
+ .Add("en")
+ .AddVirtualJson("/Volo/Abp/Authorization/Localization");
+ });
+
+ Configure(options =>
+ {
+ options.MapCodeNamespace("Volo.Authorization", typeof(AbpAuthorizationResource));
+ });
}
private static void AutoAddDefinitionProviders(IServiceCollection services)
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/AbpAuthorizationResource.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/AbpAuthorizationResource.cs
new file mode 100644
index 0000000000..2888509915
--- /dev/null
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/AbpAuthorizationResource.cs
@@ -0,0 +1,10 @@
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.Authorization.Localization
+{
+ [LocalizationResourceName("AbpAuthorization")]
+ public class AbpAuthorizationResource
+ {
+
+ }
+}
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/en.json b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/en.json
new file mode 100644
index 0000000000..e7bc77c341
--- /dev/null
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/en.json
@@ -0,0 +1,10 @@
+{
+ "culture": "en",
+ "texts": {
+ "Volo.Authorization:010001": "Authorization failed! Given policy has not granted.",
+ "Volo.Authorization:010002": "Authorization failed! Given policy has not granted: {PolicyName}",
+ "Volo.Authorization:010003": "Authorization failed! Given policy has not granted for given resource: {ResourceName}",
+ "Volo.Authorization:010004": "Authorization failed! Given requirement has not granted for given resource: {ResourceName}",
+ "Volo.Authorization:010005": "Authorization failed! Given requirements has not granted for given resource: {ResourceName}"
+ }
+}
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/tr.json b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/tr.json
new file mode 100644
index 0000000000..b2d79bd949
--- /dev/null
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/tr.json
@@ -0,0 +1,10 @@
+{
+ "culture": "tr",
+ "texts": {
+ "Volo.Authorization:010001": "Yetkilendirme başarısız! Belirtilen izin sağlanmamış.",
+ "Volo.Authorization:010002": "Yetkilendirme başarısız! Bu izin sağlanmamış: {PolicyName}",
+ "Volo.Authorization:010003": "Yetkilendirme başarısız! Bu izin, bu kaynak için sağlanmamış: {ResourceName}",
+ "Volo.Authorization:010004": "Yetkilendirme başarısız! Bu kaynak belirtilen gerekliliği sağlamamış: {ResourceName}",
+ "Volo.Authorization:010005": "Yetkilendirme başarısız! Bu kaynak belirtilen gereklilikleri sağlamamış: {ResourceName}"
+ }
+}
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/zh-Hans.json b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/zh-Hans.json
new file mode 100644
index 0000000000..d0946ef6a5
--- /dev/null
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/zh-Hans.json
@@ -0,0 +1,10 @@
+{
+ "culture": "zh-Hans",
+ "texts": {
+ "Volo.Authorization:010001": "授权失败! 提供的策略尚未授予.",
+ "Volo.Authorization:010002": "授权失败! 提供的策略尚未授予: {PolicyName}",
+ "Volo.Authorization:010003": "授权失败! 提供的策略未授予提供的资源: {ResourceName}",
+ "Volo.Authorization:010004": "授权失败! 提供的要求未授予提供的资源: {ResourceName}",
+ "Volo.Authorization:010005": "授权失败! 提供的要求未授予提供的资源: {ResourceName}"
+ }
+}
diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
index bd5cffe848..9f028d31ee 100644
--- a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
+++ b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
@@ -21,7 +21,7 @@
-
+
diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs
index 024fc3a258..e0f7ec50ad 100644
--- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs
+++ b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs
@@ -27,6 +27,7 @@ using System;
using System.Reflection;
using Autofac.Builder;
using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Autofac;
using Volo.Abp.Modularity;
namespace Autofac.Extensions.DependencyInjection
@@ -116,6 +117,7 @@ namespace Autofac.Extensions.DependencyInjection
.RegisterGeneric(service.ImplementationType)
.As(service.ServiceType)
.ConfigureLifecycle(service.Lifetime)
+ .FindConstructorsWith(new AbpAutofacConstructorFinder())
.ConfigureAbpConventions(moduleContainer, registrationActionList);
}
else
@@ -124,6 +126,7 @@ namespace Autofac.Extensions.DependencyInjection
.RegisterType(service.ImplementationType)
.As(service.ServiceType)
.ConfigureLifecycle(service.Lifetime)
+ .FindConstructorsWith(new AbpAutofacConstructorFinder())
.ConfigureAbpConventions(moduleContainer, registrationActionList);
}
}
diff --git a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
index 2032464676..ec9e4c0364 100644
--- a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
+++ b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/framework/src/Volo.Abp.Autofac/Volo/Abp/Autofac/AbpAutofacConstructorFinder.cs b/framework/src/Volo.Abp.Autofac/Volo/Abp/Autofac/AbpAutofacConstructorFinder.cs
new file mode 100644
index 0000000000..a9d0b736a2
--- /dev/null
+++ b/framework/src/Volo.Abp.Autofac/Volo/Abp/Autofac/AbpAutofacConstructorFinder.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using Autofac.Core.Activators.Reflection;
+
+namespace Volo.Abp.Autofac
+{
+ public class AbpAutofacConstructorFinder : IConstructorFinder
+ {
+ private const BindingFlags DeclaredOnlyPublicFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly; //Remove static constructor, BindingFlags.Static
+
+ private readonly Func _finder;
+
+ private static readonly ConcurrentDictionary DefaultPublicConstructorsCache = new ConcurrentDictionary();
+
+ public AbpAutofacConstructorFinder()
+ : this(GetDefaultPublicConstructors)
+ {
+ }
+
+ public AbpAutofacConstructorFinder(Func finder)
+ {
+ _finder = finder ?? throw new ArgumentNullException(nameof(finder));
+ }
+
+ public ConstructorInfo[] FindConstructors(Type targetType)
+ {
+ return _finder(targetType);
+ }
+
+ private static ConstructorInfo[] GetDefaultPublicConstructors(Type type)
+ {
+ var retval = DefaultPublicConstructorsCache.GetOrAdd(type, t => t.GetConstructors(DeclaredOnlyPublicFlags));
+
+ if (retval.Length == 0)
+ {
+ throw new NoConstructorsFoundException(type);
+ }
+
+ return retval;
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs
index 62e79010cc..2635294323 100644
--- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs
@@ -17,7 +17,7 @@ namespace Volo.Abp.BackgroundJobs
protected AbpBackgroundJobWorkerOptions WorkerOptions { get; }
public BackgroundJobWorker(
- AbpTimer timer,
+ AbpAsyncTimer timer,
IOptions jobOptions,
IOptions workerOptions,
IServiceScopeFactory serviceScopeFactory)
@@ -113,4 +113,4 @@ namespace Volo.Abp.BackgroundJobs
return nextTryDate;
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs
index e6a65a2865..970beea3f0 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs
@@ -34,7 +34,7 @@ namespace Volo.Abp.BackgroundWorkers.Quartz
throw new ArgumentException($"{nameof(worker)} type is different from the generic type");
}
- var timer = (AbpTimer) worker.GetType().GetProperty("Timer", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(worker);
+ var timer = (AbpAsyncTimer) worker.GetType().GetProperty("Timer", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(worker);
period = timer?.Period;
}
else
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs
index ed48ba69ee..094c6eb7eb 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs
@@ -11,15 +11,15 @@ namespace Volo.Abp.BackgroundWorkers
public abstract class AsyncPeriodicBackgroundWorkerBase : BackgroundWorkerBase
{
protected IServiceScopeFactory ServiceScopeFactory { get; }
- protected AbpTimer Timer { get; }
+ protected AbpAsyncTimer Timer { get; }
protected AsyncPeriodicBackgroundWorkerBase(
- AbpTimer timer,
+ AbpAsyncTimer timer,
IServiceScopeFactory serviceScopeFactory)
{
ServiceScopeFactory = serviceScopeFactory;
Timer = timer;
- Timer.Elapsed += Timer_Elapsed;
+ Timer.Elapsed = Timer_Elapsed;
}
public async override Task StartAsync(CancellationToken cancellationToken = default)
@@ -34,23 +34,24 @@ namespace Volo.Abp.BackgroundWorkers
await base.StopAsync(cancellationToken);
}
- private void Timer_Elapsed(object sender, System.EventArgs e)
+ private async Task Timer_Elapsed(AbpAsyncTimer timer)
+ {
+ await DoWorkAsync();
+ }
+
+ private async Task DoWorkAsync()
{
using (var scope = ServiceScopeFactory.CreateScope())
{
try
{
- AsyncHelper.RunSync(
- () => DoWorkAsync(new PeriodicBackgroundWorkerContext(scope.ServiceProvider))
- );
+ await DoWorkAsync(new PeriodicBackgroundWorkerContext(scope.ServiceProvider));
}
catch (Exception ex)
{
- AsyncHelper.RunSync(
- () => scope.ServiceProvider
- .GetRequiredService()
- .NotifyAsync(new ExceptionNotificationContext(ex))
- );
+ await scope.ServiceProvider
+ .GetRequiredService()
+ .NotifyAsync(new ExceptionNotificationContext(ex));
Logger.LogException(ex);
}
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
index e29dbfec6e..6ac757fef5 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
@@ -43,14 +43,12 @@ namespace Volo.Abp.BackgroundWorkers
{
try
{
-
DoWork(new PeriodicBackgroundWorkerContext(scope.ServiceProvider));
}
catch (Exception ex)
{
- scope.ServiceProvider
- .GetRequiredService()
- .NotifyAsync(new ExceptionNotificationContext(ex));
+ var exceptionNotifier = scope.ServiceProvider.GetRequiredService();
+ AsyncHelper.RunSync(() => exceptionNotifier.NotifyAsync(new ExceptionNotificationContext(ex)));
Logger.LogException(ex);
}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
index 30a5c8ad26..612034af19 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
@@ -175,7 +175,7 @@ namespace Volo.Abp.BlazoriseUI
protected virtual int PageSize { get; } = LimitedResultRequestDto.DefaultMaxResultCount;
- protected int CurrentPage;
+ protected int CurrentPage = 1;
protected string CurrentSorting;
protected int? TotalCount;
protected TGetListInput GetListInput = new TGetListInput();
@@ -255,7 +255,7 @@ namespace Volo.Abp.BlazoriseUI
if (GetListInput is IPagedResultRequest pagedResultRequestInput)
{
- pagedResultRequestInput.SkipCount = CurrentPage * PageSize;
+ pagedResultRequestInput.SkipCount = (CurrentPage - 1) * PageSize;
}
if (GetListInput is ILimitedResultRequest limitedResultRequestInput)
@@ -266,13 +266,22 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
+ protected virtual async Task SearchEntitiesAsync()
+ {
+ CurrentPage = 1;
+
+ await GetEntitiesAsync();
+
+ StateHasChanged();
+ }
+
protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs e)
{
CurrentSorting = e.Columns
.Where(c => c.Direction != SortDirection.None)
.Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
.JoinAsString(",");
- CurrentPage = e.Page - 1;
+ CurrentPage = e.Page;
await GetEntitiesAsync();
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor
new file mode 100644
index 0000000000..140aa6502e
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor
@@ -0,0 +1,10 @@
+
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor.cs
new file mode 100644
index 0000000000..95cbdedd20
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Threading.Tasks;
+using Blazorise;
+using Localization.Resources.AbpUi;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+
+namespace Volo.Abp.BlazoriseUI.Components
+{
+ public partial class SubmitButton : ComponentBase
+ {
+ protected bool Submiting { get; set; }
+
+ [Parameter]
+ public string Form { get; set; }
+
+ [Parameter]
+ public ButtonType Type { get; set; } = ButtonType.Submit;
+
+ [Parameter]
+ public Color Color { get; set; } = Color.Primary;
+
+ [Parameter]
+ public bool PreventDefaultOnSubmit { get; set; } = true;
+
+ [Parameter]
+ public bool Block { get; set; }
+
+ [Parameter]
+ public bool? Disabled { get; set; }
+
+ [Parameter]
+ public string SaveResourceKey { get; set; } = "Save";
+
+ [Parameter]
+ public EventCallback Clicked { get; set; }
+
+ [Parameter]
+ public RenderFragment ChildContent { get; set; }
+
+ [Inject]
+ protected IStringLocalizer StringLocalizer { get; set; }
+
+ protected bool IsDisabled
+ => Disabled == true || Submiting;
+
+ protected bool IsLoading
+ => Submiting;
+
+ protected string SaveString
+ => StringLocalizer[SaveResourceKey];
+
+ protected virtual async Task OnClickedHandler()
+ {
+ try
+ {
+ Submiting = true;
+
+ await Clicked.InvokeAsync(null);
+ }
+ catch (Exception)
+ {
+ throw;
+ }
+ finally
+ {
+ Submiting = false;
+
+ await InvokeAsync(StateHasChanged);
+ }
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.csproj b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.csproj
index f3f8249f50..25c486d79f 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.csproj
+++ b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj b/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj
index 796da8aa26..d36d2bfbf3 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj
+++ b/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj b/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj
index 6434e1d43c..73a8116e46 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
index 3a46c3b18e..d62411628e 100644
--- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
+++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
@@ -1029,7 +1029,7 @@ namespace Volo.Abp.Caching
protected virtual void HandleException(Exception ex)
{
- AsyncHelper.RunSync(() => HandleExceptionAsync(ex));
+ _ = HandleExceptionAsync(ex);
}
protected virtual async Task HandleExceptionAsync(Exception ex)
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
index 13f81e730b..c9ea67209f 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
+++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
@@ -15,10 +15,10 @@
-
-
-
-
+
+
+
+
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
index 223b354c6a..12810aebb9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
@@ -81,22 +81,18 @@ namespace Volo.Abp.Cli.Commands
using (var client = new CliHttpClient())
{
- var response = await client.GetHttpResponseMessageWithRetryAsync(
- url,
- CancellationTokenProvider.Token,
- Logger);
-
- if (!response.IsSuccessStatusCode)
+ using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
{
- throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
- }
+ if (!response.IsSuccessStatusCode)
+ {
+ throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+ }
- await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+ await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
- var responseContent = await response.Content.ReadAsStringAsync();
- var result = JsonSerializer.Deserialize(responseContent);
-
- return result;
+ var responseContent = await response.Content.ReadAsStringAsync();
+ return JsonSerializer.Deserialize(responseContent);
+ }
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
index 01807bc0ff..75d2651cbc 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -3,18 +3,22 @@ using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
+using System.Text.Json;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.Core;
using ICSharpCode.SharpZipLib.Zip;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Auth;
+using Volo.Abp.Cli.Http;
using Volo.Abp.Cli.ProjectBuilding;
using Volo.Abp.Cli.ProjectBuilding.Building;
using Volo.Abp.Cli.ProjectBuilding.Templates.App;
using Volo.Abp.Cli.ProjectBuilding.Templates.Console;
using Volo.Abp.Cli.Utils;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Threading;
namespace Volo.Abp.Cli.Commands
{
@@ -25,7 +29,8 @@ namespace Volo.Abp.Cli.Commands
protected TemplateProjectBuilder TemplateProjectBuilder { get; }
public ITemplateInfoProvider TemplateInfoProvider { get; }
- public NewCommand(TemplateProjectBuilder templateProjectBuilder, ITemplateInfoProvider templateInfoProvider)
+ public NewCommand(TemplateProjectBuilder templateProjectBuilder
+ , ITemplateInfoProvider templateInfoProvider)
{
TemplateProjectBuilder = templateProjectBuilder;
TemplateInfoProvider = templateInfoProvider;
@@ -193,7 +198,7 @@ namespace Volo.Abp.Cli.Commands
Logger.LogInformation($"'{projectName}' has been successfully created to '{outputFolder}'");
- if (AppTemplateBase.IsAppTemplate(template ?? TemplateInfoProvider.GetDefault().Name))
+ if (AppTemplateBase.IsAppTemplate(template ?? (await TemplateInfoProvider.GetDefaultAsync()).Name))
{
var isCommercial = template == AppProTemplate.TemplateName;
OpenThanksPage(uiFramework, databaseProvider, isTiered || commandLineArgs.Options.ContainsKey("separate-identity-server"), isCommercial);
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
index 5fd30115e2..3173744bd0 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
@@ -34,24 +34,25 @@ namespace Volo.Abp.Cli.Commands
var directory = commandLineArgs.Options.GetOrNull(Options.SolutionPath.Short, Options.SolutionPath.Long) ??
Directory.GetCurrentDirectory();
+ var version = commandLineArgs.Options.GetOrNull(Options.Version.Short, Options.Version.Long);
if (updateNuget || !updateNpm)
{
- await UpdateNugetPackages(commandLineArgs, directory);
+ await UpdateNugetPackages(commandLineArgs, directory, version);
}
if (updateNpm || !updateNuget)
{
- await UpdateNpmPackages(directory);
+ await UpdateNpmPackages(directory, version);
}
}
- private async Task UpdateNpmPackages(string directory)
+ private async Task UpdateNpmPackages(string directory, string version)
{
- await _npmPackagesUpdater.Update(directory);
+ await _npmPackagesUpdater.Update(directory, version: version);
}
- private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string directory)
+ private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string directory, string version)
{
var solution = commandLineArgs.Options.GetOrNull(Options.SolutionName.Short, Options.SolutionName.Long);
@@ -66,7 +67,7 @@ namespace Volo.Abp.Cli.Commands
{
var solutionName = Path.GetFileName(solution).RemovePostFix(".sln");
- await _nugetPackagesVersionUpdater.UpdateSolutionAsync(solution, checkAll: checkAll);
+ await _nugetPackagesVersionUpdater.UpdateSolutionAsync(solution, checkAll: checkAll, version: version);
Logger.LogInformation($"Volo packages are updated in {solutionName} solution.");
return;
@@ -78,7 +79,7 @@ namespace Volo.Abp.Cli.Commands
{
var projectName = Path.GetFileName(project).RemovePostFix(".csproj");
- await _nugetPackagesVersionUpdater.UpdateProjectAsync(project, checkAll: checkAll);
+ await _nugetPackagesVersionUpdater.UpdateProjectAsync(project, checkAll: checkAll, version: version);
Logger.LogInformation($"Volo packages are updated in {projectName} project.");
return;
@@ -107,6 +108,7 @@ namespace Volo.Abp.Cli.Commands
sb.AppendLine("-sp|--solution-path (Specify the solution path)");
sb.AppendLine("-sn|--solution-name (Specify the solution name)");
sb.AppendLine("--check-all (Check the new version of each package separately)");
+ sb.AppendLine("-v|--version (default: latest version)");
sb.AppendLine("");
sb.AppendLine("Some examples:");
sb.AppendLine("");
@@ -148,6 +150,12 @@ namespace Volo.Abp.Cli.Commands
{
public const string Long = "check-all";
}
+
+ public static class Version
+ {
+ public const string Short = "v";
+ public const string Long = "version";
+ }
}
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
index 3712d0be13..d853067abf 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
@@ -67,10 +67,7 @@ namespace Volo.Abp.Cli.Http
};
}
- if (!cancellationToken.HasValue)
- {
- cancellationToken = CancellationToken.None;
- }
+ cancellationToken ??= CancellationToken.None;
return await HttpPolicyExtensions
.HandleTransientHttpError()
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
index 33a2e10fdf..2aeb8ed90a 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
@@ -59,22 +59,18 @@ namespace Volo.Abp.Cli.Licensing
using (var client = new CliHttpClient())
{
- var response = await client.GetHttpResponseMessageWithRetryAsync(
- url: url,
- cancellationToken: CancellationTokenProvider.Token,
- logger: _logger);
-
- if (!response.IsSuccessStatusCode)
+ using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, _logger))
{
- throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
- }
+ if (!response.IsSuccessStatusCode)
+ {
+ throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+ }
- await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+ await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
- var responseContent = await response.Content.ReadAsStringAsync();
- var apiKeyResult = JsonSerializer.Deserialize(responseContent);
-
- return apiKeyResult;
+ var responseContent = await response.Content.ReadAsStringAsync();
+ return JsonSerializer.Deserialize(responseContent);
+ }
}
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
index 1ecfc9e34d..057ffcc02d 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
@@ -40,13 +40,43 @@ namespace Volo.Abp.Cli.NuGet
}
public async Task GetLatestVersionOrNullAsync(string packageId, bool includeNightly = false, bool includeReleaseCandidates = false)
+ {
+ var versionList = await GetPackageVersionListAsync(packageId, includeNightly, includeReleaseCandidates);
+
+ List versions;
+
+ if (!includeNightly && !includeReleaseCandidates)
+ {
+ versions = versionList
+ .Select(SemanticVersion.Parse)
+ .OrderByDescending(v => v, new VersionComparer()).ToList();
+
+ versions = versions.Where(x => !x.IsPrerelease).ToList();
+ }
+ else if (!includeNightly && includeReleaseCandidates)
+ {
+ versions = versionList
+ .Where(v => !v.Contains("-preview"))
+ .Select(SemanticVersion.Parse)
+ .OrderByDescending(v => v, new VersionComparer()).ToList();
+ }
+ else
+ {
+ versions = versionList
+ .Select(SemanticVersion.Parse)
+ .OrderByDescending(v => v, new VersionComparer()).ToList();
+ }
+
+ return versions.Any() ? versions.Max() : null;
+
+ }
+
+ public async Task> GetPackageVersionListAsync(string packageId, bool includeNightly = false,
+ bool includeReleaseCandidates = false)
{
if (AuthService.IsLoggedIn())
{
- if (_proPackageList == null)
- {
- _proPackageList = await GetProPackageListAsync();
- }
+ _proPackageList ??= await GetProPackageListAsync();
}
string url;
@@ -65,47 +95,16 @@ namespace Volo.Abp.Cli.NuGet
using (var client = new CliHttpClient(setBearerToken: false))
{
- var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
+ using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
url,
cancellationToken: CancellationTokenProvider.Token,
logger: Logger
- );
-
- await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
-
- var responseContent = await responseMessage.Content.ReadAsStringAsync();
-
- List versions;
-
- if (!includeNightly && !includeReleaseCandidates)
- {
- versions = JsonSerializer
- .Deserialize(responseContent)
- .Versions
- .Select(SemanticVersion.Parse)
- .OrderByDescending(v=> v, new VersionComparer()).ToList();
-
- versions = versions.Where(x => !x.IsPrerelease).ToList();
- }
- else if (!includeNightly && includeReleaseCandidates)
+ ))
{
- versions = JsonSerializer
- .Deserialize(responseContent)
- .Versions
- .Where(v=> !v.Contains("-preview"))
- .Select(SemanticVersion.Parse)
- .OrderByDescending(v=> v, new VersionComparer()).ToList();
+ await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
+ var responseContent = await responseMessage.Content.ReadAsStringAsync();
+ return JsonSerializer.Deserialize(responseContent).Versions;
}
- else
- {
- versions = JsonSerializer
- .Deserialize(responseContent)
- .Versions
- .Select(SemanticVersion.Parse)
- .OrderByDescending(v=> v, new VersionComparer()).ToList();
- }
-
- return versions.Any() ? versions.Max() : null;
}
}
@@ -125,27 +124,28 @@ namespace Volo.Abp.Cli.NuGet
var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/proPackageNames";
- var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
+ using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
url: url,
cancellationToken: CancellationTokenProvider.Token,
logger: Logger
- );
-
- if (responseMessage.IsSuccessStatusCode)
+ ))
{
- return JsonSerializer.Deserialize>(await responseMessage.Content.ReadAsStringAsync());
- }
+ if (responseMessage.IsSuccessStatusCode)
+ {
+ return JsonSerializer.Deserialize>(await responseMessage.Content.ReadAsStringAsync());
+ }
- var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
- var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+ var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
+ var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
- if (remoteServiceErrorMessage != null)
- {
- exceptionMessage += remoteServiceErrorMessage;
- }
+ if (remoteServiceErrorMessage != null)
+ {
+ exceptionMessage += remoteServiceErrorMessage;
+ }
- Logger.LogError(exceptionMessage);
- return null;
+ Logger.LogError(exceptionMessage);
+ return null;
+ }
}
public class NuGetVersionResultDto
@@ -154,4 +154,4 @@ namespace Volo.Abp.Cli.NuGet
public List Versions { get; set; }
}
}
-}
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateInfoProvider.cs
index 5330bc9962..55db4cd11a 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateInfoProvider.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateInfoProvider.cs
@@ -1,10 +1,11 @@
-using Volo.Abp.Cli.ProjectBuilding.Building;
+using System.Threading.Tasks;
+using Volo.Abp.Cli.ProjectBuilding.Building;
namespace Volo.Abp.Cli.ProjectBuilding
{
public interface ITemplateInfoProvider
{
- TemplateInfo GetDefault();
+ Task GetDefaultAsync();
TemplateInfo Get(string name);
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
index 7a4df335fe..2aefcfd1a9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
@@ -1,18 +1,44 @@
using System;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Volo.Abp.Cli.Auth;
+using Volo.Abp.Cli.Http;
using Volo.Abp.Cli.ProjectBuilding.Building;
using Volo.Abp.Cli.ProjectBuilding.Templates.App;
using Volo.Abp.Cli.ProjectBuilding.Templates.Console;
using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
using Volo.Abp.Cli.ProjectBuilding.Templates.Wpf;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Threading;
namespace Volo.Abp.Cli.ProjectBuilding
{
public class TemplateInfoProvider : ITemplateInfoProvider, ITransientDependency
{
- public TemplateInfo GetDefault()
+ public ILogger Logger { get; set; }
+
+ public ICancellationTokenProvider CancellationTokenProvider { get; }
+ public IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
+ public AuthService AuthService { get; }
+
+ public TemplateInfoProvider(ICancellationTokenProvider cancellationTokenProvider,
+ IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
+ AuthService authService)
{
- return Get(AppTemplate.TemplateName);
+ CancellationTokenProvider = cancellationTokenProvider;
+ RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
+ AuthService = authService;
+
+ Logger = NullLogger.Instance;
+ }
+
+ public async Task GetDefaultAsync()
+ {
+ var defaultTemplateName = await CheckProLicenseAsync() ? AppProTemplate.TemplateName : AppTemplate.TemplateName;
+
+ return Get(defaultTemplateName);
}
public TemplateInfo Get(string name)
@@ -35,5 +61,39 @@ namespace Volo.Abp.Cli.ProjectBuilding
throw new Exception("There is no template found with given name: " + name);
}
}
+
+
+ private async Task CheckProLicenseAsync()
+ {
+ if (!AuthService.IsLoggedIn())
+ {
+ return false;
+ }
+
+ try
+ {
+ var url = $"{CliUrls.WwwAbpIo}api/license/check-user";
+
+ using (var client = new CliHttpClient())
+ {
+ using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
+ {
+ if (!response.IsSuccessStatusCode)
+ {
+ throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+ }
+
+ await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+
+ var responseContent = await response.Content.ReadAsStringAsync();
+ return JsonSerializer.Deserialize(responseContent);
+ }
+ }
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+ }
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs
index 02b26eba39..cbbb094d11 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs
@@ -49,7 +49,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
public async Task BuildAsync(ProjectBuildArgs args)
{
- var templateInfo = GetTemplateInfo(args);
+ var templateInfo = await GetTemplateInfoAsync(args);
NormalizeArgs(args, templateInfo);
@@ -175,11 +175,11 @@ namespace Volo.Abp.Cli.ProjectBuilding
}
}
- private TemplateInfo GetTemplateInfo(ProjectBuildArgs args)
+ private async Task GetTemplateInfoAsync(ProjectBuildArgs args)
{
if (args.TemplateName.IsNullOrWhiteSpace())
{
- return TemplateInfoProvider.GetDefault();
+ return await TemplateInfoProvider.GetDefaultAsync();
}
else
{
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
index 664ffd182b..ef8385d479 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
@@ -39,6 +39,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module
"MyCompanyName.MyProjectName.Blazor"
));
+ steps.Add(new RemoveProjectFromSolutionStep(
+ "MyCompanyName.MyProjectName.Blazor.Host",
+ projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host"
+ ));
+
steps.Add(new RemoveProjectFromSolutionStep(
"MyCompanyName.MyProjectName.Web.Host",
projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host"
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
index c71e9591c0..d8571843fe 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
@@ -26,24 +26,20 @@ namespace Volo.Abp.Cli.ProjectModification
private readonly PackageJsonFileFinder _packageJsonFileFinder;
private readonly NpmGlobalPackagesChecker _npmGlobalPackagesChecker;
- private readonly MyGetPackageListFinder _myGetPackageListFinder;
private readonly Dictionary _fileVersionStorage = new Dictionary();
- private MyGetApiResponse _myGetApiResponse;
public NpmPackagesUpdater(
PackageJsonFileFinder packageJsonFileFinder,
NpmGlobalPackagesChecker npmGlobalPackagesChecker,
- MyGetPackageListFinder myGetPackageListFinder,
ICancellationTokenProvider cancellationTokenProvider)
{
_packageJsonFileFinder = packageJsonFileFinder;
_npmGlobalPackagesChecker = npmGlobalPackagesChecker;
- _myGetPackageListFinder = myGetPackageListFinder;
CancellationTokenProvider = cancellationTokenProvider;
Logger = NullLogger.Instance;
}
- public async Task Update(string rootDirectory, bool includePreviews = false, bool includeReleaseCandidates = false, bool switchToStable = false)
+ public async Task Update(string rootDirectory, bool includePreviews = false, bool includeReleaseCandidates = false, bool switchToStable = false, string version = null)
{
var fileList = _packageJsonFileFinder.Find(rootDirectory);
@@ -58,7 +54,7 @@ namespace Volo.Abp.Cli.ProjectModification
async Task UpdateAsync(string file)
{
- var updated = await UpdatePackagesInFile(file, includePreviews,includeReleaseCandidates, switchToStable);
+ var updated = await UpdatePackagesInFile(file, includePreviews, includeReleaseCandidates, switchToStable, version);
packagesUpdated.TryAdd(file, updated);
}
@@ -103,7 +99,7 @@ namespace Volo.Abp.Cli.ProjectModification
private static async Task NpmrcFileExistAsync(string directoryName)
{
- return File.Exists(Path.Combine(directoryName, ".npmrc"));
+ return await Task.FromResult(File.Exists(Path.Combine(directoryName, ".npmrc")));
}
private async Task CreateNpmrcFileAsync(string directoryName)
@@ -157,18 +153,19 @@ namespace Volo.Abp.Cli.ProjectModification
{
using (var client = new CliHttpClient(TimeSpan.FromMinutes(1)))
{
- var response = await client.GetHttpResponseMessageWithRetryAsync(
+ using (var response = await client.GetHttpResponseMessageWithRetryAsync(
url: $"{CliUrls.WwwAbpIo}api/myget/apikey/",
cancellationToken: CancellationTokenProvider.Token,
logger: Logger
- );
-
- return Encoding.Default.GetString(await response.Content.ReadAsByteArrayAsync());
+ ))
+ {
+ return Encoding.Default.GetString(await response.Content.ReadAsByteArrayAsync());
+ }
}
}
catch (Exception)
{
- return "";
+ return string.Empty;
}
}
@@ -181,7 +178,8 @@ namespace Volo.Abp.Cli.ProjectModification
string filePath,
bool includePreviews = false,
bool includeReleaseCandidates = false,
- bool switchToStable = false)
+ bool switchToStable = false,
+ string specifiedVersion = null)
{
var packagesUpdated = false;
var fileContent = File.ReadAllText(filePath);
@@ -195,7 +193,7 @@ namespace Volo.Abp.Cli.ProjectModification
foreach (var abpPackage in abpPackages)
{
- var updated = await TryUpdatingPackage(filePath, abpPackage, includePreviews, includeReleaseCandidates, switchToStable);
+ var updated = await TryUpdatingPackage(filePath, abpPackage, includePreviews, includeReleaseCandidates, switchToStable, specifiedVersion);
if (updated)
{
@@ -215,27 +213,46 @@ namespace Volo.Abp.Cli.ProjectModification
JProperty package,
bool includePreviews = false,
bool includeReleaseCandidates = false,
- bool switchToStable = false)
+ bool switchToStable = false,
+ string specifiedVersion = null)
{
- var currentVersion = (string) package.Value;
+ var currentVersion = (string)package.Value;
+
+ var version = string.Empty;
- var version = "";
- if ((includePreviews || (!switchToStable && currentVersion.Contains("-preview"))) && !includeReleaseCandidates)
+ if (!specifiedVersion.IsNullOrWhiteSpace())
{
- version = "preview";
+ if (!SpecifiedVersionExists(specifiedVersion, package))
+ {
+ return false;
+ }
+
+ if (SemanticVersion.Parse(specifiedVersion) <= SemanticVersion.Parse(currentVersion.RemovePreFix("~", "^")))
+ {
+ return false;
+ }
+ version = specifiedVersion.EnsureStartsWith('^');
}
else
{
- if (!switchToStable && IsPrerelease(currentVersion))
+ if ((includePreviews || (!switchToStable && (currentVersion != null && currentVersion.Contains("-preview")))) && !includeReleaseCandidates)
{
- version = await GetLatestVersion(package, true);
+ version = "preview";
}
else
{
- version = await GetLatestVersion(package, includeReleaseCandidates);
+ if (!switchToStable && IsPrerelease(currentVersion))
+ {
+ version = await GetLatestVersion(package, true);
+ }
+ else
+ {
+ version = await GetLatestVersion(package, includeReleaseCandidates);
+ }
}
}
+
if (string.IsNullOrEmpty(version) || version == currentVersion)
{
return false;
@@ -258,18 +275,14 @@ namespace Volo.Abp.Cli.ProjectModification
return version.Split("-", StringSplitOptions.RemoveEmptyEntries).Length > 1;
}
- protected virtual async Task GetLatestVersion(
- JProperty package,
- bool includeReleaseCandidates = false)
+ protected virtual async Task GetLatestVersion(JProperty package, bool includeReleaseCandidates = false)
{
if (_fileVersionStorage.ContainsKey(package.Name))
{
- return _fileVersionStorage[package.Name];
+ return await Task.FromResult(_fileVersionStorage[package.Name]);
}
- var versionListAsJson = CmdHelper.RunCmdAndGetOutput($"npm show {package.Name} versions");
- var versionList = JsonConvert.DeserializeObject(versionListAsJson)
- .OrderByDescending(SemanticVersion.Parse, new VersionComparer()).ToList();
+ var versionList = GetPackageVersionList(package);
var newVersion = includeReleaseCandidates
? versionList.First()
@@ -278,24 +291,24 @@ namespace Volo.Abp.Cli.ProjectModification
if (string.IsNullOrEmpty(newVersion))
{
_fileVersionStorage[package.Name] = newVersion;
- return newVersion;
+ return await Task.FromResult(newVersion);
}
var newVersionWithPrefix = $"~{newVersion}";
_fileVersionStorage[package.Name] = newVersionWithPrefix;
- return newVersionWithPrefix;
+ return await Task.FromResult(newVersionWithPrefix);
}
protected virtual List GetAbpPackagesFromPackageJson(JObject fileObject)
{
- var dependencyList = new[] {"dependencies", "devDependencies", "peerDependencies"};
+ var dependencyList = new[] { "dependencies", "devDependencies", "peerDependencies" };
var abpPackages = new List();
foreach (var dependencyListName in dependencyList)
{
- var dependencies = (JObject) fileObject[dependencyListName];
+ var dependencies = (JObject)fileObject[dependencyListName];
if (dependencies == null)
{
@@ -303,7 +316,9 @@ namespace Volo.Abp.Cli.ProjectModification
}
var properties = dependencies.Properties().ToList();
- abpPackages.AddRange(properties.Where(p => p.Name.StartsWith("@abp/") || p.Name.StartsWith("@volo/"))
+
+ abpPackages
+ .AddRange(properties.Where(p => p.Name.StartsWith("@abp/") || p.Name.StartsWith("@volo/"))
.ToList());
}
@@ -327,5 +342,19 @@ namespace Volo.Abp.Cli.ProjectModification
Logger.LogInformation($"Running npm install on {fileDirectory}");
CmdHelper.RunCmd($"cd {fileDirectory} && npm install");
}
+
+ protected virtual List GetPackageVersionList(JProperty package)
+ {
+ var versionListAsJson = CmdHelper.RunCmdAndGetOutput($"npm show {package.Name} versions");
+ return JsonConvert.DeserializeObject(versionListAsJson)
+ .OrderByDescending(SemanticVersion.Parse, new VersionComparer()).ToList();
+ }
+
+ protected virtual bool SpecifiedVersionExists(string version, JProperty package)
+ {
+ var versionList = GetPackageVersionList(package);
+
+ return versionList.Any(v => v.Equals(version, StringComparison.OrdinalIgnoreCase));
+ }
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs
index de25b11da7..ee736f3aa0 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs
@@ -7,6 +7,8 @@ using System.Threading.Tasks;
using System.Xml;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
+using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Commands;
using Volo.Abp.Cli.Http;
using Volo.Abp.Cli.ProjectBuilding;
using Volo.Abp.Cli.Utils;
@@ -25,19 +27,22 @@ namespace Volo.Abp.Cli.ProjectModification
protected DerivedClassFinder ModuleClassFinder { get; }
protected ModuleClassDependcyAdder ModuleClassDependcyAdder { get; }
protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
+ public BundleCommand BundleCommand { get; }
public ProjectNugetPackageAdder(
IJsonSerializer jsonSerializer,
ProjectNpmPackageAdder npmPackageAdder,
DerivedClassFinder moduleClassFinder,
ModuleClassDependcyAdder moduleClassDependcyAdder,
- IRemoteServiceExceptionHandler remoteServiceExceptionHandler)
+ IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
+ BundleCommand bundleCommand)
{
JsonSerializer = jsonSerializer;
NpmPackageAdder = npmPackageAdder;
ModuleClassFinder = moduleClassFinder;
ModuleClassDependcyAdder = moduleClassDependcyAdder;
RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
+ BundleCommand = bundleCommand;
Logger = NullLogger.Instance;
}
@@ -50,14 +55,14 @@ namespace Volo.Abp.Cli.ProjectModification
);
}
- public Task AddAsync(string projectFile, NugetPackageInfo package, string version = null,
+ public async Task AddAsync(string projectFile, NugetPackageInfo package, string version = null,
bool useDotnetCliToInstall = true)
{
var projectFileContent = File.ReadAllText(projectFile);
if (projectFileContent.Contains($"\"{package.Name}\""))
{
- return Task.CompletedTask;
+ return;
}
if (version == null)
@@ -94,11 +99,14 @@ namespace Volo.Abp.Cli.ProjectModification
}
ModuleClassDependcyAdder.Add(moduleFiles.First(), package.ModuleClass);
+ }
- Logger.LogInformation("Successfully installed.");
+ if (package.Target == NuGetPackageTarget.Blazor)
+ {
+ await RunBundleForBlazorAsync(projectFile);
}
- return Task.CompletedTask;
+ Logger.LogInformation("Successfully installed.");
}
private Task AddUsingDotnetCli(NugetPackageInfo package, string version = null)
@@ -185,5 +193,15 @@ namespace Volo.Abp.Cli.ProjectModification
return JsonSerializer.Deserialize(responseContent);
}
}
+
+ protected virtual async Task RunBundleForBlazorAsync(string projectFile)
+ {
+ var args = new CommandLineArgs("bundle");
+
+ args.Options.Add(BundleCommand.Options.WorkingDirectory.Short, Path.GetDirectoryName(projectFile));
+ args.Options.Add(BundleCommand.Options.ForceBuild.Short, string.Empty);
+
+ await BundleCommand.ExecuteAsync(args);
+ }
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
index 3bcdc34bc9..dc13511896 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Bundling;
using Volo.Abp.Cli.Commands;
using Volo.Abp.Cli.Commands.Services;
using Volo.Abp.Cli.Http;
@@ -35,6 +36,7 @@ namespace Volo.Abp.Cli.ProjectModification
public NugetPackageToLocalReferenceConverter NugetPackageToLocalReferenceConverter { get; }
public AngularModuleSourceCodeAdder AngularModuleSourceCodeAdder { get; }
public NewCommand NewCommand { get; }
+ public BundleCommand BundleCommand { get; }
public SolutionModuleAdder(
IJsonSerializer jsonSerializer,
@@ -49,7 +51,8 @@ namespace Volo.Abp.Cli.ProjectModification
SolutionFileModifier solutionFileModifier,
NugetPackageToLocalReferenceConverter nugetPackageToLocalReferenceConverter,
AngularModuleSourceCodeAdder angularModuleSourceCodeAdder,
- NewCommand newCommand)
+ NewCommand newCommand,
+ BundleCommand bundleCommand)
{
JsonSerializer = jsonSerializer;
ProjectNugetPackageAdder = projectNugetPackageAdder;
@@ -64,6 +67,7 @@ namespace Volo.Abp.Cli.ProjectModification
NugetPackageToLocalReferenceConverter = nugetPackageToLocalReferenceConverter;
AngularModuleSourceCodeAdder = angularModuleSourceCodeAdder;
NewCommand = newCommand;
+ BundleCommand = bundleCommand;
Logger = NullLogger.Instance;
}
@@ -118,15 +122,33 @@ namespace Volo.Abp.Cli.ProjectModification
await AddAngularPackages(solutionFile, module);
}
+ await RunBundleForBlazorAsync(projectFiles, module);
+
ModifyDbContext(projectFiles, module, startupProject, skipDbMigrations);
}
+ private async Task RunBundleForBlazorAsync(string[] projectFiles, ModuleWithMastersInfo module)
+ {
+ var blazorProject = projectFiles.FirstOrDefault(f => f.EndsWith(".Blazor.csproj"));
+
+ if (blazorProject == null || !module.NugetPackages.Any(np=> np.Target == NuGetPackageTarget.Blazor))
+ {
+ return;
+ }
+
+ var args = new CommandLineArgs("bundle");
+
+ args.Options.Add(BundleCommand.Options.WorkingDirectory.Short, Path.GetDirectoryName(blazorProject));
+ args.Options.Add(BundleCommand.Options.ForceBuild.Short, string.Empty);
+
+ await BundleCommand.ExecuteAsync(args);
+ }
+
private async Task RemoveUnnecessaryProjectsAsync(string solutionDirectory, ModuleWithMastersInfo module,
string[] projectFiles)
{
var moduleDirectory = Path.Combine(solutionDirectory, "modules", module.Name);
- var moduleSolutionFile =
- Directory.GetFiles(moduleDirectory, "*.sln", SearchOption.TopDirectoryOnly).First();
+ var moduleSolutionFile = Directory.GetFiles(moduleDirectory, "*.sln", SearchOption.TopDirectoryOnly).First();
var isProjectTiered = await IsProjectTiered(projectFiles);
if (!projectFiles.Any(p => p.EndsWith(".Blazor.csproj")))
@@ -149,6 +171,7 @@ namespace Volo.Abp.Cli.ProjectModification
{
await RemoveProjectByTarget(module, moduleSolutionFile, NuGetPackageTarget.EntityFrameworkCore, isProjectTiered);
await RemoveProjectByPostFix(module, moduleSolutionFile, "test", ".EntityFrameworkCore.Tests");
+ await ChangeDomainTestReferenceToMongoDB(module, moduleSolutionFile);
}
}
@@ -163,6 +186,11 @@ namespace Volo.Abp.Cli.ProjectModification
foreach (var package in packages)
{
+ if (target == NuGetPackageTarget.Web && package.Name.StartsWith("Volo.Abp.Account"))
+ {
+ continue;
+ }
+
await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, package.Name);
var projectPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), "src", package.Name);
@@ -178,12 +206,27 @@ namespace Volo.Abp.Cli.ProjectModification
{
var srcPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), targetFolder);
var projectFolderPath = Directory.GetDirectories(srcPath).FirstOrDefault(d=> d.EndsWith(postFix));
- await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, Path.GetDirectoryName(projectFolderPath));
+ await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, new DirectoryInfo(projectFolderPath).Name);
if (Directory.Exists(projectFolderPath))
{
Directory.Delete(projectFolderPath, true);
}
+
+ }
+
+ private async Task ChangeDomainTestReferenceToMongoDB(ModuleWithMastersInfo module, string moduleSolutionFile)
+ {
+ var srcPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), "test");
+ var projectFolderPath = Directory.GetDirectories(srcPath).FirstOrDefault(d=> d.EndsWith("Domain.Tests"));
+
+ var csprojFile = Directory.GetFiles(projectFolderPath).First(p => p.EndsWith(".csproj"));
+ var moduleFile = Directory.GetFiles(projectFolderPath).First(p => p.EndsWith("DomainTestModule.cs"));
+
+ File.WriteAllText(csprojFile, File.ReadAllText(csprojFile).Replace("EntityFrameworkCore","MongoDB"));
+ File.WriteAllText(moduleFile, File.ReadAllText(moduleFile)
+ .Replace(".EntityFrameworkCore;",".MongoDB;")
+ .Replace("EntityFrameworkCoreTestModule","MongoDbTestModule"));
}
private async Task AddAngularPackages(string solutionFilePath, ModuleWithMastersInfo module)
@@ -256,7 +299,9 @@ namespace Volo.Abp.Cli.ProjectModification
);
}
- await DeleteAppAndDemoFolderAsync(targetModuleFolder);
+ await DeleteRedundantHostProjects(targetModuleFolder,"app");
+ await DeleteRedundantHostProjects(targetModuleFolder,"demo");
+ await DeleteRedundantHostProjects(targetModuleFolder,"host");
if (module.MasterModuleInfos == null)
{
@@ -281,24 +326,22 @@ namespace Volo.Abp.Cli.ProjectModification
await NewCommand.ExecuteAsync(args);
}
- private async Task DeleteAppAndDemoFolderAsync(string targetModuleFolder)
+ private async Task DeleteRedundantHostProjects(string targetModuleFolder, string folderName)
{
- var appFolder = Path.Combine(targetModuleFolder, "app");
- if (Directory.Exists(appFolder))
- {
- Directory.Delete(appFolder, true);
- }
+ var moduleSolutionFile = Directory.GetFiles(targetModuleFolder, "*.sln", SearchOption.TopDirectoryOnly).First();
- var demoFolder = Path.Combine(targetModuleFolder, "demo");
- if (Directory.Exists(demoFolder))
+ var folder = Path.Combine(targetModuleFolder, folderName);
+ if (Directory.Exists(folder))
{
- Directory.Delete(demoFolder, true);
- }
+ var projects = Directory.GetDirectories(folder);
- var hostFolder = Path.Combine(targetModuleFolder, "host");
- if (Directory.Exists(hostFolder))
- {
- Directory.Delete(hostFolder, true);
+ foreach (var project in projects)
+ {
+ await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile,
+ new DirectoryInfo(project).Name);
+ }
+
+ Directory.Delete(folder, true);
}
}
@@ -444,73 +487,76 @@ namespace Volo.Abp.Cli.ProjectModification
private async Task GetEmptyModuleProjectInfoAsync(string moduleName,
bool newProTemplate = false)
{
- var module = new ModuleWithMastersInfo();
+ var module = new ModuleWithMastersInfo
+ {
+ Name = moduleName,
+ DisplayName = moduleName,
+ MasterModuleInfos = new List()
+ };
- module.Name = moduleName;
- module.DisplayName = moduleName;
- module.EfCoreConfigureMethodName = $"{module.Name}.EntityFrameworkCore:Configure{module.Name}";
- module.MasterModuleInfos = new List();
+ var moduleProjectName = module.Name.Split('.').Last();
+ module.EfCoreConfigureMethodName = $"{module.Name}.EntityFrameworkCore:Configure{moduleProjectName}";
module.NugetPackages = new List
{
new NugetPackageInfo
{
Name = $"{module.Name}.Application",
- ModuleClass = $"{module.Name}.{module.Name}ApplicationModule",
+ ModuleClass = $"{module.Name}.{moduleProjectName}ApplicationModule",
Target = NuGetPackageTarget.Application
},
new NugetPackageInfo
{
Name = $"{module.Name}.Application.Contracts",
- ModuleClass = $"{module.Name}.{module.Name}ApplicationContractsModule",
+ ModuleClass = $"{module.Name}.{moduleProjectName}ApplicationContractsModule",
Target = NuGetPackageTarget.ApplicationContracts
},
new NugetPackageInfo
{
Name = $"{module.Name}.Blazor",
- ModuleClass = $"{module.Name}.Blazor.{module.Name}BlazorModule",
+ ModuleClass = $"{module.Name}.Blazor.{moduleProjectName}BlazorModule",
Target = NuGetPackageTarget.Blazor
},
new NugetPackageInfo
{
Name = $"{module.Name}.Domain",
- ModuleClass = $"{module.Name}.{module.Name}DomainModule",
+ ModuleClass = $"{module.Name}.{moduleProjectName}DomainModule",
Target = NuGetPackageTarget.Domain
},
new NugetPackageInfo
{
Name = $"{module.Name}.Domain.Shared",
- ModuleClass = $"{module.Name}.{module.Name}DomainSharedModule",
+ ModuleClass = $"{module.Name}.{moduleProjectName}DomainSharedModule",
Target = NuGetPackageTarget.DomainShared
},
new NugetPackageInfo
{
Name = $"{module.Name}.EntityFrameworkCore",
- ModuleClass = $"{module.Name}.EntityFrameworkCore.{module.Name}EntityFrameworkCoreModule",
+ ModuleClass = $"{module.Name}.EntityFrameworkCore.{moduleProjectName}EntityFrameworkCoreModule",
Target = NuGetPackageTarget.EntityFrameworkCore
},
new NugetPackageInfo
{
Name = $"{module.Name}.HttpApi",
- ModuleClass = $"{module.Name}.{module.Name}HttpApiModule",
+ ModuleClass = $"{module.Name}.{moduleProjectName}HttpApiModule",
Target = NuGetPackageTarget.HttpApi
},
new NugetPackageInfo
{
Name = $"{module.Name}.HttpApi.Client",
- ModuleClass = $"{module.Name}.{module.Name}HttpApiClientModule",
+ ModuleClass = $"{module.Name}.{moduleProjectName}HttpApiClientModule",
Target = NuGetPackageTarget.HttpApiClient
},
new NugetPackageInfo
{
Name = $"{module.Name}.MongoDB",
- ModuleClass = $"{module.Name}.MongoDB.{module.Name}MongoDbModule",
+ ModuleClass = $"{module.Name}.MongoDB.{moduleProjectName}MongoDbModule",
Target = NuGetPackageTarget.MongoDB
},
new NugetPackageInfo
{
Name = $"{module.Name}.Web",
- ModuleClass = $"{module.Name}.Web.{module.Name}WebModule",
+ ModuleClass = $"{module.Name}.Web.{moduleProjectName}WebModule",
Target = NuGetPackageTarget.Web
},
};
@@ -523,7 +569,9 @@ namespace Volo.Abp.Cli.ProjectModification
protected virtual async Task IsProjectTiered(string[] projectFiles)
{
return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
- .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".HttpApi.Host"));
+ .Any(p =>p.EndsWith(".HttpApi.Host"))
+ && projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
+ .Any(p => p.EndsWith(".IdentityServer"));
}
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs
index 275bf23c76..c499dd0ee0 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs
@@ -25,11 +25,11 @@ namespace Volo.Abp.Cli.ProjectModification
Logger = NullLogger.Instance;
}
- public async Task UpdateSolutionAsync(string solutionPath, bool includePreviews = false, bool includeReleaseCandidates = false, bool switchToStable = false, bool checkAll = false)
+ public async Task UpdateSolutionAsync(string solutionPath, bool includePreviews = false, bool includeReleaseCandidates = false, bool switchToStable = false, bool checkAll = false, string version = null)
{
var projectPaths = ProjectFinder.GetProjectFiles(solutionPath);
- if (checkAll)
+ if (checkAll && version.IsNullOrWhiteSpace())
{
Task.WaitAll(projectPaths.Select(projectPath => UpdateInternalAsync(projectPath, includePreviews, includeReleaseCandidates, switchToStable)).ToArray());
}
@@ -48,7 +48,8 @@ namespace Volo.Abp.Cli.ProjectModification
switchToStable,
latestVersionFromNuget,
latestReleaseCandidateVersionFromNuget,
- latestVersionFromMyGet);
+ latestVersionFromMyGet,
+ version);
File.WriteAllText(filePath, updatedContent);
}
@@ -57,9 +58,9 @@ namespace Volo.Abp.Cli.ProjectModification
}
}
- public async Task UpdateProjectAsync(string projectPath, bool includeNightlyPreviews = false, bool includeReleaseCandidates = false, bool switchToStable = false, bool checkAll = false)
+ public async Task UpdateProjectAsync(string projectPath, bool includeNightlyPreviews = false, bool includeReleaseCandidates = false, bool switchToStable = false, bool checkAll = false, string version = null)
{
- if (checkAll)
+ if (checkAll && version.IsNullOrWhiteSpace())
{
await UpdateInternalAsync(projectPath, includeNightlyPreviews, includeReleaseCandidates, switchToStable);
}
@@ -77,7 +78,8 @@ namespace Volo.Abp.Cli.ProjectModification
switchToStable,
latestVersionFromNuget,
latestReleaseCandidateVersionFromNuget,
- latestVersionFromMyGet);
+ latestVersionFromMyGet,
+ version);
File.WriteAllText(projectPath, updatedContent);
}
@@ -91,13 +93,26 @@ namespace Volo.Abp.Cli.ProjectModification
File.WriteAllText(projectPath, updatedContent);
}
+ protected virtual async Task SpecifiedVersionExists(string version, string packageId)
+ {
+ var versionList = await _nuGetService.GetPackageVersionListAsync(packageId);
+
+ if (versionList.All(v => !v.Equals(version, StringComparison.OrdinalIgnoreCase)))
+ {
+ versionList = await _nuGetService.GetPackageVersionListAsync(packageId, true);
+ }
+
+ return versionList.Any(v => v.Equals(version, StringComparison.OrdinalIgnoreCase));
+ }
+
private async Task UpdateVoloPackagesAsync(string content,
bool includeNightlyPreviews = false,
bool includeReleaseCandidates = false,
bool switchToStable = false,
SemanticVersion latestNugetVersion = null,
SemanticVersion latestNugetReleaseCandidateVersion = null,
- string latestMyGetVersion = null)
+ string latestMyGetVersion = null,
+ string specifiedVersion = null)
{
string packageId = null;
@@ -129,40 +144,63 @@ namespace Volo.Abp.Cli.ProjectModification
Logger.LogDebug("Checking package: \"{0}\" - Current version: {1}", packageId, currentSemanticVersion);
- if ((includeNightlyPreviews || (currentVersion.Contains("-preview") && !switchToStable)) && !includeReleaseCandidates)
+ if (!specifiedVersion.IsNullOrWhiteSpace())
{
- var latestVersion = latestMyGetVersion ?? await GetLatestVersionFromMyGet(packageId);
-
- if (currentVersion != latestVersion)
+ if (await SpecifiedVersionExists(specifiedVersion, packageId))
{
- Logger.LogInformation("Updating package \"{0}\" from v{1} to v{2}.", packageId, currentVersion, latestVersion);
- versionAttribute.Value = latestVersion;
+ var specifiedSemanticVersion = SemanticVersion.Parse(specifiedVersion);
+ if (specifiedSemanticVersion > currentSemanticVersion)
+ {
+ Logger.LogInformation("Updating package \"{0}\" from v{1} to v{2}.", packageId, currentVersion, specifiedVersion);
+ versionAttribute.Value = specifiedVersion;
+ }
+ else
+ {
+ Logger.LogWarning("Unable to update package \"{0}\" version v{1} to v{2}.", packageId, currentVersion, specifiedVersion);
+ }
}
else
{
- Logger.LogDebug("Package: \"{0}-v{1}\" is up to date.", packageId, currentVersion);
+ Logger.LogWarning("Package \"{0}\" specified version v{1} does not exist.", packageId, specifiedVersion);
}
}
else
{
- SemanticVersion latestVersion;
- if (currentSemanticVersion.IsPrerelease && !switchToStable)
- {
- latestVersion = latestNugetReleaseCandidateVersion ?? await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: true);
- }
- else
- {
- latestVersion = latestNugetVersion ?? await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: includeReleaseCandidates);
- }
-
- if (latestVersion != null && (currentSemanticVersion < latestVersion || (currentSemanticVersion.IsPrerelease && switchToStable)))
+ if ((includeNightlyPreviews || (currentVersion.Contains("-preview") && !switchToStable)) && !includeReleaseCandidates)
{
- Logger.LogInformation("Updating package \"{0}\" from v{1} to v{2}.", packageId, currentSemanticVersion.ToString(), latestVersion.ToString());
- versionAttribute.Value = latestVersion.ToString();
+ var latestVersion = latestMyGetVersion ?? await GetLatestVersionFromMyGet(packageId);
+
+ if (currentVersion != latestVersion)
+ {
+ Logger.LogInformation("Updating package \"{0}\" from v{1} to v{2}.", packageId, currentVersion, latestVersion);
+ versionAttribute.Value = latestVersion;
+ }
+ else
+ {
+ Logger.LogDebug("Package: \"{0}-v{1}\" is up to date.", packageId, currentVersion);
+ }
}
else
{
- Logger.LogInformation("Package: \"{0}-v{1}\" is up to date.", packageId, currentSemanticVersion);
+ SemanticVersion latestVersion;
+ if (currentSemanticVersion.IsPrerelease && !switchToStable)
+ {
+ latestVersion = latestNugetReleaseCandidateVersion ?? await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: true);
+ }
+ else
+ {
+ latestVersion = latestNugetVersion ?? await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: includeReleaseCandidates);
+ }
+
+ if (latestVersion != null && (currentSemanticVersion < latestVersion || (currentSemanticVersion.IsPrerelease && switchToStable)))
+ {
+ Logger.LogInformation("Updating package \"{0}\" from v{1} to v{2}.", packageId, currentSemanticVersion.ToString(), latestVersion.ToString());
+ versionAttribute.Value = latestVersion.ToString();
+ }
+ else
+ {
+ Logger.LogInformation("Package: \"{0}-v{1}\" is up to date.", packageId, currentSemanticVersion);
+ }
}
}
}
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs
index c78d5f93f3..886520e95c 100644
--- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs
+++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs
@@ -3,13 +3,13 @@ using Microsoft.Extensions.DependencyInjection;
using Serilog;
using Serilog.Events;
using System.IO;
-using Volo.Abp.Threading;
+using System.Threading.Tasks;
namespace Volo.Abp.Cli
{
public class Program
{
- private static void Main(string[] args)
+ private static async Task Main(string[] args)
{
Console.OutputEncoding = System.Text.Encoding.UTF8;
@@ -37,11 +37,9 @@ namespace Volo.Abp.Cli
{
application.Initialize();
- AsyncHelper.RunSync(
- () => application.ServiceProvider
- .GetRequiredService()
- .RunAsync(args)
- );
+ await application.ServiceProvider
+ .GetRequiredService()
+ .RunAsync(args);
application.Shutdown();
}
diff --git a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
index 887929dfa3..3926f8f298 100644
--- a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
+++ b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
@@ -26,10 +26,10 @@
-
+
-
-
-
+
+
+
diff --git a/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj b/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj
index a2fd749d0e..0e267324af 100644
--- a/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj
+++ b/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
index 23943873c3..eaf6d94a83 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
@@ -1,13 +1,13 @@
-// using Volo.Abp.EntityFrameworkCore;
-//
-// namespace Microsoft.EntityFrameworkCore
-// {
-// public static class AbpOracleModelBuilderExtensions
-// {
-// public static void UseOracle(
-// this ModelBuilder modelBuilder)
-// {
-// modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle);
-// }
-// }
-// }
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Microsoft.EntityFrameworkCore
+{
+ public static class AbpOracleModelBuilderExtensions
+ {
+ public static void UseOracle(
+ this ModelBuilder modelBuilder)
+ {
+ modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle);
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
index f42981a9ae..3d4e83e2ad 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
index eaaed380af..43c4c178ee 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
@@ -1,27 +1,34 @@
-// using JetBrains.Annotations;
-// using Microsoft.EntityFrameworkCore;
-// using System;
-// using Devart.Data.Oracle.Entity;
-// using Volo.Abp.EntityFrameworkCore.DependencyInjection;
-//
-// namespace Volo.Abp.EntityFrameworkCore
-// {
-// public static class AbpDbContextConfigurationContextOracleDevartExtensions
-// {
-// public static DbContextOptionsBuilder UseOracle(
-// [NotNull] this AbpDbContextConfigurationContext context,
-// [CanBeNull] Action oracleOptionsAction = null,
-// bool useExistingConnectionIfAvailable = false)
-// {
-// TODO: UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
-// if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
-// {
-// return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);
-// }
-// else
-// {
-// return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction);
-// }
-// }
-// }
-// }
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
+using System;
+using Devart.Data.Oracle.Entity;
+using Volo.Abp.EntityFrameworkCore.DependencyInjection;
+
+namespace Volo.Abp.EntityFrameworkCore
+{
+ public static class AbpDbContextConfigurationContextOracleDevartExtensions
+ {
+ public static DbContextOptionsBuilder UseOracle(
+ [NotNull] this AbpDbContextConfigurationContext context,
+ [CanBeNull] Action oracleOptionsAction = null,
+ bool useExistingConnectionIfAvailable = false)
+ {
+ if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
+ {
+ return context.DbContextOptions.UseOracle(context.ExistingConnection, optionsBuilder =>
+ {
+ optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+ oracleOptionsAction?.Invoke(optionsBuilder);
+ });
+ }
+ else
+ {
+ return context.DbContextOptions.UseOracle(context.ConnectionString, optionsBuilder =>
+ {
+ optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+ oracleOptionsAction?.Invoke(optionsBuilder);
+ });
+ }
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
index 99cfc84b8e..20887ceb79 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
@@ -1,32 +1,32 @@
-// using JetBrains.Annotations;
-// using System;
-// using Devart.Data.Oracle.Entity;
-//
-// namespace Volo.Abp.EntityFrameworkCore
-// {
-// public static class AbpDbContextOptionsOracleDevartExtensions
-// {
-// public static void UseOracle(
-// [NotNull] this AbpDbContextOptions options,
-// [CanBeNull] Action oracleOptionsAction = null,
-// bool useExistingConnectionIfAvailable = false)
-// {
-// options.Configure(context =>
-// {
-// context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
-// });
-// }
-//
-// public static void UseOracle(
-// [NotNull] this AbpDbContextOptions options,
-// [CanBeNull] Action oracleOptionsAction = null,
-// bool useExistingConnectionIfAvailable = false)
-// where TDbContext : AbpDbContext
-// {
-// options.Configure(context =>
-// {
-// context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
-// });
-// }
-// }
-// }
+using JetBrains.Annotations;
+using System;
+using Devart.Data.Oracle.Entity;
+
+namespace Volo.Abp.EntityFrameworkCore
+{
+ public static class AbpDbContextOptionsOracleDevartExtensions
+ {
+ public static void UseOracle(
+ [NotNull] this AbpDbContextOptions options,
+ [CanBeNull] Action oracleOptionsAction = null,
+ bool useExistingConnectionIfAvailable = false)
+ {
+ options.Configure(context =>
+ {
+ context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
+ });
+ }
+
+ public static void UseOracle(
+ [NotNull] this AbpDbContextOptions options,
+ [CanBeNull] Action oracleOptionsAction = null,
+ bool useExistingConnectionIfAvailable = false)
+ where TDbContext : AbpDbContext
+ {
+ options.Configure(context =>
+ {
+ context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
+ });
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
index 3b1b9cc337..9580219cfc 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
@@ -1,22 +1,22 @@
-// using Volo.Abp.Guids;
-// using Volo.Abp.Modularity;
-//
-// namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart
-// {
-// [DependsOn(
-// typeof(AbpEntityFrameworkCoreModule)
-// )]
-// public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule
-// {
-// public override void ConfigureServices(ServiceConfigurationContext context)
-// {
-// Configure(options =>
-// {
-// if (options.DefaultSequentialGuidType == null)
-// {
-// options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
-// }
-// });
-// }
-// }
-// }
+using Volo.Abp.Guids;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart
+{
+ [DependsOn(
+ typeof(AbpEntityFrameworkCoreModule)
+ )]
+ public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule
+ {
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ Configure(options =>
+ {
+ if (options.DefaultSequentialGuidType == null)
+ {
+ options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
+ }
+ });
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
index 8e325342d4..8616838cc0 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
index d75133cb07..0d44fd1249 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
@@ -30,7 +30,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
private readonly IDbContextProvider _dbContextProvider;
private readonly Lazy> _entityOptionsLazy;
- protected virtual IGuidGenerator GuidGenerator { get; set; }
+ public virtual IGuidGenerator GuidGenerator { get; set; }
public EfCoreRepository(IDbContextProvider dbContextProvider)
{
diff --git a/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs b/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs
index 6367bd24ff..eb8c4eb804 100644
--- a/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs
+++ b/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs
@@ -62,12 +62,6 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling
return CreateEntityNotFoundError(exception as EntityNotFoundException);
}
- if (exception is AbpAuthorizationException)
- {
- var authorizationException = exception as AbpAuthorizationException;
- return new RemoteServiceErrorInfo(authorizationException.Message);
- }
-
var errorInfo = new RemoteServiceErrorInfo();
if (exception is IUserFriendlyException)
diff --git a/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj b/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj
index a2d098f970..3bea3ea77f 100644
--- a/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj
+++ b/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj
@@ -15,7 +15,12 @@
-
+
+
+
+
+
+
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureErrorCodes.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureErrorCodes.cs
new file mode 100644
index 0000000000..a5a4cf3a58
--- /dev/null
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureErrorCodes.cs
@@ -0,0 +1,11 @@
+namespace Volo.Abp.Features
+{
+ public static class AbpFeatureErrorCodes
+ {
+ public const string FeatureIsNotEnabled = "Volo.Feature:010001";
+
+ public const string AllOfTheseFeaturesMustBeEnabled = "Volo.Feature:010002";
+
+ public const string AtLeastOneOfTheseFeaturesMustBeEnabled = "Volo.Feature:010003";
+ }
+}
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs
index f30017feed..70c6e7f37d 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs
@@ -1,15 +1,18 @@
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
+using Volo.Abp.Features.Localization;
using Volo.Abp.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Validation;
+using Volo.Abp.VirtualFileSystem;
namespace Volo.Abp.Features
{
[DependsOn(
- typeof(AbpLocalizationAbstractionsModule),
+ typeof(AbpLocalizationModule),
typeof(AbpMultiTenancyModule),
typeof(AbpValidationModule)
)]
@@ -29,6 +32,23 @@ namespace Volo.Abp.Features
options.ValueProviders.Add();
options.ValueProviders.Add();
});
+
+ Configure(options =>
+ {
+ options.FileSets.AddEmbedded();
+ });
+
+ Configure(options =>
+ {
+ options.Resources
+ .Add("en")
+ .AddVirtualJson("/Volo/Abp/Features/Localization");
+ });
+
+ Configure(options =>
+ {
+ options.MapCodeNamespace("Volo.Feature", typeof(AbpFeatureResource));
+ });
}
private static void AutoAddDefinitionProviders(IServiceCollection services)
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs
index 8850408df0..ba2b640031 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs
@@ -9,8 +9,8 @@ namespace Volo.Abp.Features
public static class FeatureCheckerExtensions
{
public static async Task GetAsync(
- [NotNull] this IFeatureChecker featureChecker,
- [NotNull] string name,
+ [NotNull] this IFeatureChecker featureChecker,
+ [NotNull] string name,
T defaultValue = default)
where T : struct
{
@@ -56,10 +56,11 @@ namespace Volo.Abp.Features
{
if (!(await featureChecker.IsEnabledAsync(featureName)))
{
- throw new AbpAuthorizationException("Feature is not enabled: " + featureName);
+ throw new AbpAuthorizationException(code: AbpFeatureErrorCodes.FeatureIsNotEnabled).WithData(
+ "FeatureName", featureName);
}
}
-
+
public static async Task CheckEnabledAsync(this IFeatureChecker featureChecker, bool requiresAll, params string[] featureNames)
{
if (featureNames.IsNullOrEmpty())
@@ -73,10 +74,8 @@ namespace Volo.Abp.Features
{
if (!(await featureChecker.IsEnabledAsync(featureName)))
{
- throw new AbpAuthorizationException(
- "Required features are not enabled. All of these features must be enabled: " +
- string.Join(", ", featureNames)
- );
+ throw new AbpAuthorizationException(code: AbpFeatureErrorCodes.AllOfTheseFeaturesMustBeEnabled)
+ .WithData("FeatureNames", string.Join(", ", featureNames));
}
}
}
@@ -90,11 +89,9 @@ namespace Volo.Abp.Features
}
}
- throw new AbpAuthorizationException(
- "Required features are not enabled. At least one of these features must be enabled: " +
- string.Join(", ", featureNames)
- );
+ throw new AbpAuthorizationException(code: AbpFeatureErrorCodes.AtLeastOneOfTheseFeaturesMustBeEnabled)
+ .WithData("FeatureNames", string.Join(", ", featureNames));
}
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/AbpFeatureResource.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/AbpFeatureResource.cs
new file mode 100644
index 0000000000..5871d550ad
--- /dev/null
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/AbpFeatureResource.cs
@@ -0,0 +1,10 @@
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.Features.Localization
+{
+ [LocalizationResourceName("AbpFeature")]
+ public class AbpFeatureResource
+ {
+
+ }
+}
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/en.json b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/en.json
new file mode 100644
index 0000000000..de03dc11d0
--- /dev/null
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/en.json
@@ -0,0 +1,8 @@
+{
+ "culture": "en",
+ "texts": {
+ "Volo.Feature:010001": "Feature is not enabled: {FeatureName}",
+ "Volo.Feature:010002": "Required features are not enabled. All of these features must be enabled: {FeatureNames}",
+ "Volo.Feature:010003": "Required features are not enabled. At least one of these features must be enabled: {FeatureNames}"
+ }
+}
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/tr.json b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/tr.json
new file mode 100644
index 0000000000..4339c6ea71
--- /dev/null
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/tr.json
@@ -0,0 +1,8 @@
+{
+ "culture": "tr",
+ "texts": {
+ "Volo.Feature:010001": "Bu özellik etkin değil: {FeatureName}",
+ "Volo.Feature:010002": "Gerekli özellikler etkinleştirilmemiş. Bu özelliklerin tümü etkinleştirilmelidir: {FeatureNames}",
+ "Volo.Feature:010003": "Gerekli özellikler etkinleştirilmemiş. Bu özelliklerden en az birinin etkinleştirilmesi gerekir: {FeatureNames}"
+ }
+}
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/zh-Hans.json b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/zh-Hans.json
new file mode 100644
index 0000000000..4c6d99c281
--- /dev/null
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/zh-Hans.json
@@ -0,0 +1,8 @@
+{
+ "culture": "zh-Hans",
+ "texts": {
+ "Volo.Feature:010001": "功能未启用: {FeatureName}",
+ "Volo.Feature:010002": "必要的功能未启用. 这些功能需要启用: {FeatureNames}",
+ "Volo.Feature:010003": "必要的功能未启用. 需要启用这些功能中的一项:{FeatureNames}"
+ }
+}
diff --git a/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj b/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj
index 68ce50ec9d..772774a77e 100644
--- a/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj
+++ b/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs
index e699e0093a..ccc290f354 100644
--- a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs
+++ b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs
@@ -26,7 +26,10 @@ namespace Volo.Abp.FluentValidation
return;
}
- var result = validator.Validate(context.ValidatingObject);
+ var result = validator.Validate((IValidationContext) Activator.CreateInstance(
+ typeof(ValidationContext<>).MakeGenericType(context.ValidatingObject.GetType()),
+ context.ValidatingObject));
+
if (!result.IsValid)
{
context.Errors.AddRange(
diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeature.cs b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeature.cs
index c7fc9304a8..de9ae0232a 100644
--- a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeature.cs
+++ b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeature.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
namespace Volo.Abp.GlobalFeatures
{
diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeaturesDictionary.cs b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeaturesDictionary.cs
index b89bf2fe36..9952b0c5cc 100644
--- a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeaturesDictionary.cs
+++ b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeaturesDictionary.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using JetBrains.Annotations;
namespace Volo.Abp.GlobalFeatures
diff --git a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj
index 3bd6638f67..4ec9d0a3b5 100644
--- a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj
+++ b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj b/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj
index 2000ca7ae4..9b1a1c9caf 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj
+++ b/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj b/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj
index 2a0b576f98..4f8a94fe8e 100644
--- a/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj
+++ b/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj
index ddded71dce..edc3752d47 100644
--- a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj
+++ b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj b/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj
index 1b2f266637..6f25c447f0 100644
--- a/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj
+++ b/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj
index e2f589b399..aa487ffc4e 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj
+++ b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
index 33dd44fbb0..6733688a91 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
@@ -56,7 +56,6 @@ namespace Volo.Abp.ObjectExtending.Modularity
{
AddLookupTextProperty(propertyInfo);
propertyInfo.UI.OnTable.IsVisible = false;
- propertyInfo.Api.OnGet.IsAvailable = false;
}
return this;
}
diff --git a/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj b/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj
index 198d2479e4..0fcc4da9f2 100644
--- a/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj
+++ b/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj
@@ -15,9 +15,9 @@
-
-
-
+
+
+
diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj b/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj
index a21be8bdfa..abec7828ab 100644
--- a/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj
+++ b/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs
index 135156f7a8..fb1b0c7fe2 100644
--- a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs
+++ b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.RabbitMQ
protected IExceptionNotifier ExceptionNotifier { get; }
- protected AbpTimer Timer { get; }
+ protected AbpAsyncTimer Timer { get; }
protected ExchangeDeclareConfiguration Exchange { get; private set; }
@@ -38,7 +38,7 @@ namespace Volo.Abp.RabbitMQ
public RabbitMqMessageConsumer(
IConnectionPool connectionPool,
- AbpTimer timer,
+ AbpAsyncTimer timer,
IExceptionNotifier exceptionNotifier)
{
ConnectionPool = connectionPool;
@@ -50,7 +50,7 @@ namespace Volo.Abp.RabbitMQ
Callbacks = new ConcurrentBag>();
Timer.Period = 5000; //5 sec.
- Timer.Elapsed += Timer_Elapsed;
+ Timer.Elapsed = Timer_Elapsed;
Timer.RunOnStart = true;
}
@@ -77,7 +77,7 @@ namespace Volo.Abp.RabbitMQ
await TrySendQueueBindCommandsAsync();
}
- protected virtual void TrySendQueueBindCommands()
+ protected virtual async Task TrySendQueueBindCommandsAsync()
{
try
{
@@ -119,40 +119,33 @@ namespace Volo.Abp.RabbitMQ
catch (Exception ex)
{
Logger.LogException(ex, LogLevel.Warning);
- AsyncHelper.RunSync(() => ExceptionNotifier.NotifyAsync(ex, logLevel: LogLevel.Warning));
+ await ExceptionNotifier.NotifyAsync(ex, logLevel: LogLevel.Warning);
}
}
- protected virtual Task TrySendQueueBindCommandsAsync()
- {
- TrySendQueueBindCommands();
- return Task.CompletedTask;
- }
-
public virtual void OnMessageReceived(Func callback)
{
Callbacks.Add(callback);
}
- protected virtual void Timer_Elapsed(object sender, EventArgs e)
+ protected virtual async Task Timer_Elapsed(AbpAsyncTimer timer)
{
if (Channel == null || Channel.IsOpen == false)
{
- TryCreateChannel();
- TrySendQueueBindCommands();
+ await TryCreateChannelAsync();
+ await TrySendQueueBindCommandsAsync();
}
}
- protected virtual void TryCreateChannel()
+ protected virtual async Task TryCreateChannelAsync()
{
- DisposeChannel();
+ await DisposeChannelAsync();
try
{
var channel = ConnectionPool
.Get(ConnectionName)
.CreateModel();
-
channel.ExchangeDeclare(
exchange: Exchange.ExchangeName,
type: Exchange.Type,
@@ -172,7 +165,7 @@ namespace Volo.Abp.RabbitMQ
var consumer = new EventingBasicConsumer(channel);
consumer.Received += async (model, basicDeliverEventArgs) =>
{
- await HandleIncomingMessage(channel, basicDeliverEventArgs);
+ await HandleIncomingMessageAsync(channel, basicDeliverEventArgs);
};
channel.BasicConsume(
@@ -186,11 +179,11 @@ namespace Volo.Abp.RabbitMQ
catch (Exception ex)
{
Logger.LogException(ex, LogLevel.Warning);
- AsyncHelper.RunSync(() => ExceptionNotifier.NotifyAsync(ex, logLevel: LogLevel.Warning));
+ await ExceptionNotifier.NotifyAsync(ex, logLevel: LogLevel.Warning);
}
}
- protected virtual async Task HandleIncomingMessage(IModel channel, BasicDeliverEventArgs basicDeliverEventArgs)
+ protected virtual async Task HandleIncomingMessageAsync(IModel channel, BasicDeliverEventArgs basicDeliverEventArgs)
{
try
{
@@ -208,6 +201,24 @@ namespace Volo.Abp.RabbitMQ
}
}
+ protected virtual async Task DisposeChannelAsync()
+ {
+ if (Channel == null)
+ {
+ return;
+ }
+
+ try
+ {
+ Channel.Dispose();
+ }
+ catch (Exception ex)
+ {
+ Logger.LogException(ex, LogLevel.Warning);
+ await ExceptionNotifier.NotifyAsync(ex, logLevel: LogLevel.Warning);
+ }
+ }
+
protected virtual void DisposeChannel()
{
if (Channel == null)
diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs
index ad5b0b65a3..c0a8c4d4f8 100644
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs
@@ -1,6 +1,7 @@
using System;
using System.Runtime.Serialization;
using Microsoft.Extensions.Logging;
+using Volo.Abp.ExceptionHandling;
using Volo.Abp.Logging;
namespace Volo.Abp.Authorization
@@ -9,7 +10,7 @@ namespace Volo.Abp.Authorization
/// This exception is thrown on an unauthorized request.
///
[Serializable]
- public class AbpAuthorizationException : AbpException, IHasLogLevel
+ public class AbpAuthorizationException : AbpException, IHasLogLevel, IHasErrorCode
{
///
/// Severity of the exception.
@@ -17,6 +18,11 @@ namespace Volo.Abp.Authorization
///
public LogLevel LogLevel { get; set; }
+ ///
+ /// Error code.
+ ///
+ public string Code { get; }
+
///
/// Creates a new object.
///
@@ -54,5 +60,24 @@ namespace Volo.Abp.Authorization
{
LogLevel = LogLevel.Warning;
}
+
+ ///
+ /// Creates a new object.
+ ///
+ /// Exception message
+ /// Exception code
+ /// Inner exception
+ public AbpAuthorizationException(string message = null, string code = null, Exception innerException = null)
+ : base(message, innerException)
+ {
+ Code = code;
+ LogLevel = LogLevel.Warning;
+ }
+
+ public AbpAuthorizationException WithData(string name, object value)
+ {
+ Data[name] = value;
+ return this;
+ }
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj
index bbd09c5fed..e9d5e1afe5 100644
--- a/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj
+++ b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj
@@ -2,7 +2,7 @@
-
+
netstandard2.0Volo.Abp.Swashbuckle
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.csproj b/framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.csproj
index 7885cefbaf..af14f9e42e 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.csproj
+++ b/framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateLocalizer.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateLocalizer.cs
index c3c67dd194..4e4a1e4833 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateLocalizer.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateLocalizer.cs
@@ -46,5 +46,20 @@ namespace Volo.Abp.TextTemplating
var args = arguments.Skip(1).Where(x => x != null && !x.ToString().IsNullOrWhiteSpace()).ToArray();
return args.Any() ? _localizer[name.ToString(), args] : _localizer[name.ToString()];
}
+
+ public int RequiredParameterCount => 1;
+
+ public int ParameterCount => ScriptFunctionCall.MaximumParameterCount - 1;
+
+ public ScriptVarParamKind VarParamKind => ScriptVarParamKind.Direct;
+
+ public Type ReturnType => typeof(object);
+
+ public ScriptParameterInfo GetParameterInfo(int index)
+ {
+ return index == 0
+ ? new ScriptParameterInfo(typeof(string), "template_name")
+ : new ScriptParameterInfo(typeof(object), "value");
+ }
}
}
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/LocalizedTemplateContentReaderFactory.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/LocalizedTemplateContentReaderFactory.cs
index 3323ddfd31..981d1f8819 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/LocalizedTemplateContentReaderFactory.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/LocalizedTemplateContentReaderFactory.cs
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
using Volo.Abp.DependencyInjection;
@@ -52,7 +53,13 @@ namespace Volo.Abp.TextTemplating.VirtualFiles
var fileInfo = VirtualFileProvider.GetFileInfo(virtualPath);
if (!fileInfo.Exists)
{
- throw new AbpException("Could not find a file/folder at the location: " + virtualPath);
+ var directoryContents = VirtualFileProvider.GetDirectoryContents(virtualPath);
+ if (!directoryContents.Exists)
+ {
+ throw new AbpException("Could not find a file/folder at the location: " + virtualPath);
+ }
+
+ fileInfo = new VirtualDirectoryFileInfo(virtualPath, virtualPath, DateTimeOffset.UtcNow);
}
if (fileInfo.IsDirectory)
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFolderLocalizedTemplateContentReader.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFolderLocalizedTemplateContentReader.cs
index 638a7db190..6fc7ff4847 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFolderLocalizedTemplateContentReader.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFolderLocalizedTemplateContentReader.cs
@@ -11,18 +11,18 @@ namespace Volo.Abp.TextTemplating.VirtualFiles
private Dictionary _dictionary;
public async Task ReadContentsAsync(
- IVirtualFileProvider virtualFileProvider,
+ IVirtualFileProvider virtualFileProvider,
string virtualPath)
{
_dictionary = new Dictionary();
- var directoryInfo = virtualFileProvider.GetFileInfo(virtualPath);
- if (!directoryInfo.IsDirectory)
+ var directoryContents = virtualFileProvider.GetDirectoryContents(virtualPath);
+ if (!directoryContents.Exists)
{
- throw new AbpException("Given virtual path is not a folder: " + virtualPath);
+ throw new AbpException("Could not find a folder at the location: " + virtualPath);
}
- foreach (var file in virtualFileProvider.GetDirectoryContents(virtualPath))
+ foreach (var file in directoryContents)
{
if (file.IsDirectory)
{
@@ -43,4 +43,4 @@ namespace Volo.Abp.TextTemplating.VirtualFiles
return _dictionary.GetOrDefault(cultureName);
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpAsyncTimer.cs b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpAsyncTimer.cs
new file mode 100644
index 0000000000..8ce369ef66
--- /dev/null
+++ b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpAsyncTimer.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.ExceptionHandling;
+
+namespace Volo.Abp.Threading
+{
+ ///
+ /// A robust timer implementation that ensures no overlapping occurs. It waits exactly specified between ticks.
+ ///
+ public class AbpAsyncTimer : ITransientDependency
+ {
+ ///
+ /// This func is raised periodically according to Period of Timer.
+ ///
+ public Func Elapsed = _ => Task.CompletedTask;
+
+ ///
+ /// Task period of timer (as milliseconds).
+ ///
+ public int Period { get; set; }
+
+ ///
+ /// Indicates whether timer raises Elapsed event on Start method of Timer for once.
+ /// Default: False.
+ ///
+ public bool RunOnStart { get; set; }
+
+ public ILogger Logger { get; set; }
+
+ public IExceptionNotifier ExceptionNotifier { get; set; }
+
+ private readonly Timer _taskTimer;
+ private volatile bool _performingTasks;
+ private volatile bool _isRunning;
+
+ public AbpAsyncTimer()
+ {
+ ExceptionNotifier = NullExceptionNotifier.Instance;
+ Logger = NullLogger.Instance;
+
+ _taskTimer = new Timer(
+ TimerCallBack,
+ null,
+ Timeout.Infinite,
+ Timeout.Infinite
+ );
+ }
+
+ public void Start(CancellationToken cancellationToken = default)
+ {
+ if (Period <= 0)
+ {
+ throw new AbpException("Period should be set before starting the timer!");
+ }
+
+ lock (_taskTimer)
+ {
+ _taskTimer.Change(RunOnStart ? 0 : Period, Timeout.Infinite);
+ _isRunning = true;
+ }
+ }
+
+ public void Stop(CancellationToken cancellationToken = default)
+ {
+ lock (_taskTimer)
+ {
+ _taskTimer.Change(Timeout.Infinite, Timeout.Infinite);
+ while (_performingTasks)
+ {
+ Monitor.Wait(_taskTimer);
+ }
+
+ _isRunning = false;
+ }
+ }
+
+ ///
+ /// This method is called by _taskTimer.
+ ///
+ /// Not used argument
+ private void TimerCallBack(object state)
+ {
+ lock (_taskTimer)
+ {
+ if (!_isRunning || _performingTasks)
+ {
+ return;
+ }
+
+ _taskTimer.Change(Timeout.Infinite, Timeout.Infinite);
+ _performingTasks = true;
+ }
+
+ _ = Timer_Elapsed();
+ }
+
+ private async Task Timer_Elapsed()
+ {
+ try
+ {
+ await Elapsed(this);
+ }
+ catch(Exception ex)
+ {
+ Logger.LogException(ex);
+ await ExceptionNotifier.NotifyAsync(ex);
+ }
+ finally
+ {
+ lock (_taskTimer)
+ {
+ _performingTasks = false;
+ if (_isRunning)
+ {
+ _taskTimer.Change(Period, Timeout.Infinite);
+ }
+
+ Monitor.Pulse(_taskTimer);
+ }
+ }
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpTimer.cs b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpTimer.cs
index 5c5041cdf6..e7e6efd5de 100644
--- a/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpTimer.cs
+++ b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpTimer.cs
@@ -118,4 +118,4 @@ namespace Volo.Abp.Threading
}
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj b/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj
index 53ef23fd62..c0a9f0b271 100644
--- a/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj
+++ b/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj
@@ -26,7 +26,7 @@
-
+
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj
index c5bc024d75..7fa17a9fe7 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
index e1ce323dee..0291900d37 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
@@ -3,7 +3,7 @@
"name": "asp.net",
"private": true,
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.shared": "^4.0.0",
+ "@abp/aspnetcore.mvc.ui.theme.shared": "^4.0.1",
"highlight.js": "^9.13.1"
},
"devDependencies": {}
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
index a39a2aa6c1..09904a5e99 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
@@ -2,30 +2,30 @@
# yarn lockfile v1
-"@abp/aspnetcore.mvc.ui.theme.shared@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.0.tgz#ba896056e9df5ac58e108df96996fbb2ca7a1a15"
- integrity sha512-3RNn6VrNA+cqnPBoSbiCazN05cC2rhcRFMMxkEte+LImGbGOsxc4MflzHg5On1ExCGdqko8Axbw/ydy44Ak4Hw==
- dependencies:
- "@abp/aspnetcore.mvc.ui" "~4.0.0"
- "@abp/bootstrap" "~4.0.0"
- "@abp/bootstrap-datepicker" "~4.0.0"
- "@abp/datatables.net-bs4" "~4.0.0"
- "@abp/font-awesome" "~4.0.0"
- "@abp/jquery-form" "~4.0.0"
- "@abp/jquery-validation-unobtrusive" "~4.0.0"
- "@abp/lodash" "~4.0.0"
- "@abp/luxon" "~4.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~4.0.0"
- "@abp/select2" "~4.0.0"
- "@abp/sweetalert" "~4.0.0"
- "@abp/timeago" "~4.0.0"
- "@abp/toastr" "~4.0.0"
-
-"@abp/aspnetcore.mvc.ui@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.0.tgz#68502177a05f6ce7191a09b06a18c5b5dfab425d"
- integrity sha512-tYHUWMwnwInrGSzC/OdN6bH/VHZEz5DP3rx2U6fcb0I5GvvRdQZxVgUvmWn6DeMA3PG10Gra4SfkhZqRQq9rjQ==
+"@abp/aspnetcore.mvc.ui.theme.shared@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.1.tgz#cd9d0eb11309c597dffd26277cd1bd7c5b1e0e2f"
+ integrity sha512-QGoCN/my0eAfa4tx5ytDxArIoz2i58jFFVUGso1Lekn54JvSt+WLz2p3uyTGatZ03Bp9836elhFnIopn12WvBw==
+ dependencies:
+ "@abp/aspnetcore.mvc.ui" "~4.0.1"
+ "@abp/bootstrap" "~4.0.1"
+ "@abp/bootstrap-datepicker" "~4.0.1"
+ "@abp/datatables.net-bs4" "~4.0.1"
+ "@abp/font-awesome" "~4.0.1"
+ "@abp/jquery-form" "~4.0.1"
+ "@abp/jquery-validation-unobtrusive" "~4.0.1"
+ "@abp/lodash" "~4.0.1"
+ "@abp/luxon" "~4.0.1"
+ "@abp/malihu-custom-scrollbar-plugin" "~4.0.1"
+ "@abp/select2" "~4.0.1"
+ "@abp/sweetalert" "~4.0.1"
+ "@abp/timeago" "~4.0.1"
+ "@abp/toastr" "~4.0.1"
+
+"@abp/aspnetcore.mvc.ui@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.1.tgz#6490c147a56e4f7055d2ca77f20baf1f60f56867"
+ integrity sha512-4B3icJrlpuZgMaX52ninyaenH7zLwepePEscDrLaFY9wyonKpZ2zh+xplnyM6vjNd+PhErWuA2+ssCswFhrJ3A==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@@ -36,145 +36,145 @@
micromatch "^4.0.2"
path "^0.12.7"
-"@abp/bootstrap-datepicker@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.0.tgz#cdbd2c388c6d7ce8c6d72443038975063e6c6d02"
- integrity sha512-hauH8VhpC8cxv1wCR6bVBcNqZepftdBXxEVID7TSAqgNyWjm/CrJqWLI+A0nnkG3IHoIm9D22iF47BamuYHptw==
+"@abp/bootstrap-datepicker@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.1.tgz#aad891263edff66f816e003ba4fa7f8acfe8e0b6"
+ integrity sha512-S0oaVZmXsDcOJLAyoGY0TvP/7bZx0GHIbU9BIhIL2Wl74HYaokjkTr6/IleIek9YeiF2vm9FkrUP1dKH/4f7Gg==
dependencies:
bootstrap-datepicker "^1.9.0"
-"@abp/bootstrap@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.0.tgz#04174f18055f76f936e6fb73e5ff71ffa08a8528"
- integrity sha512-Tmr0yoSWg7XHl02X5wv04CvYcL8KCpX8u6YGJj31jRZxUTeCvs5ETXlepOWcdxPQqi/4olXv5B9GEz5S9l5nZA==
+"@abp/bootstrap@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.1.tgz#3e41bdf9b3e9f8c497b9fafe22a4851d0401b31b"
+ integrity sha512-GoSaNWvswRHVoUrq7xClFQYtwqIlyS/vp/TdY+j5FFZP7ud89+ZGpdNqYqq5l9/6aaYa7v4b9mNTZ/1JRzAOYg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
bootstrap "^4.5.0"
bootstrap-v4-rtl "4.4.1-2"
-"@abp/core@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.0.tgz#65e76c697e62162717e0edabf7edacc4228e682a"
- integrity sha512-xcTTBFjLFZ9Trv2x9Y/c3XKezIx+x3MTXUD98QJPf1aR7T43TE/tLHRxdRfW3R8ka0O1wmlYshpkaw5pYNsj5w==
+"@abp/core@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.1.tgz#1df32bc058f45571605670ca81c226a1bd87400c"
+ integrity sha512-8UT5lwqV/luVG/SxePSTD2FRbZXwXv3cZJKjw+gpBjhD0slWrh51XEOHsM8ciTuhcvV/tsqVU9nXckDMdO58fw==
dependencies:
- "@abp/utils" "^4.0.0"
+ "@abp/utils" "^4.0.1"
-"@abp/datatables.net-bs4@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.0.tgz#fe737e054f6ba35e787a1cda185af2788ef86d39"
- integrity sha512-mz7xZdzX1nlFyX7vNzB5w3RkqZ0IHrPgsXGOB7OCTKMRshDFVH2O51Oy4qoLDOXoTVeahHtR9v8thEWFR1SnZg==
+"@abp/datatables.net-bs4@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.1.tgz#7538baad0eff24eca7f4246d020852f83139f645"
+ integrity sha512-S52jNPF4if68V+P/33NrtGPJXf6xrqgyZzz9b7qBR7HuUm3Nsn7bAslh3JNduNec/sFuE4Utl/xsFHZNjBWEog==
dependencies:
- "@abp/datatables.net" "~4.0.0"
+ "@abp/datatables.net" "~4.0.1"
datatables.net-bs4 "^1.10.21"
-"@abp/datatables.net@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.0.tgz#88ae5f1a6068fba55927e59f113686508e9553cb"
- integrity sha512-JYTfMA1zlBNGiQHAiZiTj5ka6B6vq5k2jqsoLHup4pD9jpKwKRBGtltVsWoEnetd9eEbp4SaV/FCuh3RzmV6Pw==
+"@abp/datatables.net@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.1.tgz#eb89716a37351c41b5bccfc2db88fc7ceb991a26"
+ integrity sha512-APFLui0w8MqsBWqP/K0QkT5cBq5SsWiqMaIGTXQKinMVLV597sUszrlhe1ISU2PqeD7iX6pCZNNOTI1NEUn9/Q==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
datatables.net "^1.10.21"
-"@abp/font-awesome@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.0.tgz#6e1e4bd1175a0b8d3b095e215c07e66ad0e42e19"
- integrity sha512-kHfZ45UMDWSRk1gTV/BwVfSoXksJ9UlnD3SelTGeAkvbDqtDllqlp9y6c3qQcmZUE348Xl4hDTkU8upZwswCFQ==
+"@abp/font-awesome@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.1.tgz#8a9d83b2c2adfcd5abcbd9c31c315460d44a321e"
+ integrity sha512-+6+m/DKMnfkeQiWUsMlB6Da8u6yREyN2oQYGYhSRAK8419ym8RHHrqKJv2AClI4iLq2ppHZj8WF84+SeoCekRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
"@fortawesome/fontawesome-free" "^5.13.0"
-"@abp/jquery-form@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.0.tgz#3afb41eb16d62e32c31a29c6a866f634a5a20cd8"
- integrity sha512-cQq8PgzHfpK9/LxmjlnMsDn85wWvEOqjyLaepHFpTTt0341auSgXNwhp7rk71AUHD1lP3c9ALctmqu+gYmh9ag==
+"@abp/jquery-form@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.1.tgz#6dc1922b2800dd635f20881a82e08104a1dd1bb5"
+ integrity sha512-JMBZYu/MI/GjaLTBOMB5iv8cagnLpReDULNC3r6tLNNqB1R8f3Cg1T7nF4YCuU9SYMqis1P/AuE4oEh+4rQdAQ==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#c3674d2b01b3c524de4c3fac1c6ae3657857ee7b"
- integrity sha512-OGibIdw0ogjp6VQIebHM7OtMT36pjLKRrOHyCVpTmQ7NzDODV5ptG83vOnt5nFG0y9XFrOt8cnHrrd+K1Bpo/Q==
+"@abp/jquery-validation-unobtrusive@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.1.tgz#4142ca31c0830fe24a1467e8cf13b55ba9d7c1dd"
+ integrity sha512-rdSRTcdKCHmarbrVgmPYdTiJ0G/aFKd+dr0krO7fALPTuQKChbDnHOO4/JvQSc+cd9faxa8c6ZWvlHdsof23tQ==
dependencies:
- "@abp/jquery-validation" "~4.0.0"
+ "@abp/jquery-validation" "~4.0.1"
jquery-validation-unobtrusive "^3.2.11"
-"@abp/jquery-validation@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.0.tgz#0a101937f89ff398317142b5271fa9a1de6571c2"
- integrity sha512-4nzvhAktEINpQ2H+Hy7TOxxojTmTEm5dBTbHs1vbCWUuF0OTpouZWbMZDESdP0ZbjXcQ+vhwuM4e/pm/PeaHyQ==
+"@abp/jquery-validation@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.1.tgz#74e7d795468c6986f2db15662631fcd4f67c679e"
+ integrity sha512-FX26aQCsMBdVWAJb7S37Lt7KoHAEHoYguh/qfZIARCpOYOOWvxfDz1wTrmADUkqdillqEiCeD/Imj8bYH9Faaw==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-validation "^1.19.2"
-"@abp/jquery@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.0.tgz#00d24678b573bcc2fb14d8337ccdbf697b59d43b"
- integrity sha512-gXLK97IvAZriNlG8e0qJcd7MvnpshJQURb4lg8VYibD7Fs/OBeHSAWM2Adgi3H9DnQL8XEUlWf487FSz4RC/Yg==
+"@abp/jquery@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.1.tgz#aa554accb16600fd586c3a4f088040cd26d0bde8"
+ integrity sha512-MtiRKOLyjEWux+whPP3+zwPbpj8or756JtgjnwOTDB9tp9HLCYUaskt+oalYPvob24nDZcNu2RnMALYdCVhZAQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
jquery "~3.5.1"
-"@abp/lodash@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.0.tgz#fe76d09517f6b1adf18edde94a31e13b003329dc"
- integrity sha512-uitn5uYlb9xShRtV4AFOgp3lu2kADGMD4+a4fy5r4umlPM2uuMo0wMhzyYdBIG64JC5oNaqAzOwZyhhnn+HGJg==
+"@abp/lodash@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.1.tgz#ec261ccaab8a70d5b32a8a7c22387e48936d38d4"
+ integrity sha512-Dav1QKbBeGR4VVbHHe1s3OEzN7wnb9K/vwzHrWmtO8D1Q5Z3433xjNmgL5VQ9gfxXqooSfEO4gAovZklMDHDew==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
lodash "^4.17.15"
-"@abp/luxon@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.0.tgz#d9357e4fb422b6e18ebe897a86a4c4bc6fbe6858"
- integrity sha512-tiE6NiSa4El88SVotxfmmpceINLz8MruaO/e/U3QjJEHjRoqlv0UBrM/x5Xz92c7ZIvL0Y4QvWNISeDg6/oqIQ==
+"@abp/luxon@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.1.tgz#a540750b1605dbac856ce9c2e776c2fecf6392f9"
+ integrity sha512-eRumVB7UIf2XH6OZVUTvcKw0A/OSAfYV59fM+Wc4dAkNcmsNZI0gD1o0AigSGNCxTV6v+W2bFrsuooSqK99Y0Q==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
luxon "^1.24.1"
-"@abp/malihu-custom-scrollbar-plugin@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.0.tgz#972acf26f5eaa4bf9b8991cbe7c19fd0005d94e2"
- integrity sha512-SpUo1CfppKzkE6Rb880pgB7oQ83Mkjsi0o6eE4r4gkF5hfzkuCXOmNjTYKfQIkE4n3G9QQd+8AAN/4xj4DiDrA==
+"@abp/malihu-custom-scrollbar-plugin@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.1.tgz#0a556423a67b6c949e32ffcacd72256dea6c31ee"
+ integrity sha512-YTwYpnQ1ZrON70gvJcnNZRwB3Ze4olGcXxiPvmRgSHbGJkSnHYJiP6PvsN1F3HDFukAJ/iUu+WwEe8OBwlyLXA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/select2@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.0.tgz#8fdf4c5e18f4093ee4e073dab950cf7aa9b2a540"
- integrity sha512-XeXahcDMczdkZdP07yhQriIvbi1N5meeSGTnFyZX+bNTGzUOarPcuNYZ6Mcl3351HcyESHzuJbKbsk3RB1kGeg==
+"@abp/select2@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.1.tgz#8983e7b5c3afb862f08b2730b70e59d726e9b5d5"
+ integrity sha512-WdzY2hvsS/4vz/VXpxq2muSzzE8ggchiIrICy/WKchJxL9L08DM796t6aE6rEl9wucY8XEzzWrPOVqAjJmnXFA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
select2 "^4.0.13"
-"@abp/sweetalert@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.0.tgz#0d93e92e95c6855aef7e19532a7513a078ece216"
- integrity sha512-y3XtZqnUVZuQohpRO1ImyBZXhtrm4H+typIL/9VgcnlvQjBTyIaiwDmU8j07Bb2rKJKe0prVkkVARO7OnjOS5A==
+"@abp/sweetalert@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.1.tgz#0088610915ad6db0a140b77832a37c10066eb4ee"
+ integrity sha512-t4/44oQCMngSjVqmeRWXwrXa/pRKc3CEpyyTiGIXki4dWJ21j0ePCw2l3rvOJWnpoCznhxa/UGxLfRfK1NEzRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
sweetalert "^2.1.2"
-"@abp/timeago@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.0.tgz#509cd8a84cd94c2644824b0c3af10c8fff6de2dc"
- integrity sha512-90jzLYJusYTPwMbak1+XkXE85OPOXPpysRbL28KQwl7WLNBm8wx6IEoVZOHvOrpYscYdyeWhZCgILSJ8DR3a2Q==
+"@abp/timeago@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.1.tgz#8c161645534eb1f62fe4607450acf7345729e711"
+ integrity sha512-PsPobV79U2qzVY+WBsmJM1ohSF4jqcLnL4/7qyJvxlb1WwbCl1F5D4cpiJP4zsM4clPW4mbSsiauMNp+HTNKEA==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
timeago "^1.6.7"
-"@abp/toastr@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.0.tgz#06e28665cb7f6eefee3f69c985dd2b3f86cd7f1d"
- integrity sha512-YL1fahVpDszhwpnRTN87GCP523Mkaw42ApT2A/hZuBdwRzP/u5GwRfng0i/uhdYXCMkTKuHmaHnRyqhGiv7nfQ==
+"@abp/toastr@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.1.tgz#ecb6f6193b7edc3150d0614ab9457472baf1cce3"
+ integrity sha512-bTTz0O8zj7fMhdoummP2Ed5Z8SJTmR6svzNchBXNDrnRAcDQvTihPTcg0UpH8BEDFczbLowq09CG2A/RMSJoug==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
toastr "^2.1.4"
-"@abp/utils@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.0.tgz#6c2b5f5c20821028fe6cdbffb5e2f6088956b9d5"
- integrity sha512-Yj2yCObvS6X/P8rdRMQBo7940k5P/dZhgCUSo9C6P9GNmJY8wNdJFFyhRtaHuAyU5IBBBIY7+mMKOk5eQcbjWQ==
+"@abp/utils@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.1.tgz#9a4cb420266c49d8084776bd31c86681d4d4d125"
+ integrity sha512-nI2ZyaNpvohr75p8jeMPWze+hX+mV47EHI+Zloa4GgGmJqrULdG71kYh45R+jGmMTbQL6huaXGnpz4gNF9TGyQ==
dependencies:
just-compare "^1.3.0"
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj
index 7c105c4de3..fb39407b4b 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
index 6aa6709d35..7316ef9a28 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
@@ -3,8 +3,8 @@
"name": "asp.net",
"private": true,
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.0",
- "@abp/prismjs": "^4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.1",
+ "@abp/prismjs": "^4.0.1"
},
"devDependencies": {}
}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
index 41fbbb2f12..f34083e159 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
@@ -2,37 +2,37 @@
# yarn lockfile v1
-"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.0.tgz#b1822cf5bbc0f6eeb414ebd0877f6d1115a81fe7"
- integrity sha512-yYXQkEnNhftzm+ZI8d3VFMlV5UuLNTMQQwV2eZ8tJfstUQrKV9bVd3+NdDOr3AkvcD8D7mvMFeBuoMYteL5kLQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.1.tgz#ce8e3eb830a8e8f9eecb1a3b3bd70c2832fdf15e"
+ integrity sha512-w+ZG8Ewx9wWfbvRC2MAjJl+rXuXSHLhhGOiJTk68unWLNziDtNQzcSXG/Z5c1hA+acJSGqDoJGEGs4FVM136og==
dependencies:
- "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.1"
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.0.tgz#ba896056e9df5ac58e108df96996fbb2ca7a1a15"
- integrity sha512-3RNn6VrNA+cqnPBoSbiCazN05cC2rhcRFMMxkEte+LImGbGOsxc4MflzHg5On1ExCGdqko8Axbw/ydy44Ak4Hw==
- dependencies:
- "@abp/aspnetcore.mvc.ui" "~4.0.0"
- "@abp/bootstrap" "~4.0.0"
- "@abp/bootstrap-datepicker" "~4.0.0"
- "@abp/datatables.net-bs4" "~4.0.0"
- "@abp/font-awesome" "~4.0.0"
- "@abp/jquery-form" "~4.0.0"
- "@abp/jquery-validation-unobtrusive" "~4.0.0"
- "@abp/lodash" "~4.0.0"
- "@abp/luxon" "~4.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~4.0.0"
- "@abp/select2" "~4.0.0"
- "@abp/sweetalert" "~4.0.0"
- "@abp/timeago" "~4.0.0"
- "@abp/toastr" "~4.0.0"
-
-"@abp/aspnetcore.mvc.ui@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.0.tgz#68502177a05f6ce7191a09b06a18c5b5dfab425d"
- integrity sha512-tYHUWMwnwInrGSzC/OdN6bH/VHZEz5DP3rx2U6fcb0I5GvvRdQZxVgUvmWn6DeMA3PG10Gra4SfkhZqRQq9rjQ==
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.1.tgz#cd9d0eb11309c597dffd26277cd1bd7c5b1e0e2f"
+ integrity sha512-QGoCN/my0eAfa4tx5ytDxArIoz2i58jFFVUGso1Lekn54JvSt+WLz2p3uyTGatZ03Bp9836elhFnIopn12WvBw==
+ dependencies:
+ "@abp/aspnetcore.mvc.ui" "~4.0.1"
+ "@abp/bootstrap" "~4.0.1"
+ "@abp/bootstrap-datepicker" "~4.0.1"
+ "@abp/datatables.net-bs4" "~4.0.1"
+ "@abp/font-awesome" "~4.0.1"
+ "@abp/jquery-form" "~4.0.1"
+ "@abp/jquery-validation-unobtrusive" "~4.0.1"
+ "@abp/lodash" "~4.0.1"
+ "@abp/luxon" "~4.0.1"
+ "@abp/malihu-custom-scrollbar-plugin" "~4.0.1"
+ "@abp/select2" "~4.0.1"
+ "@abp/sweetalert" "~4.0.1"
+ "@abp/timeago" "~4.0.1"
+ "@abp/toastr" "~4.0.1"
+
+"@abp/aspnetcore.mvc.ui@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.1.tgz#6490c147a56e4f7055d2ca77f20baf1f60f56867"
+ integrity sha512-4B3icJrlpuZgMaX52ninyaenH7zLwepePEscDrLaFY9wyonKpZ2zh+xplnyM6vjNd+PhErWuA2+ssCswFhrJ3A==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@@ -43,162 +43,162 @@
micromatch "^4.0.2"
path "^0.12.7"
-"@abp/bootstrap-datepicker@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.0.tgz#cdbd2c388c6d7ce8c6d72443038975063e6c6d02"
- integrity sha512-hauH8VhpC8cxv1wCR6bVBcNqZepftdBXxEVID7TSAqgNyWjm/CrJqWLI+A0nnkG3IHoIm9D22iF47BamuYHptw==
+"@abp/bootstrap-datepicker@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.1.tgz#aad891263edff66f816e003ba4fa7f8acfe8e0b6"
+ integrity sha512-S0oaVZmXsDcOJLAyoGY0TvP/7bZx0GHIbU9BIhIL2Wl74HYaokjkTr6/IleIek9YeiF2vm9FkrUP1dKH/4f7Gg==
dependencies:
bootstrap-datepicker "^1.9.0"
-"@abp/bootstrap@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.0.tgz#04174f18055f76f936e6fb73e5ff71ffa08a8528"
- integrity sha512-Tmr0yoSWg7XHl02X5wv04CvYcL8KCpX8u6YGJj31jRZxUTeCvs5ETXlepOWcdxPQqi/4olXv5B9GEz5S9l5nZA==
+"@abp/bootstrap@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.1.tgz#3e41bdf9b3e9f8c497b9fafe22a4851d0401b31b"
+ integrity sha512-GoSaNWvswRHVoUrq7xClFQYtwqIlyS/vp/TdY+j5FFZP7ud89+ZGpdNqYqq5l9/6aaYa7v4b9mNTZ/1JRzAOYg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
bootstrap "^4.5.0"
bootstrap-v4-rtl "4.4.1-2"
-"@abp/clipboard@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.0.0.tgz#4b01bead2e404c38a3ae9955dac5522d3c30c78b"
- integrity sha512-39CZuF6lxUx1fluclzMl1uG0qIUX82S2wNbyJu2WGfuMMaaIgzSp9du/bB89Ik6rR5BFUU/3p8uvzOgy4sc2sQ==
+"@abp/clipboard@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.0.1.tgz#aacbd02b6ce991ca20550ad7afc40e0cea247b5e"
+ integrity sha512-Q7Fe167pBJ/9Vp5RyVc/JejaIzNCdTgXcnZLNC7AEtaeBVCmLwsdnCYP3i32sdvX1AIgt3exhAAsHBt0deij/g==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
clipboard "^2.0.6"
-"@abp/core@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.0.tgz#65e76c697e62162717e0edabf7edacc4228e682a"
- integrity sha512-xcTTBFjLFZ9Trv2x9Y/c3XKezIx+x3MTXUD98QJPf1aR7T43TE/tLHRxdRfW3R8ka0O1wmlYshpkaw5pYNsj5w==
+"@abp/core@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.1.tgz#1df32bc058f45571605670ca81c226a1bd87400c"
+ integrity sha512-8UT5lwqV/luVG/SxePSTD2FRbZXwXv3cZJKjw+gpBjhD0slWrh51XEOHsM8ciTuhcvV/tsqVU9nXckDMdO58fw==
dependencies:
- "@abp/utils" "^4.0.0"
+ "@abp/utils" "^4.0.1"
-"@abp/datatables.net-bs4@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.0.tgz#fe737e054f6ba35e787a1cda185af2788ef86d39"
- integrity sha512-mz7xZdzX1nlFyX7vNzB5w3RkqZ0IHrPgsXGOB7OCTKMRshDFVH2O51Oy4qoLDOXoTVeahHtR9v8thEWFR1SnZg==
+"@abp/datatables.net-bs4@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.1.tgz#7538baad0eff24eca7f4246d020852f83139f645"
+ integrity sha512-S52jNPF4if68V+P/33NrtGPJXf6xrqgyZzz9b7qBR7HuUm3Nsn7bAslh3JNduNec/sFuE4Utl/xsFHZNjBWEog==
dependencies:
- "@abp/datatables.net" "~4.0.0"
+ "@abp/datatables.net" "~4.0.1"
datatables.net-bs4 "^1.10.21"
-"@abp/datatables.net@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.0.tgz#88ae5f1a6068fba55927e59f113686508e9553cb"
- integrity sha512-JYTfMA1zlBNGiQHAiZiTj5ka6B6vq5k2jqsoLHup4pD9jpKwKRBGtltVsWoEnetd9eEbp4SaV/FCuh3RzmV6Pw==
+"@abp/datatables.net@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.1.tgz#eb89716a37351c41b5bccfc2db88fc7ceb991a26"
+ integrity sha512-APFLui0w8MqsBWqP/K0QkT5cBq5SsWiqMaIGTXQKinMVLV597sUszrlhe1ISU2PqeD7iX6pCZNNOTI1NEUn9/Q==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
datatables.net "^1.10.21"
-"@abp/font-awesome@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.0.tgz#6e1e4bd1175a0b8d3b095e215c07e66ad0e42e19"
- integrity sha512-kHfZ45UMDWSRk1gTV/BwVfSoXksJ9UlnD3SelTGeAkvbDqtDllqlp9y6c3qQcmZUE348Xl4hDTkU8upZwswCFQ==
+"@abp/font-awesome@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.1.tgz#8a9d83b2c2adfcd5abcbd9c31c315460d44a321e"
+ integrity sha512-+6+m/DKMnfkeQiWUsMlB6Da8u6yREyN2oQYGYhSRAK8419ym8RHHrqKJv2AClI4iLq2ppHZj8WF84+SeoCekRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
"@fortawesome/fontawesome-free" "^5.13.0"
-"@abp/jquery-form@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.0.tgz#3afb41eb16d62e32c31a29c6a866f634a5a20cd8"
- integrity sha512-cQq8PgzHfpK9/LxmjlnMsDn85wWvEOqjyLaepHFpTTt0341auSgXNwhp7rk71AUHD1lP3c9ALctmqu+gYmh9ag==
+"@abp/jquery-form@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.1.tgz#6dc1922b2800dd635f20881a82e08104a1dd1bb5"
+ integrity sha512-JMBZYu/MI/GjaLTBOMB5iv8cagnLpReDULNC3r6tLNNqB1R8f3Cg1T7nF4YCuU9SYMqis1P/AuE4oEh+4rQdAQ==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#c3674d2b01b3c524de4c3fac1c6ae3657857ee7b"
- integrity sha512-OGibIdw0ogjp6VQIebHM7OtMT36pjLKRrOHyCVpTmQ7NzDODV5ptG83vOnt5nFG0y9XFrOt8cnHrrd+K1Bpo/Q==
+"@abp/jquery-validation-unobtrusive@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.1.tgz#4142ca31c0830fe24a1467e8cf13b55ba9d7c1dd"
+ integrity sha512-rdSRTcdKCHmarbrVgmPYdTiJ0G/aFKd+dr0krO7fALPTuQKChbDnHOO4/JvQSc+cd9faxa8c6ZWvlHdsof23tQ==
dependencies:
- "@abp/jquery-validation" "~4.0.0"
+ "@abp/jquery-validation" "~4.0.1"
jquery-validation-unobtrusive "^3.2.11"
-"@abp/jquery-validation@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.0.tgz#0a101937f89ff398317142b5271fa9a1de6571c2"
- integrity sha512-4nzvhAktEINpQ2H+Hy7TOxxojTmTEm5dBTbHs1vbCWUuF0OTpouZWbMZDESdP0ZbjXcQ+vhwuM4e/pm/PeaHyQ==
+"@abp/jquery-validation@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.1.tgz#74e7d795468c6986f2db15662631fcd4f67c679e"
+ integrity sha512-FX26aQCsMBdVWAJb7S37Lt7KoHAEHoYguh/qfZIARCpOYOOWvxfDz1wTrmADUkqdillqEiCeD/Imj8bYH9Faaw==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-validation "^1.19.2"
-"@abp/jquery@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.0.tgz#00d24678b573bcc2fb14d8337ccdbf697b59d43b"
- integrity sha512-gXLK97IvAZriNlG8e0qJcd7MvnpshJQURb4lg8VYibD7Fs/OBeHSAWM2Adgi3H9DnQL8XEUlWf487FSz4RC/Yg==
+"@abp/jquery@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.1.tgz#aa554accb16600fd586c3a4f088040cd26d0bde8"
+ integrity sha512-MtiRKOLyjEWux+whPP3+zwPbpj8or756JtgjnwOTDB9tp9HLCYUaskt+oalYPvob24nDZcNu2RnMALYdCVhZAQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
jquery "~3.5.1"
-"@abp/lodash@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.0.tgz#fe76d09517f6b1adf18edde94a31e13b003329dc"
- integrity sha512-uitn5uYlb9xShRtV4AFOgp3lu2kADGMD4+a4fy5r4umlPM2uuMo0wMhzyYdBIG64JC5oNaqAzOwZyhhnn+HGJg==
+"@abp/lodash@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.1.tgz#ec261ccaab8a70d5b32a8a7c22387e48936d38d4"
+ integrity sha512-Dav1QKbBeGR4VVbHHe1s3OEzN7wnb9K/vwzHrWmtO8D1Q5Z3433xjNmgL5VQ9gfxXqooSfEO4gAovZklMDHDew==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
lodash "^4.17.15"
-"@abp/luxon@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.0.tgz#d9357e4fb422b6e18ebe897a86a4c4bc6fbe6858"
- integrity sha512-tiE6NiSa4El88SVotxfmmpceINLz8MruaO/e/U3QjJEHjRoqlv0UBrM/x5Xz92c7ZIvL0Y4QvWNISeDg6/oqIQ==
+"@abp/luxon@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.1.tgz#a540750b1605dbac856ce9c2e776c2fecf6392f9"
+ integrity sha512-eRumVB7UIf2XH6OZVUTvcKw0A/OSAfYV59fM+Wc4dAkNcmsNZI0gD1o0AigSGNCxTV6v+W2bFrsuooSqK99Y0Q==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
luxon "^1.24.1"
-"@abp/malihu-custom-scrollbar-plugin@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.0.tgz#972acf26f5eaa4bf9b8991cbe7c19fd0005d94e2"
- integrity sha512-SpUo1CfppKzkE6Rb880pgB7oQ83Mkjsi0o6eE4r4gkF5hfzkuCXOmNjTYKfQIkE4n3G9QQd+8AAN/4xj4DiDrA==
+"@abp/malihu-custom-scrollbar-plugin@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.1.tgz#0a556423a67b6c949e32ffcacd72256dea6c31ee"
+ integrity sha512-YTwYpnQ1ZrON70gvJcnNZRwB3Ze4olGcXxiPvmRgSHbGJkSnHYJiP6PvsN1F3HDFukAJ/iUu+WwEe8OBwlyLXA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/prismjs@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.0.0.tgz#7b98c233ac1f0025c14b27c1ba62910bd9022442"
- integrity sha512-Eh63EUe2wnl8P1iyPo9Glt9BD6yFdrAjIbvBeFheJnSWgvij3mayOtCAq9P2ksKWo1Gq3hv1lm/p9vdYFRHoKw==
+"@abp/prismjs@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.0.1.tgz#8e614878a9d1d63504fe7ba6b7d44093947d862b"
+ integrity sha512-qZP4TlQDiXaAIrDmpzQJeL/9mtTCxQCIbELDnBHMZFDrYNENOKZeBmvD9WAhgzL7FJcnPtOomJgZ5x2rqpBW/w==
dependencies:
- "@abp/clipboard" "~4.0.0"
- "@abp/core" "~4.0.0"
+ "@abp/clipboard" "~4.0.1"
+ "@abp/core" "~4.0.1"
prismjs "^1.20.0"
-"@abp/select2@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.0.tgz#8fdf4c5e18f4093ee4e073dab950cf7aa9b2a540"
- integrity sha512-XeXahcDMczdkZdP07yhQriIvbi1N5meeSGTnFyZX+bNTGzUOarPcuNYZ6Mcl3351HcyESHzuJbKbsk3RB1kGeg==
+"@abp/select2@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.1.tgz#8983e7b5c3afb862f08b2730b70e59d726e9b5d5"
+ integrity sha512-WdzY2hvsS/4vz/VXpxq2muSzzE8ggchiIrICy/WKchJxL9L08DM796t6aE6rEl9wucY8XEzzWrPOVqAjJmnXFA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
select2 "^4.0.13"
-"@abp/sweetalert@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.0.tgz#0d93e92e95c6855aef7e19532a7513a078ece216"
- integrity sha512-y3XtZqnUVZuQohpRO1ImyBZXhtrm4H+typIL/9VgcnlvQjBTyIaiwDmU8j07Bb2rKJKe0prVkkVARO7OnjOS5A==
+"@abp/sweetalert@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.1.tgz#0088610915ad6db0a140b77832a37c10066eb4ee"
+ integrity sha512-t4/44oQCMngSjVqmeRWXwrXa/pRKc3CEpyyTiGIXki4dWJ21j0ePCw2l3rvOJWnpoCznhxa/UGxLfRfK1NEzRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
sweetalert "^2.1.2"
-"@abp/timeago@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.0.tgz#509cd8a84cd94c2644824b0c3af10c8fff6de2dc"
- integrity sha512-90jzLYJusYTPwMbak1+XkXE85OPOXPpysRbL28KQwl7WLNBm8wx6IEoVZOHvOrpYscYdyeWhZCgILSJ8DR3a2Q==
+"@abp/timeago@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.1.tgz#8c161645534eb1f62fe4607450acf7345729e711"
+ integrity sha512-PsPobV79U2qzVY+WBsmJM1ohSF4jqcLnL4/7qyJvxlb1WwbCl1F5D4cpiJP4zsM4clPW4mbSsiauMNp+HTNKEA==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
timeago "^1.6.7"
-"@abp/toastr@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.0.tgz#06e28665cb7f6eefee3f69c985dd2b3f86cd7f1d"
- integrity sha512-YL1fahVpDszhwpnRTN87GCP523Mkaw42ApT2A/hZuBdwRzP/u5GwRfng0i/uhdYXCMkTKuHmaHnRyqhGiv7nfQ==
+"@abp/toastr@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.1.tgz#ecb6f6193b7edc3150d0614ab9457472baf1cce3"
+ integrity sha512-bTTz0O8zj7fMhdoummP2Ed5Z8SJTmR6svzNchBXNDrnRAcDQvTihPTcg0UpH8BEDFczbLowq09CG2A/RMSJoug==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
toastr "^2.1.4"
-"@abp/utils@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.0.tgz#6c2b5f5c20821028fe6cdbffb5e2f6088956b9d5"
- integrity sha512-Yj2yCObvS6X/P8rdRMQBo7940k5P/dZhgCUSo9C6P9GNmJY8wNdJFFyhRtaHuAyU5IBBBIY7+mMKOk5eQcbjWQ==
+"@abp/utils@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.1.tgz#9a4cb420266c49d8084776bd31c86681d4d4d125"
+ integrity sha512-nI2ZyaNpvohr75p8jeMPWze+hX+mV47EHI+Zloa4GgGmJqrULdG71kYh45R+jGmMTbQL6huaXGnpz4gNF9TGyQ==
dependencies:
just-compare "^1.3.0"
diff --git a/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj
index 432ece07dd..9c96018145 100644
--- a/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj
+++ b/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo/Abp/AspNetCore/Serilog/Serilog_Enrichers_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo/Abp/AspNetCore/Serilog/Serilog_Enrichers_Tests.cs
index 77de765f51..7bea930a37 100644
--- a/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo/Abp/AspNetCore/Serilog/Serilog_Enrichers_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo/Abp/AspNetCore/Serilog/Serilog_Enrichers_Tests.cs
@@ -88,10 +88,10 @@ namespace Volo.Abp.AspNetCore.Serilog
executedLogEvent.ShouldNotBeNull();
executedLogEvent.Properties.ContainsKey(_serilogOptions.EnricherPropertyNames.CorrelationId)
- .ShouldNotBeNull();
+ .ShouldBeTrue();
((ScalarValue) executedLogEvent.Properties[_serilogOptions.EnricherPropertyNames.CorrelationId]).Value
.ShouldBe(result);
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.Authorization.Tests/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions_Tests.cs b/framework/test/Volo.Abp.Authorization.Tests/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions_Tests.cs
new file mode 100644
index 0000000000..e8876aaebf
--- /dev/null
+++ b/framework/test/Volo.Abp.Authorization.Tests/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions_Tests.cs
@@ -0,0 +1,49 @@
+using Shouldly;
+using Volo.Abp.AspNetCore.ExceptionHandling;
+using Volo.Abp.Authorization;
+using Volo.Abp.Localization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Authorization
+{
+ public class AbpAuthorizationServiceExtensions_Tests : AuthorizationTestBase
+ {
+ private readonly IExceptionToErrorInfoConverter _exceptionToErrorInfoConverter;
+
+ public AbpAuthorizationServiceExtensions_Tests()
+ {
+ _exceptionToErrorInfoConverter = GetRequiredService();
+ }
+
+ [Fact]
+ public void Test_AbpAuthorizationException_Localization()
+ {
+ using (CultureHelper.Use("zh-Hans"))
+ {
+ var exception = new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenPolicyHasNotGranted);
+ var errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("授权失败! 提供的策略尚未授予.");
+
+ exception = new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenPolicyHasNotGrantedWithPolicyName)
+ .WithData("PolicyName", "my_policy_name");
+ errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("授权失败! 提供的策略尚未授予: my_policy_name");
+
+ exception = new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenPolicyHasNotGrantedForGivenResource)
+ .WithData("ResourceName", "my_resource_name");
+ errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("授权失败! 提供的策略未授予提供的资源: my_resource_name");
+
+ exception = new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenRequirementHasNotGrantedForGivenResource)
+ .WithData("ResourceName", "my_resource_name");
+ errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("授权失败! 提供的要求未授予提供的资源: my_resource_name");
+
+ exception = new AbpAuthorizationException(code: AbpAuthorizationErrorCodes.GivenRequirementsHasNotGrantedForGivenResource)
+ .WithData("ResourceName", "my_resource_name");
+ errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("授权失败! 提供的要求未授予提供的资源: my_resource_name");
+ }
+ }
+ }
+}
diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj b/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj
index 165aaaa1d0..279523610e 100644
--- a/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj
+++ b/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj
@@ -12,6 +12,7 @@
+
diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs
index 492a36f8b9..69417e48c6 100644
--- a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs
+++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs
@@ -2,12 +2,14 @@
using Volo.Abp.Authorization.TestServices;
using Volo.Abp.Autofac;
using Volo.Abp.DynamicProxy;
+using Volo.Abp.ExceptionHandling;
using Volo.Abp.Modularity;
namespace Volo.Abp.Authorization
{
[DependsOn(typeof(AbpAutofacModule))]
[DependsOn(typeof(AbpAuthorizationModule))]
+ [DependsOn(typeof(AbpExceptionHandlingModule))]
public class AbpAuthorizationTestModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
@@ -22,4 +24,4 @@ namespace Volo.Abp.Authorization
});
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo/Abp/BlobStoring/Aws/AbpBlobStoringAwsTestModule.cs b/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo/Abp/BlobStoring/Aws/AbpBlobStoringAwsTestModule.cs
index d176a864e7..71a1cd8504 100644
--- a/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo/Abp/BlobStoring/Aws/AbpBlobStoringAwsTestModule.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo/Abp/BlobStoring/Aws/AbpBlobStoringAwsTestModule.cs
@@ -69,7 +69,7 @@ namespace Volo.Abp.BlobStoring.Aws
private async Task DeleteBucketAsync(ApplicationShutdownContext context)
{
- var amazonS3Client = await context.ServiceProvider.GetService()
+ var amazonS3Client = await context.ServiceProvider.GetRequiredService()
.GetAmazonS3Client(_configuration);
if (await AmazonS3Util.DoesS3BucketExistV2Async(amazonS3Client, _randomContainerName))
@@ -89,4 +89,4 @@ namespace Volo.Abp.BlobStoring.Aws
}
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj b/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj
index 3edc355ca2..713b541431 100644
--- a/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj
+++ b/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj
@@ -9,6 +9,7 @@
+
diff --git a/framework/test/Volo.Abp.Features.Tests/Volo/Abp/Features/AbpFeaturesTestModule.cs b/framework/test/Volo.Abp.Features.Tests/Volo/Abp/Features/AbpFeaturesTestModule.cs
index 7b0927b80d..f5ff20e6f2 100644
--- a/framework/test/Volo.Abp.Features.Tests/Volo/Abp/Features/AbpFeaturesTestModule.cs
+++ b/framework/test/Volo.Abp.Features.Tests/Volo/Abp/Features/AbpFeaturesTestModule.cs
@@ -1,10 +1,12 @@
using Volo.Abp.Autofac;
+using Volo.Abp.ExceptionHandling;
using Volo.Abp.Modularity;
namespace Volo.Abp.Features
{
[DependsOn(
typeof(AbpFeaturesModule),
+ typeof(AbpExceptionHandlingModule),
typeof(AbpTestBaseModule),
typeof(AbpAutofacModule)
)]
@@ -12,7 +14,7 @@ namespace Volo.Abp.Features
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
-
+
}
}
}
diff --git a/framework/test/Volo.Abp.Features.Tests/Volo/Abp/Features/FeatureCheckerExtensions_Tests.cs b/framework/test/Volo.Abp.Features.Tests/Volo/Abp/Features/FeatureCheckerExtensions_Tests.cs
new file mode 100644
index 0000000000..0df9548f3c
--- /dev/null
+++ b/framework/test/Volo.Abp.Features.Tests/Volo/Abp/Features/FeatureCheckerExtensions_Tests.cs
@@ -0,0 +1,40 @@
+using Shouldly;
+using Volo.Abp.AspNetCore.ExceptionHandling;
+using Volo.Abp.Authorization;
+using Volo.Abp.Localization;
+using Xunit;
+
+namespace Volo.Abp.Features
+{
+ public class FeatureCheckerExtensions_Tests : FeatureTestBase
+ {
+ private readonly IExceptionToErrorInfoConverter _exceptionToErrorInfoConverter;
+
+ public FeatureCheckerExtensions_Tests()
+ {
+ _exceptionToErrorInfoConverter = GetRequiredService();
+ }
+
+ [Fact]
+ public void Test_AbpAuthorizationException_Localization()
+ {
+ using (CultureHelper.Use("zh-Hans"))
+ {
+ var exception = new AbpAuthorizationException(code: AbpFeatureErrorCodes.FeatureIsNotEnabled)
+ .WithData("FeatureName", "my_feature_name");
+ var errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("功能未启用: my_feature_name");
+
+ exception = new AbpAuthorizationException(code: AbpFeatureErrorCodes.AllOfTheseFeaturesMustBeEnabled)
+ .WithData("FeatureNames", "my_feature_name, my_feature_name2");
+ errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("必要的功能未启用. 这些功能需要启用: my_feature_name, my_feature_name2");
+
+ exception = new AbpAuthorizationException(code: AbpFeatureErrorCodes.AtLeastOneOfTheseFeaturesMustBeEnabled)
+ .WithData("FeatureNames", "my_feature_name, my_feature_name2");
+ errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);
+ errorInfo.Message.ShouldBe("必要的功能未启用. 需要启用这些功能中的一项:my_feature_name, my_feature_name2");
+ }
+ }
+ }
+}
diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj b/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj
index 57c440341e..555c2934b0 100644
--- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj
@@ -10,8 +10,9 @@
-
-
+
+ Always
+
diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/LocalizedTemplateContentReaderFactory_Tests.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/LocalizedTemplateContentReaderFactory_Tests.cs
new file mode 100644
index 0000000000..b1dba4bdb5
--- /dev/null
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/LocalizedTemplateContentReaderFactory_Tests.cs
@@ -0,0 +1,59 @@
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Primitives;
+using Shouldly;
+using Volo.Abp.VirtualFileSystem;
+using Xunit;
+
+namespace Volo.Abp.TextTemplating.VirtualFiles
+{
+ public class LocalizedTemplateContentReaderFactory_Tests: AbpTextTemplatingTestBase
+ {
+ private readonly ITemplateDefinitionManager _templateDefinitionManager;
+
+ public LocalizedTemplateContentReaderFactory_Tests()
+ {
+ _templateDefinitionManager = GetRequiredService();
+ }
+
+ [Fact]
+ public async Task Create_Should_Work_With_PhysicalFileProvider()
+ {
+ var localizedTemplateContentReaderFactory = new LocalizedTemplateContentReaderFactory(
+ new PhysicalFileVirtualFileProvider(
+ new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(),
+ @"Volo\Abp\TextTemplating\"))));
+
+ var reader = await localizedTemplateContentReaderFactory.CreateAsync(_templateDefinitionManager.Get(TestTemplates.WelcomeEmail));
+
+ reader.GetContentOrNull("en").ShouldBe("Welcome {{model.name}} to the abp.io!");
+ reader.GetContentOrNull("tr").ShouldBe("Merhaba {{model.name}}, abp.io'ya hoşgeldiniz!");
+ }
+
+ class PhysicalFileVirtualFileProvider : IVirtualFileProvider
+ {
+ private readonly PhysicalFileProvider _physicalFileProvider;
+
+ public PhysicalFileVirtualFileProvider(PhysicalFileProvider physicalFileProvider)
+ {
+ _physicalFileProvider = physicalFileProvider;
+ }
+
+ public IFileInfo GetFileInfo(string subpath)
+ {
+ return _physicalFileProvider.GetFileInfo(subpath);
+ }
+
+ public IDirectoryContents GetDirectoryContents(string subpath)
+ {
+ return _physicalFileProvider.GetDirectoryContents(subpath);
+ }
+
+ public IChangeToken Watch(string filter)
+ {
+ return _physicalFileProvider.Watch(filter);
+ }
+ }
+ }
+}
diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs
index da2d4179de..e5c7138118 100644
--- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs
@@ -4,46 +4,42 @@ using Xunit;
namespace Volo.Abp.TextTemplating.VirtualFiles
{
- //TODO: Make tests running again!
- //public class VirtualFileTemplateContributor_Tests : AbpTextTemplatingTestBase
- //{
- // [Fact]
- // public async Task Should_Get_Localized_Content_By_Culture()
- // {
- // var contributor = new VirtualFileTemplateContentContributor(
- // "/SampleTemplates/WelcomeEmail"
- // );
+ public class VirtualFileTemplateContributor_Tests : AbpTextTemplatingTestBase
+ {
+ private readonly ITemplateDefinitionManager _templateDefinitionManager;
+ private readonly VirtualFileTemplateContentContributor _virtualFileTemplateContentContributor;
- // contributor.Initialize(
- // new TemplateContentContributorInitializationContext(
- // new TemplateDefinition("Test"),
- // ServiceProvider
- // )
- // );
+ public VirtualFileTemplateContributor_Tests()
+ {
+ _templateDefinitionManager = GetRequiredService();
+ _virtualFileTemplateContentContributor = GetRequiredService();
+ }
- // (await contributor
- // .GetOrNullAsync("en")).ShouldBe("Welcome {{model.name}} to the abp.io!");
+ [Fact]
+ public async Task Should_Get_Localized_Content_By_Culture()
+ {
+ (await _virtualFileTemplateContentContributor.GetOrNullAsync(
+ new TemplateContentContributorContext(_templateDefinitionManager.Get(TestTemplates.WelcomeEmail),
+ ServiceProvider,
+ "en")))
+ .ShouldBe("Welcome {{model.name}} to the abp.io!");
- // (await contributor
- // .GetOrNullAsync("tr")).ShouldBe("Merhaba {{model.name}}, abp.io'ya hoşgeldiniz!");
- // }
+ (await _virtualFileTemplateContentContributor.GetOrNullAsync(
+ new TemplateContentContributorContext(_templateDefinitionManager.Get(TestTemplates.WelcomeEmail),
+ ServiceProvider,
+ "tr")))
+ .ShouldBe("Merhaba {{model.name}}, abp.io'ya hoşgeldiniz!");
+ }
- // [Fact]
- // public async Task Should_Get_Non_Localized_Template_Content()
- // {
- // var contributor = new VirtualFileTemplateContentContributor(
- // "/SampleTemplates/ForgotPasswordEmail.tpl"
- // );
-
- // contributor.Initialize(
- // new TemplateContentContributorInitializationContext(
- // new TemplateDefinition("Test"),
- // ServiceProvider
- // )
- // );
-
- // (await contributor
- // .GetOrNullAsync()).ShouldBe("{{l \"HelloText\"}}. Please click to the following link to get an email to reset your password!");
- // }
- //}
+ [Fact]
+ public async Task Should_Get_Non_Localized_Template_Content()
+ {
+ (await _virtualFileTemplateContentContributor.GetOrNullAsync(
+ new TemplateContentContributorContext(
+ _templateDefinitionManager.Get(TestTemplates.ForgotPasswordEmail),
+ ServiceProvider,
+ null)))
+ .ShouldBe("{{L \"HelloText\" model.name}}, {{L \"HowAreYou\" }}. Please click to the following link to get an email to reset your password!");
+ }
+ }
}
diff --git a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs
index aae01ff912..e453c5ee96 100644
--- a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs
+++ b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs
@@ -33,7 +33,7 @@ namespace Volo.Abp.VirtualFileSystem
Encoding.UTF8.GetString(stream.GetAllBytes()).ShouldBe("//jquery-3-1-1-min.js-contents");
}
}
-
+
[Fact]
public void Should_Define_And_Get_Embedded_Resources_With_Special_Chars()
{
@@ -57,10 +57,10 @@ namespace Volo.Abp.VirtualFileSystem
var contents = _virtualFileProvider.GetDirectoryContents("/js");
//Assert
- contents.Exists.ShouldNotBeNull();
+ contents.Exists.ShouldBeTrue();
var contentList = contents.ToList();
-
+
contentList.ShouldContain(x => x.Name == "jquery-3-1-1-min.js");
contentList.ShouldContain(x => x.Name == "my{test}.2.9.min.js");
}
@@ -74,7 +74,7 @@ namespace Volo.Abp.VirtualFileSystem
var contents = _virtualFileProvider.GetDirectoryContents(path);
//Assert
- contents.Exists.ShouldNotBeNull();
+ contents.Exists.ShouldBeTrue();
var contentList = contents.ToList();
contentList.ShouldContain(x => x.Name == "js");
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json
index 97d9e4d95d..e6c052d09e 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "تسجيل الخروج",
"LoggedOutText": "لقد تم تسجيل خروجك وستتم إعادة توجيهك قريبًا.",
"ReturnToText": "انقر هنا لإعادة التوجيه إلى {0}",
- "OrLoginWith": "أو الدخول بـ",
+ "OrLoginWith": "أو الدخول بـ:",
"ForgotPassword": "نسيت كلمة السر؟",
"SendPasswordResetLink_Information": "سيتم إرسال رابط إعادة تعيين كلمة المرور إلى بريدك الإلكتروني لإعادة تعيين كلمة المرور الخاصة بك. إذا لم تتلق رسالة بريد إلكتروني في غضون بضع دقائق ، فيرجى إعادة المحاولة.",
"PasswordResetMailSentMessage": "تم إرسال بريد إلكتروني لاسترداد الحساب إلى عنوان بريدك الإلكتروني. إذا كنت لا ترى هذا البريد الإلكتروني في علبة الوارد الخاصة بك في غضون 15 دقيقة ، فابحث عنه في مجلد البريد غير الهام. إذا وجدته هناك ، فيرجى وضع علامة عليه كـ -ليس غير هام-.",
@@ -55,4 +55,4 @@
"GoToTheApplication": "اذهب إلى التطبيق",
"BackToLogin": "العودة إلى تسجيل الدخول"
}
-}
\ No newline at end of file
+}
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json
index 9a5b7314e1..714e7f69c2 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "Abgemeldet",
"LoggedOutText": "Sie wurden abgemeldet und werden bald weitergeleitet.",
"ReturnToText": "Klicken Sie hier, um zu {0} umzuleiten",
- "OrLoginWith": "Oder melden Sie sich an mit;",
+ "OrLoginWith": "Oder melden Sie sich an mit:",
"ForgotPassword": "Passwort vergessen?",
"SendPasswordResetLink_Information": "Ein Link zum Zurücksetzen des Passworts wird an Ihre E-Mail gesendet. Wenn Sie innerhalb weniger Minuten keine E-Mail erhalten, versuchen Sie es erneut.",
"PasswordResetMailSentMessage": "E-Mail zur Kontowiederherstellung an Ihre E-Mail-Adresse gesendet. Wenn Sie diese E-Mail nicht innerhalb von 15 Minuten in Ihrem Posteingang sehen, suchen Sie sie in Ihrem Junk-Mail-Ordner. Wenn Sie es dort finden, markieren Sie es bitte als -Kein Junk-. ",
@@ -59,4 +59,4 @@
"ReturnToApplication": "Zur Anwendung zurückkehren",
"Volo.Account:InvalidEmailAddress": "Die angegebene E-Mail-Adresse kann nicht gefunden werden: {0}"
}
-}
\ No newline at end of file
+}
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json
index db38b70309..e7cdc64c43 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "Signed Out",
"LoggedOutText": "You have been signed out and you will be redirected soon.",
"ReturnToText": "Click here to redirect to {0}",
- "OrLoginWith": "Or login with;",
+ "OrLoginWith": "Or login with:",
"ForgotPassword": "Forgot password?",
"SendPasswordResetLink_Information": "A password reset link will be sent to your email to reset your password. If you don't get an email within a few minutes, please re-try.",
"PasswordResetMailSentMessage": "Account recovery email sent to your e-mail address. If you don't see this email in your inbox within 15 minutes, look for it in your junk mail folder. If you find it there, please mark it as -Not Junk-. ",
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json
index 9ca4d954b4..5f7d824ca0 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "Sesión cerrada",
"LoggedOutText": "La sesión ha sido cerrada y serás redireccionado en breve.",
"ReturnToText": "Haz click aquí para redirigirte a {0}",
- "OrLoginWith": "O inicia sesión con;",
+ "OrLoginWith": "O inicia sesión con:",
"ForgotPassword": "¿Olvidaste la contraseña?",
"SendPasswordResetLink_Information": "Un link para resetear la contraseña será enviado a tu e-mail. Si no recibes el e-mail en unos minutos, por favor re-intenta.",
"PasswordResetMailSentMessage": "Un e-mail para recuperar la cuenta ha sido enviado a tu e-mail. Si no recibes el e-mail en unos minutos, por favor re-intentalo.",
@@ -59,4 +59,4 @@
"ReturnToApplication": "Volver a la aplicación",
"Volo.Account:InvalidEmailAddress": "No se puede encontrar la dirección de e-mail solicitada: {0}"
}
-}
\ No newline at end of file
+}
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json
index 100a71bb05..1469c7619d 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "Se déconnecter",
"LoggedOutText": "Vous avez été déconnecté et vous serez bientôt redirigé.",
"ReturnToText": "Cliquez ici pour rediriger vers {0}",
- "OrLoginWith": "Ou connectez-vous avec;",
+ "OrLoginWith": "Ou connectez-vous avec:",
"ForgotPassword": "Vous avez oublié le mot de passe ?",
"SendPasswordResetLink_Information": "Un lien de réinitialisation du mot de passe sera envoyé à votre adresse e-mail pour réinitialiser votre mot de passe. Si vous ne recevez pas d'e-mail dans quelques minutes, veuillez réessayer.",
"PasswordResetMailSentMessage": "E-mail de récupération de compte envoyé à votre adresse e-mail. Si vous ne voyez pas cet e-mail dans votre boîte de réception dans les 15 minutes, recherchez-le dans votre dossier de courrier indésirable. Si vous le trouvez là-bas, veuillez le marquer comme -Pas indésirable-.",
@@ -57,4 +57,4 @@
"ProfileTab:Password": "Changer le mot de passe",
"ProfileTab:PersonalInfo": "Informations personnelles"
}
-}
\ No newline at end of file
+}
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json
index 6d2e1c6460..768b7b21fd 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "Kijelentkezett",
"LoggedOutText": "Kijelentkeztünk, és hamarosan átirányítjuk.",
"ReturnToText": "Kattintson ide a(z) {0} címre történő átirányításhoz",
- "OrLoginWith": "Vagy jelentkezzen be",
+ "OrLoginWith": "Vagy jelentkezzen be:",
"ForgotPassword": "Elfelejtette a jelszavát?",
"SendPasswordResetLink_Information": "Jelszó-visszaállítási linket küldünk az e-mailre a jelszó visszaállításához. Ha néhány percen belül nem kap e-mailt, próbálkozzon újra.",
"PasswordResetMailSentMessage": "A fiók-helyreállítási e-mailt az Ön e-mail címére küldtük. Ha 15 percen belül nem látja ezt az e-mailt a beérkező levelek között, keresse meg a levélszemét mappájában. Ha ott találja, kérjük, jelölje meg: -Nem szemét-.",
@@ -58,4 +58,4 @@
"ProfileTab:PersonalInfo": "Személyes adatok",
"ReturnToApplication": "Vissza az alkalmazáshoz"
}
-}
\ No newline at end of file
+}
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json
index 9f8e765759..3be2997f68 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "Çıkış Yaptınız",
"LoggedOutText": "Çıkış yaptınız ve birazdan yönlendirileceksiniz.",
"ReturnToText": "{0} uygulamasına dönmek için tıklayın.",
- "OrLoginWith": "Veya bunlarla giriş yap;",
+ "OrLoginWith": "Veya bunlarla giriş yap:",
"ForgotPassword": "Şifremi unuttum",
"SendPasswordResetLink_Information": "E-posta adresinize bir şifre sıfırlama bağlantısı gönderilecektir. Birkaç dakika içerisinde bir e-posta almazsanız lütfen tekrar deneyin.",
"PasswordResetMailSentMessage": "E-posta adresinize bir şifre sıfırlama bağlantısı gönderilmiştir. Lütfen e-posta adresinizi kontrol ediniz. Eğer 15 dakika içinde, bu e-postayı gelen kutusunda bulamazsanız, gereksiz veya istenmeyen e-posta kutularına bakınız.",
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json
index cfe4fbaa27..f5995c6e28 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json
@@ -44,7 +44,7 @@
"LoggedOutTitle": "注销",
"LoggedOutText": "你已成功注销并将马上返回.",
"ReturnToText": "点击此处返回到 {0}",
- "OrLoginWith": "或登录",
+ "OrLoginWith": "或登录:",
"ForgotPassword": "忘记密码?",
"SendPasswordResetLink_Information": "密码重置链接将发送到您的电子邮件以重置密码. 如果您在几分钟内没有收到电子邮件,请重试.",
"PasswordResetMailSentMessage": "帐户恢复电子邮件已发送到您的电子邮件地址. 如果您在15分钟内未在收件箱中看到此电子邮件,请检查垃圾邮件,并标记为非垃圾邮件.",
@@ -59,4 +59,4 @@
"ReturnToApplication": "返回到应用程序",
"Volo.Account:InvalidEmailAddress": "找不到给定的电子邮件地址:{0}"
}
-}
\ No newline at end of file
+}
diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj
index bcfd855190..91f9a3022e 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj
@@ -34,7 +34,7 @@
-
+
diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
index c4ea6d9eb4..a38b454ba8 100644
--- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
+++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj
index 0f5bd720a1..a9ac493329 100644
--- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj
+++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj
index 3e11d85aee..41176d3edd 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj
+++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj
@@ -15,9 +15,9 @@
-
+
-
+
diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json
index 1b45e2091b..3bf487c960 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/package.json
+++ b/modules/blogging/app/Volo.BloggingTestApp/package.json
@@ -3,7 +3,7 @@
"name": "volo.blogtestapp",
"private": true,
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.0",
- "@abp/blogging": "^4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.1",
+ "@abp/blogging": "^4.0.1"
}
}
\ No newline at end of file
diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
index ee015c4c92..551266f2e6 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
+++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
@@ -2,37 +2,37 @@
# yarn lockfile v1
-"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.0.tgz#b1822cf5bbc0f6eeb414ebd0877f6d1115a81fe7"
- integrity sha512-yYXQkEnNhftzm+ZI8d3VFMlV5UuLNTMQQwV2eZ8tJfstUQrKV9bVd3+NdDOr3AkvcD8D7mvMFeBuoMYteL5kLQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.1.tgz#ce8e3eb830a8e8f9eecb1a3b3bd70c2832fdf15e"
+ integrity sha512-w+ZG8Ewx9wWfbvRC2MAjJl+rXuXSHLhhGOiJTk68unWLNziDtNQzcSXG/Z5c1hA+acJSGqDoJGEGs4FVM136og==
dependencies:
- "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.1"
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.0.tgz#ba896056e9df5ac58e108df96996fbb2ca7a1a15"
- integrity sha512-3RNn6VrNA+cqnPBoSbiCazN05cC2rhcRFMMxkEte+LImGbGOsxc4MflzHg5On1ExCGdqko8Axbw/ydy44Ak4Hw==
- dependencies:
- "@abp/aspnetcore.mvc.ui" "~4.0.0"
- "@abp/bootstrap" "~4.0.0"
- "@abp/bootstrap-datepicker" "~4.0.0"
- "@abp/datatables.net-bs4" "~4.0.0"
- "@abp/font-awesome" "~4.0.0"
- "@abp/jquery-form" "~4.0.0"
- "@abp/jquery-validation-unobtrusive" "~4.0.0"
- "@abp/lodash" "~4.0.0"
- "@abp/luxon" "~4.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~4.0.0"
- "@abp/select2" "~4.0.0"
- "@abp/sweetalert" "~4.0.0"
- "@abp/timeago" "~4.0.0"
- "@abp/toastr" "~4.0.0"
-
-"@abp/aspnetcore.mvc.ui@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.0.tgz#68502177a05f6ce7191a09b06a18c5b5dfab425d"
- integrity sha512-tYHUWMwnwInrGSzC/OdN6bH/VHZEz5DP3rx2U6fcb0I5GvvRdQZxVgUvmWn6DeMA3PG10Gra4SfkhZqRQq9rjQ==
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.1.tgz#cd9d0eb11309c597dffd26277cd1bd7c5b1e0e2f"
+ integrity sha512-QGoCN/my0eAfa4tx5ytDxArIoz2i58jFFVUGso1Lekn54JvSt+WLz2p3uyTGatZ03Bp9836elhFnIopn12WvBw==
+ dependencies:
+ "@abp/aspnetcore.mvc.ui" "~4.0.1"
+ "@abp/bootstrap" "~4.0.1"
+ "@abp/bootstrap-datepicker" "~4.0.1"
+ "@abp/datatables.net-bs4" "~4.0.1"
+ "@abp/font-awesome" "~4.0.1"
+ "@abp/jquery-form" "~4.0.1"
+ "@abp/jquery-validation-unobtrusive" "~4.0.1"
+ "@abp/lodash" "~4.0.1"
+ "@abp/luxon" "~4.0.1"
+ "@abp/malihu-custom-scrollbar-plugin" "~4.0.1"
+ "@abp/select2" "~4.0.1"
+ "@abp/sweetalert" "~4.0.1"
+ "@abp/timeago" "~4.0.1"
+ "@abp/toastr" "~4.0.1"
+
+"@abp/aspnetcore.mvc.ui@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.1.tgz#6490c147a56e4f7055d2ca77f20baf1f60f56867"
+ integrity sha512-4B3icJrlpuZgMaX52ninyaenH7zLwepePEscDrLaFY9wyonKpZ2zh+xplnyM6vjNd+PhErWuA2+ssCswFhrJ3A==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@@ -43,214 +43,214 @@
micromatch "^4.0.2"
path "^0.12.7"
-"@abp/blogging@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-4.0.0.tgz#01c65e816b646b247ee7077ad5bc002528a83467"
- integrity sha512-NWY0lzhITIUlq4tygadughJiH+Y6OIu70OphX/KqbQdo6A291qWRIeMSDGF8ZN5ui/tdliD24Wh2sHKN+kNEuw==
+"@abp/blogging@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-4.0.1.tgz#d46afb7695922c89395564272d69f7e2e93ae19a"
+ integrity sha512-tPvjcWW5KTruHdmPi4TLKA2XahIsgJrpYfRIhduTespbCUWZZCdXwD76Bmv3HhD3oNivAR8lnf3iyHujQ3zhPA==
dependencies:
- "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.0"
- "@abp/owl.carousel" "~4.0.0"
- "@abp/prismjs" "~4.0.0"
- "@abp/tui-editor" "~4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.1"
+ "@abp/owl.carousel" "~4.0.1"
+ "@abp/prismjs" "~4.0.1"
+ "@abp/tui-editor" "~4.0.1"
-"@abp/bootstrap-datepicker@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.0.tgz#cdbd2c388c6d7ce8c6d72443038975063e6c6d02"
- integrity sha512-hauH8VhpC8cxv1wCR6bVBcNqZepftdBXxEVID7TSAqgNyWjm/CrJqWLI+A0nnkG3IHoIm9D22iF47BamuYHptw==
+"@abp/bootstrap-datepicker@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.1.tgz#aad891263edff66f816e003ba4fa7f8acfe8e0b6"
+ integrity sha512-S0oaVZmXsDcOJLAyoGY0TvP/7bZx0GHIbU9BIhIL2Wl74HYaokjkTr6/IleIek9YeiF2vm9FkrUP1dKH/4f7Gg==
dependencies:
bootstrap-datepicker "^1.9.0"
-"@abp/bootstrap@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.0.tgz#04174f18055f76f936e6fb73e5ff71ffa08a8528"
- integrity sha512-Tmr0yoSWg7XHl02X5wv04CvYcL8KCpX8u6YGJj31jRZxUTeCvs5ETXlepOWcdxPQqi/4olXv5B9GEz5S9l5nZA==
+"@abp/bootstrap@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.1.tgz#3e41bdf9b3e9f8c497b9fafe22a4851d0401b31b"
+ integrity sha512-GoSaNWvswRHVoUrq7xClFQYtwqIlyS/vp/TdY+j5FFZP7ud89+ZGpdNqYqq5l9/6aaYa7v4b9mNTZ/1JRzAOYg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
bootstrap "^4.5.0"
bootstrap-v4-rtl "4.4.1-2"
-"@abp/clipboard@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.0.0.tgz#4b01bead2e404c38a3ae9955dac5522d3c30c78b"
- integrity sha512-39CZuF6lxUx1fluclzMl1uG0qIUX82S2wNbyJu2WGfuMMaaIgzSp9du/bB89Ik6rR5BFUU/3p8uvzOgy4sc2sQ==
+"@abp/clipboard@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.0.1.tgz#aacbd02b6ce991ca20550ad7afc40e0cea247b5e"
+ integrity sha512-Q7Fe167pBJ/9Vp5RyVc/JejaIzNCdTgXcnZLNC7AEtaeBVCmLwsdnCYP3i32sdvX1AIgt3exhAAsHBt0deij/g==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
clipboard "^2.0.6"
-"@abp/codemirror@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.0.0.tgz#b122fe29eab8146e81b864bdca084b1beb1ebe61"
- integrity sha512-s1yjkLOhMJklXsq7r6Ojgv2B1NM8VODz5ou/hjNqTTnZiVOVnKOdXJsRqU+5ctX1anJuUpD24SJd1KrKSAhKSQ==
+"@abp/codemirror@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.0.1.tgz#301a58c76b31daa2b4cba7226a971d73a498a534"
+ integrity sha512-JFVNu1jXz65VLVQgyzVCmYq8JrxT96wDfiBRt55Snw68vqFjQnlh95t9jbITfjUsb2TZqEg7S95STDhrLrq5xg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
codemirror "^5.54.0"
-"@abp/core@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.0.tgz#65e76c697e62162717e0edabf7edacc4228e682a"
- integrity sha512-xcTTBFjLFZ9Trv2x9Y/c3XKezIx+x3MTXUD98QJPf1aR7T43TE/tLHRxdRfW3R8ka0O1wmlYshpkaw5pYNsj5w==
+"@abp/core@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.1.tgz#1df32bc058f45571605670ca81c226a1bd87400c"
+ integrity sha512-8UT5lwqV/luVG/SxePSTD2FRbZXwXv3cZJKjw+gpBjhD0slWrh51XEOHsM8ciTuhcvV/tsqVU9nXckDMdO58fw==
dependencies:
- "@abp/utils" "^4.0.0"
+ "@abp/utils" "^4.0.1"
-"@abp/datatables.net-bs4@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.0.tgz#fe737e054f6ba35e787a1cda185af2788ef86d39"
- integrity sha512-mz7xZdzX1nlFyX7vNzB5w3RkqZ0IHrPgsXGOB7OCTKMRshDFVH2O51Oy4qoLDOXoTVeahHtR9v8thEWFR1SnZg==
+"@abp/datatables.net-bs4@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.1.tgz#7538baad0eff24eca7f4246d020852f83139f645"
+ integrity sha512-S52jNPF4if68V+P/33NrtGPJXf6xrqgyZzz9b7qBR7HuUm3Nsn7bAslh3JNduNec/sFuE4Utl/xsFHZNjBWEog==
dependencies:
- "@abp/datatables.net" "~4.0.0"
+ "@abp/datatables.net" "~4.0.1"
datatables.net-bs4 "^1.10.21"
-"@abp/datatables.net@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.0.tgz#88ae5f1a6068fba55927e59f113686508e9553cb"
- integrity sha512-JYTfMA1zlBNGiQHAiZiTj5ka6B6vq5k2jqsoLHup4pD9jpKwKRBGtltVsWoEnetd9eEbp4SaV/FCuh3RzmV6Pw==
+"@abp/datatables.net@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.1.tgz#eb89716a37351c41b5bccfc2db88fc7ceb991a26"
+ integrity sha512-APFLui0w8MqsBWqP/K0QkT5cBq5SsWiqMaIGTXQKinMVLV597sUszrlhe1ISU2PqeD7iX6pCZNNOTI1NEUn9/Q==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
datatables.net "^1.10.21"
-"@abp/font-awesome@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.0.tgz#6e1e4bd1175a0b8d3b095e215c07e66ad0e42e19"
- integrity sha512-kHfZ45UMDWSRk1gTV/BwVfSoXksJ9UlnD3SelTGeAkvbDqtDllqlp9y6c3qQcmZUE348Xl4hDTkU8upZwswCFQ==
+"@abp/font-awesome@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.1.tgz#8a9d83b2c2adfcd5abcbd9c31c315460d44a321e"
+ integrity sha512-+6+m/DKMnfkeQiWUsMlB6Da8u6yREyN2oQYGYhSRAK8419ym8RHHrqKJv2AClI4iLq2ppHZj8WF84+SeoCekRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
"@fortawesome/fontawesome-free" "^5.13.0"
-"@abp/highlight.js@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.0.0.tgz#109a7e21805c4545a677c5b41f09ee31fc5cf08a"
- integrity sha512-VjlZniAnjxSRBcUoLG3hUXMTuODIjEqUZRbre3EEvr1pmkFASQyHhVEbyXR7LJOcBJ1NAtePYPPyXU8omrqOZg==
+"@abp/highlight.js@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.0.1.tgz#6e455d38cbd84c82d1665cb38f40d4c7ab4b7999"
+ integrity sha512-HyuU2I1fnhGGKEzY52gH71vop1cq9x2BWVhKxVFH8xphva3N6lftCp212PIqTo6oANTgruyqPhr3z4rGOM4OfQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
-"@abp/jquery-form@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.0.tgz#3afb41eb16d62e32c31a29c6a866f634a5a20cd8"
- integrity sha512-cQq8PgzHfpK9/LxmjlnMsDn85wWvEOqjyLaepHFpTTt0341auSgXNwhp7rk71AUHD1lP3c9ALctmqu+gYmh9ag==
+"@abp/jquery-form@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.1.tgz#6dc1922b2800dd635f20881a82e08104a1dd1bb5"
+ integrity sha512-JMBZYu/MI/GjaLTBOMB5iv8cagnLpReDULNC3r6tLNNqB1R8f3Cg1T7nF4YCuU9SYMqis1P/AuE4oEh+4rQdAQ==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#c3674d2b01b3c524de4c3fac1c6ae3657857ee7b"
- integrity sha512-OGibIdw0ogjp6VQIebHM7OtMT36pjLKRrOHyCVpTmQ7NzDODV5ptG83vOnt5nFG0y9XFrOt8cnHrrd+K1Bpo/Q==
+"@abp/jquery-validation-unobtrusive@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.1.tgz#4142ca31c0830fe24a1467e8cf13b55ba9d7c1dd"
+ integrity sha512-rdSRTcdKCHmarbrVgmPYdTiJ0G/aFKd+dr0krO7fALPTuQKChbDnHOO4/JvQSc+cd9faxa8c6ZWvlHdsof23tQ==
dependencies:
- "@abp/jquery-validation" "~4.0.0"
+ "@abp/jquery-validation" "~4.0.1"
jquery-validation-unobtrusive "^3.2.11"
-"@abp/jquery-validation@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.0.tgz#0a101937f89ff398317142b5271fa9a1de6571c2"
- integrity sha512-4nzvhAktEINpQ2H+Hy7TOxxojTmTEm5dBTbHs1vbCWUuF0OTpouZWbMZDESdP0ZbjXcQ+vhwuM4e/pm/PeaHyQ==
+"@abp/jquery-validation@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.1.tgz#74e7d795468c6986f2db15662631fcd4f67c679e"
+ integrity sha512-FX26aQCsMBdVWAJb7S37Lt7KoHAEHoYguh/qfZIARCpOYOOWvxfDz1wTrmADUkqdillqEiCeD/Imj8bYH9Faaw==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-validation "^1.19.2"
-"@abp/jquery@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.0.tgz#00d24678b573bcc2fb14d8337ccdbf697b59d43b"
- integrity sha512-gXLK97IvAZriNlG8e0qJcd7MvnpshJQURb4lg8VYibD7Fs/OBeHSAWM2Adgi3H9DnQL8XEUlWf487FSz4RC/Yg==
+"@abp/jquery@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.1.tgz#aa554accb16600fd586c3a4f088040cd26d0bde8"
+ integrity sha512-MtiRKOLyjEWux+whPP3+zwPbpj8or756JtgjnwOTDB9tp9HLCYUaskt+oalYPvob24nDZcNu2RnMALYdCVhZAQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
jquery "~3.5.1"
-"@abp/lodash@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.0.tgz#fe76d09517f6b1adf18edde94a31e13b003329dc"
- integrity sha512-uitn5uYlb9xShRtV4AFOgp3lu2kADGMD4+a4fy5r4umlPM2uuMo0wMhzyYdBIG64JC5oNaqAzOwZyhhnn+HGJg==
+"@abp/lodash@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.1.tgz#ec261ccaab8a70d5b32a8a7c22387e48936d38d4"
+ integrity sha512-Dav1QKbBeGR4VVbHHe1s3OEzN7wnb9K/vwzHrWmtO8D1Q5Z3433xjNmgL5VQ9gfxXqooSfEO4gAovZklMDHDew==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
lodash "^4.17.15"
-"@abp/luxon@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.0.tgz#d9357e4fb422b6e18ebe897a86a4c4bc6fbe6858"
- integrity sha512-tiE6NiSa4El88SVotxfmmpceINLz8MruaO/e/U3QjJEHjRoqlv0UBrM/x5Xz92c7ZIvL0Y4QvWNISeDg6/oqIQ==
+"@abp/luxon@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.1.tgz#a540750b1605dbac856ce9c2e776c2fecf6392f9"
+ integrity sha512-eRumVB7UIf2XH6OZVUTvcKw0A/OSAfYV59fM+Wc4dAkNcmsNZI0gD1o0AigSGNCxTV6v+W2bFrsuooSqK99Y0Q==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
luxon "^1.24.1"
-"@abp/malihu-custom-scrollbar-plugin@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.0.tgz#972acf26f5eaa4bf9b8991cbe7c19fd0005d94e2"
- integrity sha512-SpUo1CfppKzkE6Rb880pgB7oQ83Mkjsi0o6eE4r4gkF5hfzkuCXOmNjTYKfQIkE4n3G9QQd+8AAN/4xj4DiDrA==
+"@abp/malihu-custom-scrollbar-plugin@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.1.tgz#0a556423a67b6c949e32ffcacd72256dea6c31ee"
+ integrity sha512-YTwYpnQ1ZrON70gvJcnNZRwB3Ze4olGcXxiPvmRgSHbGJkSnHYJiP6PvsN1F3HDFukAJ/iUu+WwEe8OBwlyLXA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/markdown-it@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.0.0.tgz#abb2745871212bf5980f014324d1f175c9bf8ae0"
- integrity sha512-lb7/WiagsJjDCq1lIiWI0pdl6o4EzuNMD1/Xa2p3n34jLx5x4cPhTthwHCkYqedJ22CiCV7Aevh8X2vt/b9aDw==
+"@abp/markdown-it@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.0.1.tgz#031cb8674f2fe40cf8fbb714ea6b5cd8f7c9a5a9"
+ integrity sha512-8hx4MkIsoDYDsTsIRbqRHPpoiexXK1SeP3VTweLcUnWZxdZ3i8dj3ELy8lbt0O9LrqFACMJmLlVdhrur3w2mfQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
markdown-it "^11.0.0"
-"@abp/owl.carousel@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-4.0.0.tgz#5f95ae6e8e57b4c93dfa45552d1786af4ab32bda"
- integrity sha512-C+gaH+X0H8UXASPUlotq58Ygv2ER3d/ARUj8mN78dscIOXHzr9SIQCTuvvLJF2YZeGhkF/aCUHy+VwiIBlDqvQ==
+"@abp/owl.carousel@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-4.0.1.tgz#7241fc23aa5bc63dc1668a04e32c56134f5c3d16"
+ integrity sha512-+H3ypcPAKymA0/yHHT4tr26thhFM7wc+p/ethJaVH26w+REFASnweLRlMMNC7pV+JFpEnHwUOswkRP0/96i25w==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
owl.carousel "^2.3.4"
-"@abp/prismjs@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.0.0.tgz#7b98c233ac1f0025c14b27c1ba62910bd9022442"
- integrity sha512-Eh63EUe2wnl8P1iyPo9Glt9BD6yFdrAjIbvBeFheJnSWgvij3mayOtCAq9P2ksKWo1Gq3hv1lm/p9vdYFRHoKw==
+"@abp/prismjs@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.0.1.tgz#8e614878a9d1d63504fe7ba6b7d44093947d862b"
+ integrity sha512-qZP4TlQDiXaAIrDmpzQJeL/9mtTCxQCIbELDnBHMZFDrYNENOKZeBmvD9WAhgzL7FJcnPtOomJgZ5x2rqpBW/w==
dependencies:
- "@abp/clipboard" "~4.0.0"
- "@abp/core" "~4.0.0"
+ "@abp/clipboard" "~4.0.1"
+ "@abp/core" "~4.0.1"
prismjs "^1.20.0"
-"@abp/select2@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.0.tgz#8fdf4c5e18f4093ee4e073dab950cf7aa9b2a540"
- integrity sha512-XeXahcDMczdkZdP07yhQriIvbi1N5meeSGTnFyZX+bNTGzUOarPcuNYZ6Mcl3351HcyESHzuJbKbsk3RB1kGeg==
+"@abp/select2@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.1.tgz#8983e7b5c3afb862f08b2730b70e59d726e9b5d5"
+ integrity sha512-WdzY2hvsS/4vz/VXpxq2muSzzE8ggchiIrICy/WKchJxL9L08DM796t6aE6rEl9wucY8XEzzWrPOVqAjJmnXFA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
select2 "^4.0.13"
-"@abp/sweetalert@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.0.tgz#0d93e92e95c6855aef7e19532a7513a078ece216"
- integrity sha512-y3XtZqnUVZuQohpRO1ImyBZXhtrm4H+typIL/9VgcnlvQjBTyIaiwDmU8j07Bb2rKJKe0prVkkVARO7OnjOS5A==
+"@abp/sweetalert@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.1.tgz#0088610915ad6db0a140b77832a37c10066eb4ee"
+ integrity sha512-t4/44oQCMngSjVqmeRWXwrXa/pRKc3CEpyyTiGIXki4dWJ21j0ePCw2l3rvOJWnpoCznhxa/UGxLfRfK1NEzRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
sweetalert "^2.1.2"
-"@abp/timeago@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.0.tgz#509cd8a84cd94c2644824b0c3af10c8fff6de2dc"
- integrity sha512-90jzLYJusYTPwMbak1+XkXE85OPOXPpysRbL28KQwl7WLNBm8wx6IEoVZOHvOrpYscYdyeWhZCgILSJ8DR3a2Q==
+"@abp/timeago@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.1.tgz#8c161645534eb1f62fe4607450acf7345729e711"
+ integrity sha512-PsPobV79U2qzVY+WBsmJM1ohSF4jqcLnL4/7qyJvxlb1WwbCl1F5D4cpiJP4zsM4clPW4mbSsiauMNp+HTNKEA==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
timeago "^1.6.7"
-"@abp/toastr@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.0.tgz#06e28665cb7f6eefee3f69c985dd2b3f86cd7f1d"
- integrity sha512-YL1fahVpDszhwpnRTN87GCP523Mkaw42ApT2A/hZuBdwRzP/u5GwRfng0i/uhdYXCMkTKuHmaHnRyqhGiv7nfQ==
+"@abp/toastr@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.1.tgz#ecb6f6193b7edc3150d0614ab9457472baf1cce3"
+ integrity sha512-bTTz0O8zj7fMhdoummP2Ed5Z8SJTmR6svzNchBXNDrnRAcDQvTihPTcg0UpH8BEDFczbLowq09CG2A/RMSJoug==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
toastr "^2.1.4"
-"@abp/tui-editor@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.0.0.tgz#dff89b1993a89115fef34bd2247e9939a2d3942f"
- integrity sha512-Q09e2AX9PhzmoZFVw69RyuiZxE7TVLGYcM0RS4PxBYccFME+VPfG5D3/SfqMr+OwroI4iqh+tIgVyS8uyo/r0A==
+"@abp/tui-editor@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.0.1.tgz#3e9a7f464f6ff3880e21518acc42556f82618294"
+ integrity sha512-BeUNK/R15TrNA14AarQj+WBSMp76dfaz8zeFP7l25FXPMi571mwZQnb+F2wJvsCU3jCWaO/pSGoIY6KehHsXsg==
dependencies:
- "@abp/codemirror" "~4.0.0"
- "@abp/highlight.js" "~4.0.0"
- "@abp/jquery" "~4.0.0"
- "@abp/markdown-it" "~4.0.0"
+ "@abp/codemirror" "~4.0.1"
+ "@abp/highlight.js" "~4.0.1"
+ "@abp/jquery" "~4.0.1"
+ "@abp/markdown-it" "~4.0.1"
tui-editor "^1.4.10"
-"@abp/utils@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.0.tgz#6c2b5f5c20821028fe6cdbffb5e2f6088956b9d5"
- integrity sha512-Yj2yCObvS6X/P8rdRMQBo7940k5P/dZhgCUSo9C6P9GNmJY8wNdJFFyhRtaHuAyU5IBBBIY7+mMKOk5eQcbjWQ==
+"@abp/utils@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.1.tgz#9a4cb420266c49d8084776bd31c86681d4d4d125"
+ integrity sha512-nI2ZyaNpvohr75p8jeMPWze+hX+mV47EHI+Zloa4GgGmJqrULdG71kYh45R+jGmMTbQL6huaXGnpz4gNF9TGyQ==
dependencies:
just-compare "^1.3.0"
diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj
index 8c9f39e023..308a0b8c31 100644
--- a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj
+++ b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/PostAppService_Tests.cs b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/PostAppService_Tests.cs
index 260304d6ba..654ddcbe44 100644
--- a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/PostAppService_Tests.cs
+++ b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/PostAppService_Tests.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
using System.Threading.Tasks;
using Shouldly;
using Volo.Blogging.Blogs;
@@ -55,7 +56,7 @@ namespace Volo.Blogging
Url = title.Replace(" ", "-")
});
- newPostDto.Id.ShouldNotBeNull();
+ newPostDto.Id.ShouldNotBe(Guid.Empty);
UsingDbContext(context =>
{
@@ -87,7 +88,7 @@ namespace Volo.Blogging
Content = newContent,
Url = newTitle.Replace(" ", "-")
});
-
+
UsingDbContext(context =>
{
var post = context.Posts.FirstOrDefault(q => q.Id == oldPost.Id);
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj
index cc27807686..dbf58f3b71 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
index 840ebe7e15..2ac9d439cd 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
@@ -3,6 +3,6 @@
"name": "client-simulation-web",
"private": true,
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.1"
}
}
\ No newline at end of file
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
index d5e4cc185e..9d399b77de 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
@@ -2,37 +2,37 @@
# yarn lockfile v1
-"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.0.tgz#b1822cf5bbc0f6eeb414ebd0877f6d1115a81fe7"
- integrity sha512-yYXQkEnNhftzm+ZI8d3VFMlV5UuLNTMQQwV2eZ8tJfstUQrKV9bVd3+NdDOr3AkvcD8D7mvMFeBuoMYteL5kLQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.1.tgz#ce8e3eb830a8e8f9eecb1a3b3bd70c2832fdf15e"
+ integrity sha512-w+ZG8Ewx9wWfbvRC2MAjJl+rXuXSHLhhGOiJTk68unWLNziDtNQzcSXG/Z5c1hA+acJSGqDoJGEGs4FVM136og==
dependencies:
- "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.1"
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.0.tgz#ba896056e9df5ac58e108df96996fbb2ca7a1a15"
- integrity sha512-3RNn6VrNA+cqnPBoSbiCazN05cC2rhcRFMMxkEte+LImGbGOsxc4MflzHg5On1ExCGdqko8Axbw/ydy44Ak4Hw==
- dependencies:
- "@abp/aspnetcore.mvc.ui" "~4.0.0"
- "@abp/bootstrap" "~4.0.0"
- "@abp/bootstrap-datepicker" "~4.0.0"
- "@abp/datatables.net-bs4" "~4.0.0"
- "@abp/font-awesome" "~4.0.0"
- "@abp/jquery-form" "~4.0.0"
- "@abp/jquery-validation-unobtrusive" "~4.0.0"
- "@abp/lodash" "~4.0.0"
- "@abp/luxon" "~4.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~4.0.0"
- "@abp/select2" "~4.0.0"
- "@abp/sweetalert" "~4.0.0"
- "@abp/timeago" "~4.0.0"
- "@abp/toastr" "~4.0.0"
-
-"@abp/aspnetcore.mvc.ui@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.0.tgz#68502177a05f6ce7191a09b06a18c5b5dfab425d"
- integrity sha512-tYHUWMwnwInrGSzC/OdN6bH/VHZEz5DP3rx2U6fcb0I5GvvRdQZxVgUvmWn6DeMA3PG10Gra4SfkhZqRQq9rjQ==
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.1.tgz#cd9d0eb11309c597dffd26277cd1bd7c5b1e0e2f"
+ integrity sha512-QGoCN/my0eAfa4tx5ytDxArIoz2i58jFFVUGso1Lekn54JvSt+WLz2p3uyTGatZ03Bp9836elhFnIopn12WvBw==
+ dependencies:
+ "@abp/aspnetcore.mvc.ui" "~4.0.1"
+ "@abp/bootstrap" "~4.0.1"
+ "@abp/bootstrap-datepicker" "~4.0.1"
+ "@abp/datatables.net-bs4" "~4.0.1"
+ "@abp/font-awesome" "~4.0.1"
+ "@abp/jquery-form" "~4.0.1"
+ "@abp/jquery-validation-unobtrusive" "~4.0.1"
+ "@abp/lodash" "~4.0.1"
+ "@abp/luxon" "~4.0.1"
+ "@abp/malihu-custom-scrollbar-plugin" "~4.0.1"
+ "@abp/select2" "~4.0.1"
+ "@abp/sweetalert" "~4.0.1"
+ "@abp/timeago" "~4.0.1"
+ "@abp/toastr" "~4.0.1"
+
+"@abp/aspnetcore.mvc.ui@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.1.tgz#6490c147a56e4f7055d2ca77f20baf1f60f56867"
+ integrity sha512-4B3icJrlpuZgMaX52ninyaenH7zLwepePEscDrLaFY9wyonKpZ2zh+xplnyM6vjNd+PhErWuA2+ssCswFhrJ3A==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@@ -43,145 +43,145 @@
micromatch "^4.0.2"
path "^0.12.7"
-"@abp/bootstrap-datepicker@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.0.tgz#cdbd2c388c6d7ce8c6d72443038975063e6c6d02"
- integrity sha512-hauH8VhpC8cxv1wCR6bVBcNqZepftdBXxEVID7TSAqgNyWjm/CrJqWLI+A0nnkG3IHoIm9D22iF47BamuYHptw==
+"@abp/bootstrap-datepicker@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.1.tgz#aad891263edff66f816e003ba4fa7f8acfe8e0b6"
+ integrity sha512-S0oaVZmXsDcOJLAyoGY0TvP/7bZx0GHIbU9BIhIL2Wl74HYaokjkTr6/IleIek9YeiF2vm9FkrUP1dKH/4f7Gg==
dependencies:
bootstrap-datepicker "^1.9.0"
-"@abp/bootstrap@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.0.tgz#04174f18055f76f936e6fb73e5ff71ffa08a8528"
- integrity sha512-Tmr0yoSWg7XHl02X5wv04CvYcL8KCpX8u6YGJj31jRZxUTeCvs5ETXlepOWcdxPQqi/4olXv5B9GEz5S9l5nZA==
+"@abp/bootstrap@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.1.tgz#3e41bdf9b3e9f8c497b9fafe22a4851d0401b31b"
+ integrity sha512-GoSaNWvswRHVoUrq7xClFQYtwqIlyS/vp/TdY+j5FFZP7ud89+ZGpdNqYqq5l9/6aaYa7v4b9mNTZ/1JRzAOYg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
bootstrap "^4.5.0"
bootstrap-v4-rtl "4.4.1-2"
-"@abp/core@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.0.tgz#65e76c697e62162717e0edabf7edacc4228e682a"
- integrity sha512-xcTTBFjLFZ9Trv2x9Y/c3XKezIx+x3MTXUD98QJPf1aR7T43TE/tLHRxdRfW3R8ka0O1wmlYshpkaw5pYNsj5w==
+"@abp/core@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.1.tgz#1df32bc058f45571605670ca81c226a1bd87400c"
+ integrity sha512-8UT5lwqV/luVG/SxePSTD2FRbZXwXv3cZJKjw+gpBjhD0slWrh51XEOHsM8ciTuhcvV/tsqVU9nXckDMdO58fw==
dependencies:
- "@abp/utils" "^4.0.0"
+ "@abp/utils" "^4.0.1"
-"@abp/datatables.net-bs4@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.0.tgz#fe737e054f6ba35e787a1cda185af2788ef86d39"
- integrity sha512-mz7xZdzX1nlFyX7vNzB5w3RkqZ0IHrPgsXGOB7OCTKMRshDFVH2O51Oy4qoLDOXoTVeahHtR9v8thEWFR1SnZg==
+"@abp/datatables.net-bs4@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.1.tgz#7538baad0eff24eca7f4246d020852f83139f645"
+ integrity sha512-S52jNPF4if68V+P/33NrtGPJXf6xrqgyZzz9b7qBR7HuUm3Nsn7bAslh3JNduNec/sFuE4Utl/xsFHZNjBWEog==
dependencies:
- "@abp/datatables.net" "~4.0.0"
+ "@abp/datatables.net" "~4.0.1"
datatables.net-bs4 "^1.10.21"
-"@abp/datatables.net@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.0.tgz#88ae5f1a6068fba55927e59f113686508e9553cb"
- integrity sha512-JYTfMA1zlBNGiQHAiZiTj5ka6B6vq5k2jqsoLHup4pD9jpKwKRBGtltVsWoEnetd9eEbp4SaV/FCuh3RzmV6Pw==
+"@abp/datatables.net@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.1.tgz#eb89716a37351c41b5bccfc2db88fc7ceb991a26"
+ integrity sha512-APFLui0w8MqsBWqP/K0QkT5cBq5SsWiqMaIGTXQKinMVLV597sUszrlhe1ISU2PqeD7iX6pCZNNOTI1NEUn9/Q==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
datatables.net "^1.10.21"
-"@abp/font-awesome@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.0.tgz#6e1e4bd1175a0b8d3b095e215c07e66ad0e42e19"
- integrity sha512-kHfZ45UMDWSRk1gTV/BwVfSoXksJ9UlnD3SelTGeAkvbDqtDllqlp9y6c3qQcmZUE348Xl4hDTkU8upZwswCFQ==
+"@abp/font-awesome@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.1.tgz#8a9d83b2c2adfcd5abcbd9c31c315460d44a321e"
+ integrity sha512-+6+m/DKMnfkeQiWUsMlB6Da8u6yREyN2oQYGYhSRAK8419ym8RHHrqKJv2AClI4iLq2ppHZj8WF84+SeoCekRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
"@fortawesome/fontawesome-free" "^5.13.0"
-"@abp/jquery-form@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.0.tgz#3afb41eb16d62e32c31a29c6a866f634a5a20cd8"
- integrity sha512-cQq8PgzHfpK9/LxmjlnMsDn85wWvEOqjyLaepHFpTTt0341auSgXNwhp7rk71AUHD1lP3c9ALctmqu+gYmh9ag==
+"@abp/jquery-form@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.1.tgz#6dc1922b2800dd635f20881a82e08104a1dd1bb5"
+ integrity sha512-JMBZYu/MI/GjaLTBOMB5iv8cagnLpReDULNC3r6tLNNqB1R8f3Cg1T7nF4YCuU9SYMqis1P/AuE4oEh+4rQdAQ==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#c3674d2b01b3c524de4c3fac1c6ae3657857ee7b"
- integrity sha512-OGibIdw0ogjp6VQIebHM7OtMT36pjLKRrOHyCVpTmQ7NzDODV5ptG83vOnt5nFG0y9XFrOt8cnHrrd+K1Bpo/Q==
+"@abp/jquery-validation-unobtrusive@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.1.tgz#4142ca31c0830fe24a1467e8cf13b55ba9d7c1dd"
+ integrity sha512-rdSRTcdKCHmarbrVgmPYdTiJ0G/aFKd+dr0krO7fALPTuQKChbDnHOO4/JvQSc+cd9faxa8c6ZWvlHdsof23tQ==
dependencies:
- "@abp/jquery-validation" "~4.0.0"
+ "@abp/jquery-validation" "~4.0.1"
jquery-validation-unobtrusive "^3.2.11"
-"@abp/jquery-validation@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.0.tgz#0a101937f89ff398317142b5271fa9a1de6571c2"
- integrity sha512-4nzvhAktEINpQ2H+Hy7TOxxojTmTEm5dBTbHs1vbCWUuF0OTpouZWbMZDESdP0ZbjXcQ+vhwuM4e/pm/PeaHyQ==
+"@abp/jquery-validation@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.1.tgz#74e7d795468c6986f2db15662631fcd4f67c679e"
+ integrity sha512-FX26aQCsMBdVWAJb7S37Lt7KoHAEHoYguh/qfZIARCpOYOOWvxfDz1wTrmADUkqdillqEiCeD/Imj8bYH9Faaw==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-validation "^1.19.2"
-"@abp/jquery@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.0.tgz#00d24678b573bcc2fb14d8337ccdbf697b59d43b"
- integrity sha512-gXLK97IvAZriNlG8e0qJcd7MvnpshJQURb4lg8VYibD7Fs/OBeHSAWM2Adgi3H9DnQL8XEUlWf487FSz4RC/Yg==
+"@abp/jquery@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.1.tgz#aa554accb16600fd586c3a4f088040cd26d0bde8"
+ integrity sha512-MtiRKOLyjEWux+whPP3+zwPbpj8or756JtgjnwOTDB9tp9HLCYUaskt+oalYPvob24nDZcNu2RnMALYdCVhZAQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
jquery "~3.5.1"
-"@abp/lodash@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.0.tgz#fe76d09517f6b1adf18edde94a31e13b003329dc"
- integrity sha512-uitn5uYlb9xShRtV4AFOgp3lu2kADGMD4+a4fy5r4umlPM2uuMo0wMhzyYdBIG64JC5oNaqAzOwZyhhnn+HGJg==
+"@abp/lodash@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.1.tgz#ec261ccaab8a70d5b32a8a7c22387e48936d38d4"
+ integrity sha512-Dav1QKbBeGR4VVbHHe1s3OEzN7wnb9K/vwzHrWmtO8D1Q5Z3433xjNmgL5VQ9gfxXqooSfEO4gAovZklMDHDew==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
lodash "^4.17.15"
-"@abp/luxon@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.0.tgz#d9357e4fb422b6e18ebe897a86a4c4bc6fbe6858"
- integrity sha512-tiE6NiSa4El88SVotxfmmpceINLz8MruaO/e/U3QjJEHjRoqlv0UBrM/x5Xz92c7ZIvL0Y4QvWNISeDg6/oqIQ==
+"@abp/luxon@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.1.tgz#a540750b1605dbac856ce9c2e776c2fecf6392f9"
+ integrity sha512-eRumVB7UIf2XH6OZVUTvcKw0A/OSAfYV59fM+Wc4dAkNcmsNZI0gD1o0AigSGNCxTV6v+W2bFrsuooSqK99Y0Q==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
luxon "^1.24.1"
-"@abp/malihu-custom-scrollbar-plugin@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.0.tgz#972acf26f5eaa4bf9b8991cbe7c19fd0005d94e2"
- integrity sha512-SpUo1CfppKzkE6Rb880pgB7oQ83Mkjsi0o6eE4r4gkF5hfzkuCXOmNjTYKfQIkE4n3G9QQd+8AAN/4xj4DiDrA==
+"@abp/malihu-custom-scrollbar-plugin@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.1.tgz#0a556423a67b6c949e32ffcacd72256dea6c31ee"
+ integrity sha512-YTwYpnQ1ZrON70gvJcnNZRwB3Ze4olGcXxiPvmRgSHbGJkSnHYJiP6PvsN1F3HDFukAJ/iUu+WwEe8OBwlyLXA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/select2@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.0.tgz#8fdf4c5e18f4093ee4e073dab950cf7aa9b2a540"
- integrity sha512-XeXahcDMczdkZdP07yhQriIvbi1N5meeSGTnFyZX+bNTGzUOarPcuNYZ6Mcl3351HcyESHzuJbKbsk3RB1kGeg==
+"@abp/select2@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.1.tgz#8983e7b5c3afb862f08b2730b70e59d726e9b5d5"
+ integrity sha512-WdzY2hvsS/4vz/VXpxq2muSzzE8ggchiIrICy/WKchJxL9L08DM796t6aE6rEl9wucY8XEzzWrPOVqAjJmnXFA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
select2 "^4.0.13"
-"@abp/sweetalert@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.0.tgz#0d93e92e95c6855aef7e19532a7513a078ece216"
- integrity sha512-y3XtZqnUVZuQohpRO1ImyBZXhtrm4H+typIL/9VgcnlvQjBTyIaiwDmU8j07Bb2rKJKe0prVkkVARO7OnjOS5A==
+"@abp/sweetalert@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.1.tgz#0088610915ad6db0a140b77832a37c10066eb4ee"
+ integrity sha512-t4/44oQCMngSjVqmeRWXwrXa/pRKc3CEpyyTiGIXki4dWJ21j0ePCw2l3rvOJWnpoCznhxa/UGxLfRfK1NEzRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
sweetalert "^2.1.2"
-"@abp/timeago@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.0.tgz#509cd8a84cd94c2644824b0c3af10c8fff6de2dc"
- integrity sha512-90jzLYJusYTPwMbak1+XkXE85OPOXPpysRbL28KQwl7WLNBm8wx6IEoVZOHvOrpYscYdyeWhZCgILSJ8DR3a2Q==
+"@abp/timeago@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.1.tgz#8c161645534eb1f62fe4607450acf7345729e711"
+ integrity sha512-PsPobV79U2qzVY+WBsmJM1ohSF4jqcLnL4/7qyJvxlb1WwbCl1F5D4cpiJP4zsM4clPW4mbSsiauMNp+HTNKEA==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
timeago "^1.6.7"
-"@abp/toastr@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.0.tgz#06e28665cb7f6eefee3f69c985dd2b3f86cd7f1d"
- integrity sha512-YL1fahVpDszhwpnRTN87GCP523Mkaw42ApT2A/hZuBdwRzP/u5GwRfng0i/uhdYXCMkTKuHmaHnRyqhGiv7nfQ==
+"@abp/toastr@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.1.tgz#ecb6f6193b7edc3150d0614ab9457472baf1cce3"
+ integrity sha512-bTTz0O8zj7fMhdoummP2Ed5Z8SJTmR6svzNchBXNDrnRAcDQvTihPTcg0UpH8BEDFczbLowq09CG2A/RMSJoug==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
toastr "^2.1.4"
-"@abp/utils@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.0.tgz#6c2b5f5c20821028fe6cdbffb5e2f6088956b9d5"
- integrity sha512-Yj2yCObvS6X/P8rdRMQBo7940k5P/dZhgCUSo9C6P9GNmJY8wNdJFFyhRtaHuAyU5IBBBIY7+mMKOk5eQcbjWQ==
+"@abp/utils@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.1.tgz#9a4cb420266c49d8084776bd31c86681d4d4d125"
+ integrity sha512-nI2ZyaNpvohr75p8jeMPWze+hX+mV47EHI+Zloa4GgGmJqrULdG71kYh45R+jGmMTbQL6huaXGnpz4gNF9TGyQ==
dependencies:
just-compare "^1.3.0"
diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json
index d6909af636..4794011186 100644
--- a/modules/cms-kit/angular/package.json
+++ b/modules/cms-kit/angular/package.json
@@ -16,10 +16,10 @@
"private": true,
"dependencies": {
"@abp/ng.account": "~3.3.2",
- "@abp/ng.identity": "~4.0.0",
- "@abp/ng.setting-management": "~4.0.0",
- "@abp/ng.tenant-management": "~4.0.0",
- "@abp/ng.theme.basic": "~4.0.0",
+ "@abp/ng.identity": "~4.0.1",
+ "@abp/ng.setting-management": "~4.0.1",
+ "@abp/ng.tenant-management": "~4.0.1",
+ "@abp/ng.theme.basic": "~4.0.1",
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json
index 2fe27fc5f4..1f4bdfd77f 100644
--- a/modules/cms-kit/angular/projects/cms-kit/package.json
+++ b/modules/cms-kit/angular/projects/cms-kit/package.json
@@ -4,8 +4,8 @@
"peerDependencies": {
"@angular/common": "^9.1.11",
"@angular/core": "^9.1.11",
- "@abp/ng.core": ">=4.0.0",
- "@abp/ng.theme.shared": ">=4.0.0"
+ "@abp/ng.core": ">=4.0.1",
+ "@abp/ng.theme.shared": ">=4.0.1"
},
"dependencies": {
"tslib": "^2.0.0"
diff --git a/modules/cms-kit/common.props b/modules/cms-kit/common.props
deleted file mode 100644
index 420d9c492c..0000000000
--- a/modules/cms-kit/common.props
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- latest
- 0.1.0
- $(NoWarn);CS1591;CS0436
- module
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj b/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj
index c6a4484865..aca54af174 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj
+++ b/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj
@@ -1,7 +1,5 @@
-
-
netstandard2.0Volo.CmsKit
diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj
index d019896648..688c47bc87 100644
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj
@@ -1,7 +1,5 @@
-
-
net5.0Volo.CmsKit
@@ -10,9 +8,9 @@
-
+
-
+
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj
index fb149e574f..d70327c249 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj
@@ -8,9 +8,9 @@
-
+
-
+
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
index ea7cc2f166..5e131b4756 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
@@ -3,6 +3,6 @@
"name": "my-app-identityserver",
"private": true,
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.1"
}
}
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
index 3b9cfcf521..12469bed18 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
# yarn lockfile v1
-"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.0.tgz#b1822cf5bbc0f6eeb414ebd0877f6d1115a81fe7"
- integrity sha512-yYXQkEnNhftzm+ZI8d3VFMlV5UuLNTMQQwV2eZ8tJfstUQrKV9bVd3+NdDOr3AkvcD8D7mvMFeBuoMYteL5kLQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.1.tgz#ce8e3eb830a8e8f9eecb1a3b3bd70c2832fdf15e"
+ integrity sha512-w+ZG8Ewx9wWfbvRC2MAjJl+rXuXSHLhhGOiJTk68unWLNziDtNQzcSXG/Z5c1hA+acJSGqDoJGEGs4FVM136og==
dependencies:
- "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.1"
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.0.tgz#ba896056e9df5ac58e108df96996fbb2ca7a1a15"
- integrity sha512-3RNn6VrNA+cqnPBoSbiCazN05cC2rhcRFMMxkEte+LImGbGOsxc4MflzHg5On1ExCGdqko8Axbw/ydy44Ak4Hw==
- dependencies:
- "@abp/aspnetcore.mvc.ui" "~4.0.0"
- "@abp/bootstrap" "~4.0.0"
- "@abp/bootstrap-datepicker" "~4.0.0"
- "@abp/datatables.net-bs4" "~4.0.0"
- "@abp/font-awesome" "~4.0.0"
- "@abp/jquery-form" "~4.0.0"
- "@abp/jquery-validation-unobtrusive" "~4.0.0"
- "@abp/lodash" "~4.0.0"
- "@abp/luxon" "~4.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~4.0.0"
- "@abp/select2" "~4.0.0"
- "@abp/sweetalert" "~4.0.0"
- "@abp/timeago" "~4.0.0"
- "@abp/toastr" "~4.0.0"
-
-"@abp/aspnetcore.mvc.ui@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.0.tgz#68502177a05f6ce7191a09b06a18c5b5dfab425d"
- integrity sha512-tYHUWMwnwInrGSzC/OdN6bH/VHZEz5DP3rx2U6fcb0I5GvvRdQZxVgUvmWn6DeMA3PG10Gra4SfkhZqRQq9rjQ==
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.1.tgz#cd9d0eb11309c597dffd26277cd1bd7c5b1e0e2f"
+ integrity sha512-QGoCN/my0eAfa4tx5ytDxArIoz2i58jFFVUGso1Lekn54JvSt+WLz2p3uyTGatZ03Bp9836elhFnIopn12WvBw==
+ dependencies:
+ "@abp/aspnetcore.mvc.ui" "~4.0.1"
+ "@abp/bootstrap" "~4.0.1"
+ "@abp/bootstrap-datepicker" "~4.0.1"
+ "@abp/datatables.net-bs4" "~4.0.1"
+ "@abp/font-awesome" "~4.0.1"
+ "@abp/jquery-form" "~4.0.1"
+ "@abp/jquery-validation-unobtrusive" "~4.0.1"
+ "@abp/lodash" "~4.0.1"
+ "@abp/luxon" "~4.0.1"
+ "@abp/malihu-custom-scrollbar-plugin" "~4.0.1"
+ "@abp/select2" "~4.0.1"
+ "@abp/sweetalert" "~4.0.1"
+ "@abp/timeago" "~4.0.1"
+ "@abp/toastr" "~4.0.1"
+
+"@abp/aspnetcore.mvc.ui@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.1.tgz#6490c147a56e4f7055d2ca77f20baf1f60f56867"
+ integrity sha512-4B3icJrlpuZgMaX52ninyaenH7zLwepePEscDrLaFY9wyonKpZ2zh+xplnyM6vjNd+PhErWuA2+ssCswFhrJ3A==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@@ -43,145 +43,145 @@
micromatch "^4.0.2"
path "^0.12.7"
-"@abp/bootstrap-datepicker@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.0.tgz#cdbd2c388c6d7ce8c6d72443038975063e6c6d02"
- integrity sha512-hauH8VhpC8cxv1wCR6bVBcNqZepftdBXxEVID7TSAqgNyWjm/CrJqWLI+A0nnkG3IHoIm9D22iF47BamuYHptw==
+"@abp/bootstrap-datepicker@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.1.tgz#aad891263edff66f816e003ba4fa7f8acfe8e0b6"
+ integrity sha512-S0oaVZmXsDcOJLAyoGY0TvP/7bZx0GHIbU9BIhIL2Wl74HYaokjkTr6/IleIek9YeiF2vm9FkrUP1dKH/4f7Gg==
dependencies:
bootstrap-datepicker "^1.9.0"
-"@abp/bootstrap@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.0.tgz#04174f18055f76f936e6fb73e5ff71ffa08a8528"
- integrity sha512-Tmr0yoSWg7XHl02X5wv04CvYcL8KCpX8u6YGJj31jRZxUTeCvs5ETXlepOWcdxPQqi/4olXv5B9GEz5S9l5nZA==
+"@abp/bootstrap@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.1.tgz#3e41bdf9b3e9f8c497b9fafe22a4851d0401b31b"
+ integrity sha512-GoSaNWvswRHVoUrq7xClFQYtwqIlyS/vp/TdY+j5FFZP7ud89+ZGpdNqYqq5l9/6aaYa7v4b9mNTZ/1JRzAOYg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
bootstrap "^4.5.0"
bootstrap-v4-rtl "4.4.1-2"
-"@abp/core@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.0.tgz#65e76c697e62162717e0edabf7edacc4228e682a"
- integrity sha512-xcTTBFjLFZ9Trv2x9Y/c3XKezIx+x3MTXUD98QJPf1aR7T43TE/tLHRxdRfW3R8ka0O1wmlYshpkaw5pYNsj5w==
+"@abp/core@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.1.tgz#1df32bc058f45571605670ca81c226a1bd87400c"
+ integrity sha512-8UT5lwqV/luVG/SxePSTD2FRbZXwXv3cZJKjw+gpBjhD0slWrh51XEOHsM8ciTuhcvV/tsqVU9nXckDMdO58fw==
dependencies:
- "@abp/utils" "^4.0.0"
+ "@abp/utils" "^4.0.1"
-"@abp/datatables.net-bs4@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.0.tgz#fe737e054f6ba35e787a1cda185af2788ef86d39"
- integrity sha512-mz7xZdzX1nlFyX7vNzB5w3RkqZ0IHrPgsXGOB7OCTKMRshDFVH2O51Oy4qoLDOXoTVeahHtR9v8thEWFR1SnZg==
+"@abp/datatables.net-bs4@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.1.tgz#7538baad0eff24eca7f4246d020852f83139f645"
+ integrity sha512-S52jNPF4if68V+P/33NrtGPJXf6xrqgyZzz9b7qBR7HuUm3Nsn7bAslh3JNduNec/sFuE4Utl/xsFHZNjBWEog==
dependencies:
- "@abp/datatables.net" "~4.0.0"
+ "@abp/datatables.net" "~4.0.1"
datatables.net-bs4 "^1.10.21"
-"@abp/datatables.net@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.0.tgz#88ae5f1a6068fba55927e59f113686508e9553cb"
- integrity sha512-JYTfMA1zlBNGiQHAiZiTj5ka6B6vq5k2jqsoLHup4pD9jpKwKRBGtltVsWoEnetd9eEbp4SaV/FCuh3RzmV6Pw==
+"@abp/datatables.net@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.1.tgz#eb89716a37351c41b5bccfc2db88fc7ceb991a26"
+ integrity sha512-APFLui0w8MqsBWqP/K0QkT5cBq5SsWiqMaIGTXQKinMVLV597sUszrlhe1ISU2PqeD7iX6pCZNNOTI1NEUn9/Q==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
datatables.net "^1.10.21"
-"@abp/font-awesome@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.0.tgz#6e1e4bd1175a0b8d3b095e215c07e66ad0e42e19"
- integrity sha512-kHfZ45UMDWSRk1gTV/BwVfSoXksJ9UlnD3SelTGeAkvbDqtDllqlp9y6c3qQcmZUE348Xl4hDTkU8upZwswCFQ==
+"@abp/font-awesome@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.1.tgz#8a9d83b2c2adfcd5abcbd9c31c315460d44a321e"
+ integrity sha512-+6+m/DKMnfkeQiWUsMlB6Da8u6yREyN2oQYGYhSRAK8419ym8RHHrqKJv2AClI4iLq2ppHZj8WF84+SeoCekRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
"@fortawesome/fontawesome-free" "^5.13.0"
-"@abp/jquery-form@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.0.tgz#3afb41eb16d62e32c31a29c6a866f634a5a20cd8"
- integrity sha512-cQq8PgzHfpK9/LxmjlnMsDn85wWvEOqjyLaepHFpTTt0341auSgXNwhp7rk71AUHD1lP3c9ALctmqu+gYmh9ag==
+"@abp/jquery-form@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.1.tgz#6dc1922b2800dd635f20881a82e08104a1dd1bb5"
+ integrity sha512-JMBZYu/MI/GjaLTBOMB5iv8cagnLpReDULNC3r6tLNNqB1R8f3Cg1T7nF4YCuU9SYMqis1P/AuE4oEh+4rQdAQ==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#c3674d2b01b3c524de4c3fac1c6ae3657857ee7b"
- integrity sha512-OGibIdw0ogjp6VQIebHM7OtMT36pjLKRrOHyCVpTmQ7NzDODV5ptG83vOnt5nFG0y9XFrOt8cnHrrd+K1Bpo/Q==
+"@abp/jquery-validation-unobtrusive@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.1.tgz#4142ca31c0830fe24a1467e8cf13b55ba9d7c1dd"
+ integrity sha512-rdSRTcdKCHmarbrVgmPYdTiJ0G/aFKd+dr0krO7fALPTuQKChbDnHOO4/JvQSc+cd9faxa8c6ZWvlHdsof23tQ==
dependencies:
- "@abp/jquery-validation" "~4.0.0"
+ "@abp/jquery-validation" "~4.0.1"
jquery-validation-unobtrusive "^3.2.11"
-"@abp/jquery-validation@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.0.tgz#0a101937f89ff398317142b5271fa9a1de6571c2"
- integrity sha512-4nzvhAktEINpQ2H+Hy7TOxxojTmTEm5dBTbHs1vbCWUuF0OTpouZWbMZDESdP0ZbjXcQ+vhwuM4e/pm/PeaHyQ==
+"@abp/jquery-validation@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.1.tgz#74e7d795468c6986f2db15662631fcd4f67c679e"
+ integrity sha512-FX26aQCsMBdVWAJb7S37Lt7KoHAEHoYguh/qfZIARCpOYOOWvxfDz1wTrmADUkqdillqEiCeD/Imj8bYH9Faaw==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-validation "^1.19.2"
-"@abp/jquery@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.0.tgz#00d24678b573bcc2fb14d8337ccdbf697b59d43b"
- integrity sha512-gXLK97IvAZriNlG8e0qJcd7MvnpshJQURb4lg8VYibD7Fs/OBeHSAWM2Adgi3H9DnQL8XEUlWf487FSz4RC/Yg==
+"@abp/jquery@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.1.tgz#aa554accb16600fd586c3a4f088040cd26d0bde8"
+ integrity sha512-MtiRKOLyjEWux+whPP3+zwPbpj8or756JtgjnwOTDB9tp9HLCYUaskt+oalYPvob24nDZcNu2RnMALYdCVhZAQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
jquery "~3.5.1"
-"@abp/lodash@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.0.tgz#fe76d09517f6b1adf18edde94a31e13b003329dc"
- integrity sha512-uitn5uYlb9xShRtV4AFOgp3lu2kADGMD4+a4fy5r4umlPM2uuMo0wMhzyYdBIG64JC5oNaqAzOwZyhhnn+HGJg==
+"@abp/lodash@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.1.tgz#ec261ccaab8a70d5b32a8a7c22387e48936d38d4"
+ integrity sha512-Dav1QKbBeGR4VVbHHe1s3OEzN7wnb9K/vwzHrWmtO8D1Q5Z3433xjNmgL5VQ9gfxXqooSfEO4gAovZklMDHDew==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
lodash "^4.17.15"
-"@abp/luxon@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.0.tgz#d9357e4fb422b6e18ebe897a86a4c4bc6fbe6858"
- integrity sha512-tiE6NiSa4El88SVotxfmmpceINLz8MruaO/e/U3QjJEHjRoqlv0UBrM/x5Xz92c7ZIvL0Y4QvWNISeDg6/oqIQ==
+"@abp/luxon@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.1.tgz#a540750b1605dbac856ce9c2e776c2fecf6392f9"
+ integrity sha512-eRumVB7UIf2XH6OZVUTvcKw0A/OSAfYV59fM+Wc4dAkNcmsNZI0gD1o0AigSGNCxTV6v+W2bFrsuooSqK99Y0Q==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
luxon "^1.24.1"
-"@abp/malihu-custom-scrollbar-plugin@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.0.tgz#972acf26f5eaa4bf9b8991cbe7c19fd0005d94e2"
- integrity sha512-SpUo1CfppKzkE6Rb880pgB7oQ83Mkjsi0o6eE4r4gkF5hfzkuCXOmNjTYKfQIkE4n3G9QQd+8AAN/4xj4DiDrA==
+"@abp/malihu-custom-scrollbar-plugin@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.1.tgz#0a556423a67b6c949e32ffcacd72256dea6c31ee"
+ integrity sha512-YTwYpnQ1ZrON70gvJcnNZRwB3Ze4olGcXxiPvmRgSHbGJkSnHYJiP6PvsN1F3HDFukAJ/iUu+WwEe8OBwlyLXA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/select2@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.0.tgz#8fdf4c5e18f4093ee4e073dab950cf7aa9b2a540"
- integrity sha512-XeXahcDMczdkZdP07yhQriIvbi1N5meeSGTnFyZX+bNTGzUOarPcuNYZ6Mcl3351HcyESHzuJbKbsk3RB1kGeg==
+"@abp/select2@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.1.tgz#8983e7b5c3afb862f08b2730b70e59d726e9b5d5"
+ integrity sha512-WdzY2hvsS/4vz/VXpxq2muSzzE8ggchiIrICy/WKchJxL9L08DM796t6aE6rEl9wucY8XEzzWrPOVqAjJmnXFA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
select2 "^4.0.13"
-"@abp/sweetalert@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.0.tgz#0d93e92e95c6855aef7e19532a7513a078ece216"
- integrity sha512-y3XtZqnUVZuQohpRO1ImyBZXhtrm4H+typIL/9VgcnlvQjBTyIaiwDmU8j07Bb2rKJKe0prVkkVARO7OnjOS5A==
+"@abp/sweetalert@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.1.tgz#0088610915ad6db0a140b77832a37c10066eb4ee"
+ integrity sha512-t4/44oQCMngSjVqmeRWXwrXa/pRKc3CEpyyTiGIXki4dWJ21j0ePCw2l3rvOJWnpoCznhxa/UGxLfRfK1NEzRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
sweetalert "^2.1.2"
-"@abp/timeago@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.0.tgz#509cd8a84cd94c2644824b0c3af10c8fff6de2dc"
- integrity sha512-90jzLYJusYTPwMbak1+XkXE85OPOXPpysRbL28KQwl7WLNBm8wx6IEoVZOHvOrpYscYdyeWhZCgILSJ8DR3a2Q==
+"@abp/timeago@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.1.tgz#8c161645534eb1f62fe4607450acf7345729e711"
+ integrity sha512-PsPobV79U2qzVY+WBsmJM1ohSF4jqcLnL4/7qyJvxlb1WwbCl1F5D4cpiJP4zsM4clPW4mbSsiauMNp+HTNKEA==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
timeago "^1.6.7"
-"@abp/toastr@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.0.tgz#06e28665cb7f6eefee3f69c985dd2b3f86cd7f1d"
- integrity sha512-YL1fahVpDszhwpnRTN87GCP523Mkaw42ApT2A/hZuBdwRzP/u5GwRfng0i/uhdYXCMkTKuHmaHnRyqhGiv7nfQ==
+"@abp/toastr@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.1.tgz#ecb6f6193b7edc3150d0614ab9457472baf1cce3"
+ integrity sha512-bTTz0O8zj7fMhdoummP2Ed5Z8SJTmR6svzNchBXNDrnRAcDQvTihPTcg0UpH8BEDFczbLowq09CG2A/RMSJoug==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
toastr "^2.1.4"
-"@abp/utils@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.0.tgz#6c2b5f5c20821028fe6cdbffb5e2f6088956b9d5"
- integrity sha512-Yj2yCObvS6X/P8rdRMQBo7940k5P/dZhgCUSo9C6P9GNmJY8wNdJFFyhRtaHuAyU5IBBBIY7+mMKOk5eQcbjWQ==
+"@abp/utils@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.1.tgz#9a4cb420266c49d8084776bd31c86681d4d4d125"
+ integrity sha512-nI2ZyaNpvohr75p8jeMPWze+hX+mV47EHI+Zloa4GgGmJqrULdG71kYh45R+jGmMTbQL6huaXGnpz4gNF9TGyQ==
dependencies:
just-compare "^1.3.0"
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj
index 23a4b9fae3..266590c86b 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj
@@ -1,7 +1,5 @@
-
-
net5.0Volo.CmsKit
@@ -10,9 +8,9 @@
-
+
-
+
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
index 78834de93d..1171b7f8a6 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
@@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.basic": "^4.0.1"
}
}
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
index 57bbbf2ce0..b5cd1b1d1c 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
# yarn lockfile v1
-"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.0.tgz#b1822cf5bbc0f6eeb414ebd0877f6d1115a81fe7"
- integrity sha512-yYXQkEnNhftzm+ZI8d3VFMlV5UuLNTMQQwV2eZ8tJfstUQrKV9bVd3+NdDOr3AkvcD8D7mvMFeBuoMYteL5kLQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.0.1.tgz#ce8e3eb830a8e8f9eecb1a3b3bd70c2832fdf15e"
+ integrity sha512-w+ZG8Ewx9wWfbvRC2MAjJl+rXuXSHLhhGOiJTk68unWLNziDtNQzcSXG/Z5c1hA+acJSGqDoJGEGs4FVM136og==
dependencies:
- "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.1"
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.0.tgz#ba896056e9df5ac58e108df96996fbb2ca7a1a15"
- integrity sha512-3RNn6VrNA+cqnPBoSbiCazN05cC2rhcRFMMxkEte+LImGbGOsxc4MflzHg5On1ExCGdqko8Axbw/ydy44Ak4Hw==
- dependencies:
- "@abp/aspnetcore.mvc.ui" "~4.0.0"
- "@abp/bootstrap" "~4.0.0"
- "@abp/bootstrap-datepicker" "~4.0.0"
- "@abp/datatables.net-bs4" "~4.0.0"
- "@abp/font-awesome" "~4.0.0"
- "@abp/jquery-form" "~4.0.0"
- "@abp/jquery-validation-unobtrusive" "~4.0.0"
- "@abp/lodash" "~4.0.0"
- "@abp/luxon" "~4.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~4.0.0"
- "@abp/select2" "~4.0.0"
- "@abp/sweetalert" "~4.0.0"
- "@abp/timeago" "~4.0.0"
- "@abp/toastr" "~4.0.0"
-
-"@abp/aspnetcore.mvc.ui@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.0.tgz#68502177a05f6ce7191a09b06a18c5b5dfab425d"
- integrity sha512-tYHUWMwnwInrGSzC/OdN6bH/VHZEz5DP3rx2U6fcb0I5GvvRdQZxVgUvmWn6DeMA3PG10Gra4SfkhZqRQq9rjQ==
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.0.1.tgz#cd9d0eb11309c597dffd26277cd1bd7c5b1e0e2f"
+ integrity sha512-QGoCN/my0eAfa4tx5ytDxArIoz2i58jFFVUGso1Lekn54JvSt+WLz2p3uyTGatZ03Bp9836elhFnIopn12WvBw==
+ dependencies:
+ "@abp/aspnetcore.mvc.ui" "~4.0.1"
+ "@abp/bootstrap" "~4.0.1"
+ "@abp/bootstrap-datepicker" "~4.0.1"
+ "@abp/datatables.net-bs4" "~4.0.1"
+ "@abp/font-awesome" "~4.0.1"
+ "@abp/jquery-form" "~4.0.1"
+ "@abp/jquery-validation-unobtrusive" "~4.0.1"
+ "@abp/lodash" "~4.0.1"
+ "@abp/luxon" "~4.0.1"
+ "@abp/malihu-custom-scrollbar-plugin" "~4.0.1"
+ "@abp/select2" "~4.0.1"
+ "@abp/sweetalert" "~4.0.1"
+ "@abp/timeago" "~4.0.1"
+ "@abp/toastr" "~4.0.1"
+
+"@abp/aspnetcore.mvc.ui@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.0.1.tgz#6490c147a56e4f7055d2ca77f20baf1f60f56867"
+ integrity sha512-4B3icJrlpuZgMaX52ninyaenH7zLwepePEscDrLaFY9wyonKpZ2zh+xplnyM6vjNd+PhErWuA2+ssCswFhrJ3A==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@@ -43,145 +43,145 @@
micromatch "^4.0.2"
path "^0.12.7"
-"@abp/bootstrap-datepicker@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.0.tgz#cdbd2c388c6d7ce8c6d72443038975063e6c6d02"
- integrity sha512-hauH8VhpC8cxv1wCR6bVBcNqZepftdBXxEVID7TSAqgNyWjm/CrJqWLI+A0nnkG3IHoIm9D22iF47BamuYHptw==
+"@abp/bootstrap-datepicker@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.0.1.tgz#aad891263edff66f816e003ba4fa7f8acfe8e0b6"
+ integrity sha512-S0oaVZmXsDcOJLAyoGY0TvP/7bZx0GHIbU9BIhIL2Wl74HYaokjkTr6/IleIek9YeiF2vm9FkrUP1dKH/4f7Gg==
dependencies:
bootstrap-datepicker "^1.9.0"
-"@abp/bootstrap@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.0.tgz#04174f18055f76f936e6fb73e5ff71ffa08a8528"
- integrity sha512-Tmr0yoSWg7XHl02X5wv04CvYcL8KCpX8u6YGJj31jRZxUTeCvs5ETXlepOWcdxPQqi/4olXv5B9GEz5S9l5nZA==
+"@abp/bootstrap@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.0.1.tgz#3e41bdf9b3e9f8c497b9fafe22a4851d0401b31b"
+ integrity sha512-GoSaNWvswRHVoUrq7xClFQYtwqIlyS/vp/TdY+j5FFZP7ud89+ZGpdNqYqq5l9/6aaYa7v4b9mNTZ/1JRzAOYg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
bootstrap "^4.5.0"
bootstrap-v4-rtl "4.4.1-2"
-"@abp/core@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.0.tgz#65e76c697e62162717e0edabf7edacc4228e682a"
- integrity sha512-xcTTBFjLFZ9Trv2x9Y/c3XKezIx+x3MTXUD98QJPf1aR7T43TE/tLHRxdRfW3R8ka0O1wmlYshpkaw5pYNsj5w==
+"@abp/core@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.0.1.tgz#1df32bc058f45571605670ca81c226a1bd87400c"
+ integrity sha512-8UT5lwqV/luVG/SxePSTD2FRbZXwXv3cZJKjw+gpBjhD0slWrh51XEOHsM8ciTuhcvV/tsqVU9nXckDMdO58fw==
dependencies:
- "@abp/utils" "^4.0.0"
+ "@abp/utils" "^4.0.1"
-"@abp/datatables.net-bs4@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.0.tgz#fe737e054f6ba35e787a1cda185af2788ef86d39"
- integrity sha512-mz7xZdzX1nlFyX7vNzB5w3RkqZ0IHrPgsXGOB7OCTKMRshDFVH2O51Oy4qoLDOXoTVeahHtR9v8thEWFR1SnZg==
+"@abp/datatables.net-bs4@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.0.1.tgz#7538baad0eff24eca7f4246d020852f83139f645"
+ integrity sha512-S52jNPF4if68V+P/33NrtGPJXf6xrqgyZzz9b7qBR7HuUm3Nsn7bAslh3JNduNec/sFuE4Utl/xsFHZNjBWEog==
dependencies:
- "@abp/datatables.net" "~4.0.0"
+ "@abp/datatables.net" "~4.0.1"
datatables.net-bs4 "^1.10.21"
-"@abp/datatables.net@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.0.tgz#88ae5f1a6068fba55927e59f113686508e9553cb"
- integrity sha512-JYTfMA1zlBNGiQHAiZiTj5ka6B6vq5k2jqsoLHup4pD9jpKwKRBGtltVsWoEnetd9eEbp4SaV/FCuh3RzmV6Pw==
+"@abp/datatables.net@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.0.1.tgz#eb89716a37351c41b5bccfc2db88fc7ceb991a26"
+ integrity sha512-APFLui0w8MqsBWqP/K0QkT5cBq5SsWiqMaIGTXQKinMVLV597sUszrlhe1ISU2PqeD7iX6pCZNNOTI1NEUn9/Q==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
datatables.net "^1.10.21"
-"@abp/font-awesome@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.0.tgz#6e1e4bd1175a0b8d3b095e215c07e66ad0e42e19"
- integrity sha512-kHfZ45UMDWSRk1gTV/BwVfSoXksJ9UlnD3SelTGeAkvbDqtDllqlp9y6c3qQcmZUE348Xl4hDTkU8upZwswCFQ==
+"@abp/font-awesome@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.0.1.tgz#8a9d83b2c2adfcd5abcbd9c31c315460d44a321e"
+ integrity sha512-+6+m/DKMnfkeQiWUsMlB6Da8u6yREyN2oQYGYhSRAK8419ym8RHHrqKJv2AClI4iLq2ppHZj8WF84+SeoCekRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
"@fortawesome/fontawesome-free" "^5.13.0"
-"@abp/jquery-form@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.0.tgz#3afb41eb16d62e32c31a29c6a866f634a5a20cd8"
- integrity sha512-cQq8PgzHfpK9/LxmjlnMsDn85wWvEOqjyLaepHFpTTt0341auSgXNwhp7rk71AUHD1lP3c9ALctmqu+gYmh9ag==
+"@abp/jquery-form@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.0.1.tgz#6dc1922b2800dd635f20881a82e08104a1dd1bb5"
+ integrity sha512-JMBZYu/MI/GjaLTBOMB5iv8cagnLpReDULNC3r6tLNNqB1R8f3Cg1T7nF4YCuU9SYMqis1P/AuE4oEh+4rQdAQ==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#c3674d2b01b3c524de4c3fac1c6ae3657857ee7b"
- integrity sha512-OGibIdw0ogjp6VQIebHM7OtMT36pjLKRrOHyCVpTmQ7NzDODV5ptG83vOnt5nFG0y9XFrOt8cnHrrd+K1Bpo/Q==
+"@abp/jquery-validation-unobtrusive@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.1.tgz#4142ca31c0830fe24a1467e8cf13b55ba9d7c1dd"
+ integrity sha512-rdSRTcdKCHmarbrVgmPYdTiJ0G/aFKd+dr0krO7fALPTuQKChbDnHOO4/JvQSc+cd9faxa8c6ZWvlHdsof23tQ==
dependencies:
- "@abp/jquery-validation" "~4.0.0"
+ "@abp/jquery-validation" "~4.0.1"
jquery-validation-unobtrusive "^3.2.11"
-"@abp/jquery-validation@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.0.tgz#0a101937f89ff398317142b5271fa9a1de6571c2"
- integrity sha512-4nzvhAktEINpQ2H+Hy7TOxxojTmTEm5dBTbHs1vbCWUuF0OTpouZWbMZDESdP0ZbjXcQ+vhwuM4e/pm/PeaHyQ==
+"@abp/jquery-validation@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.0.1.tgz#74e7d795468c6986f2db15662631fcd4f67c679e"
+ integrity sha512-FX26aQCsMBdVWAJb7S37Lt7KoHAEHoYguh/qfZIARCpOYOOWvxfDz1wTrmADUkqdillqEiCeD/Imj8bYH9Faaw==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
jquery-validation "^1.19.2"
-"@abp/jquery@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.0.tgz#00d24678b573bcc2fb14d8337ccdbf697b59d43b"
- integrity sha512-gXLK97IvAZriNlG8e0qJcd7MvnpshJQURb4lg8VYibD7Fs/OBeHSAWM2Adgi3H9DnQL8XEUlWf487FSz4RC/Yg==
+"@abp/jquery@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.0.1.tgz#aa554accb16600fd586c3a4f088040cd26d0bde8"
+ integrity sha512-MtiRKOLyjEWux+whPP3+zwPbpj8or756JtgjnwOTDB9tp9HLCYUaskt+oalYPvob24nDZcNu2RnMALYdCVhZAQ==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
jquery "~3.5.1"
-"@abp/lodash@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.0.tgz#fe76d09517f6b1adf18edde94a31e13b003329dc"
- integrity sha512-uitn5uYlb9xShRtV4AFOgp3lu2kADGMD4+a4fy5r4umlPM2uuMo0wMhzyYdBIG64JC5oNaqAzOwZyhhnn+HGJg==
+"@abp/lodash@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.0.1.tgz#ec261ccaab8a70d5b32a8a7c22387e48936d38d4"
+ integrity sha512-Dav1QKbBeGR4VVbHHe1s3OEzN7wnb9K/vwzHrWmtO8D1Q5Z3433xjNmgL5VQ9gfxXqooSfEO4gAovZklMDHDew==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
lodash "^4.17.15"
-"@abp/luxon@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.0.tgz#d9357e4fb422b6e18ebe897a86a4c4bc6fbe6858"
- integrity sha512-tiE6NiSa4El88SVotxfmmpceINLz8MruaO/e/U3QjJEHjRoqlv0UBrM/x5Xz92c7ZIvL0Y4QvWNISeDg6/oqIQ==
+"@abp/luxon@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.0.1.tgz#a540750b1605dbac856ce9c2e776c2fecf6392f9"
+ integrity sha512-eRumVB7UIf2XH6OZVUTvcKw0A/OSAfYV59fM+Wc4dAkNcmsNZI0gD1o0AigSGNCxTV6v+W2bFrsuooSqK99Y0Q==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
luxon "^1.24.1"
-"@abp/malihu-custom-scrollbar-plugin@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.0.tgz#972acf26f5eaa4bf9b8991cbe7c19fd0005d94e2"
- integrity sha512-SpUo1CfppKzkE6Rb880pgB7oQ83Mkjsi0o6eE4r4gkF5hfzkuCXOmNjTYKfQIkE4n3G9QQd+8AAN/4xj4DiDrA==
+"@abp/malihu-custom-scrollbar-plugin@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.0.1.tgz#0a556423a67b6c949e32ffcacd72256dea6c31ee"
+ integrity sha512-YTwYpnQ1ZrON70gvJcnNZRwB3Ze4olGcXxiPvmRgSHbGJkSnHYJiP6PvsN1F3HDFukAJ/iUu+WwEe8OBwlyLXA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/select2@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.0.tgz#8fdf4c5e18f4093ee4e073dab950cf7aa9b2a540"
- integrity sha512-XeXahcDMczdkZdP07yhQriIvbi1N5meeSGTnFyZX+bNTGzUOarPcuNYZ6Mcl3351HcyESHzuJbKbsk3RB1kGeg==
+"@abp/select2@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.0.1.tgz#8983e7b5c3afb862f08b2730b70e59d726e9b5d5"
+ integrity sha512-WdzY2hvsS/4vz/VXpxq2muSzzE8ggchiIrICy/WKchJxL9L08DM796t6aE6rEl9wucY8XEzzWrPOVqAjJmnXFA==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
select2 "^4.0.13"
-"@abp/sweetalert@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.0.tgz#0d93e92e95c6855aef7e19532a7513a078ece216"
- integrity sha512-y3XtZqnUVZuQohpRO1ImyBZXhtrm4H+typIL/9VgcnlvQjBTyIaiwDmU8j07Bb2rKJKe0prVkkVARO7OnjOS5A==
+"@abp/sweetalert@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.0.1.tgz#0088610915ad6db0a140b77832a37c10066eb4ee"
+ integrity sha512-t4/44oQCMngSjVqmeRWXwrXa/pRKc3CEpyyTiGIXki4dWJ21j0ePCw2l3rvOJWnpoCznhxa/UGxLfRfK1NEzRg==
dependencies:
- "@abp/core" "~4.0.0"
+ "@abp/core" "~4.0.1"
sweetalert "^2.1.2"
-"@abp/timeago@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.0.tgz#509cd8a84cd94c2644824b0c3af10c8fff6de2dc"
- integrity sha512-90jzLYJusYTPwMbak1+XkXE85OPOXPpysRbL28KQwl7WLNBm8wx6IEoVZOHvOrpYscYdyeWhZCgILSJ8DR3a2Q==
+"@abp/timeago@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.0.1.tgz#8c161645534eb1f62fe4607450acf7345729e711"
+ integrity sha512-PsPobV79U2qzVY+WBsmJM1ohSF4jqcLnL4/7qyJvxlb1WwbCl1F5D4cpiJP4zsM4clPW4mbSsiauMNp+HTNKEA==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
timeago "^1.6.7"
-"@abp/toastr@~4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.0.tgz#06e28665cb7f6eefee3f69c985dd2b3f86cd7f1d"
- integrity sha512-YL1fahVpDszhwpnRTN87GCP523Mkaw42ApT2A/hZuBdwRzP/u5GwRfng0i/uhdYXCMkTKuHmaHnRyqhGiv7nfQ==
+"@abp/toastr@~4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.0.1.tgz#ecb6f6193b7edc3150d0614ab9457472baf1cce3"
+ integrity sha512-bTTz0O8zj7fMhdoummP2Ed5Z8SJTmR6svzNchBXNDrnRAcDQvTihPTcg0UpH8BEDFczbLowq09CG2A/RMSJoug==
dependencies:
- "@abp/jquery" "~4.0.0"
+ "@abp/jquery" "~4.0.1"
toastr "^2.1.4"
-"@abp/utils@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.0.tgz#6c2b5f5c20821028fe6cdbffb5e2f6088956b9d5"
- integrity sha512-Yj2yCObvS6X/P8rdRMQBo7940k5P/dZhgCUSo9C6P9GNmJY8wNdJFFyhRtaHuAyU5IBBBIY7+mMKOk5eQcbjWQ==
+"@abp/utils@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.0.1.tgz#9a4cb420266c49d8084776bd31c86681d4d4d125"
+ integrity sha512-nI2ZyaNpvohr75p8jeMPWze+hX+mV47EHI+Zloa4GgGmJqrULdG71kYh45R+jGmMTbQL6huaXGnpz4gNF9TGyQ==
dependencies:
just-compare "^1.3.0"
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
index 483d54d9d5..2055266d20 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
@@ -18,6 +18,7 @@ using Volo.Abp.Autofac;
using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.SqlServer;
+using Volo.Abp.FeatureManagement.EntityFrameworkCore;
using Volo.Abp.FeatureManagement;
using Volo.Abp.Identity;
using Volo.Abp.Identity.EntityFrameworkCore;
@@ -56,6 +57,8 @@ namespace Volo.CmsKit
typeof(AbpIdentityEntityFrameworkCoreModule),
typeof(AbpPermissionManagementDomainIdentityModule),
typeof(AbpFeatureManagementApplicationModule),
+ typeof(AbpFeatureManagementEntityFrameworkCoreModule),
+ typeof(AbpFeatureManagementWebModule),
typeof(AbpTenantManagementWebModule),
typeof(AbpTenantManagementApplicationModule),
typeof(AbpTenantManagementEntityFrameworkCoreModule),
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs
index 5eade47bd7..d1b31e0ae7 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs
@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.FeatureManagement.EntityFrameworkCore;
using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
@@ -25,6 +26,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
modelBuilder.ConfigureAuditLogging();
modelBuilder.ConfigureIdentity();
modelBuilder.ConfigureTenantManagement();
+ modelBuilder.ConfigureFeatureManagement();
modelBuilder.ConfigureCmsKit();
}
}
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20201013061938_Initial.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20201013061938_Initial.cs
deleted file mode 100644
index 73df34b298..0000000000
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20201013061938_Initial.cs
+++ /dev/null
@@ -1,749 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Volo.CmsKit.Migrations
-{
- public partial class Initial : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "AbpAuditLogs",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- ExtraProperties = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(maxLength: 40, nullable: true),
- ApplicationName = table.Column(maxLength: 96, nullable: true),
- UserId = table.Column(nullable: true),
- UserName = table.Column(maxLength: 256, nullable: true),
- TenantId = table.Column(nullable: true),
- TenantName = table.Column(nullable: true),
- ImpersonatorUserId = table.Column(nullable: true),
- ImpersonatorTenantId = table.Column(nullable: true),
- ExecutionTime = table.Column(nullable: false),
- ExecutionDuration = table.Column(nullable: false),
- ClientIpAddress = table.Column(maxLength: 64, nullable: true),
- ClientName = table.Column(maxLength: 128, nullable: true),
- ClientId = table.Column(maxLength: 64, nullable: true),
- CorrelationId = table.Column(maxLength: 64, nullable: true),
- BrowserInfo = table.Column(maxLength: 512, nullable: true),
- HttpMethod = table.Column(maxLength: 16, nullable: true),
- Url = table.Column(maxLength: 256, nullable: true),
- Exceptions = table.Column(maxLength: 4000, nullable: true),
- Comments = table.Column(maxLength: 256, nullable: true),
- HttpStatusCode = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpAuditLogs", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AbpClaimTypes",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- ExtraProperties = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(maxLength: 40, nullable: true),
- Name = table.Column(maxLength: 256, nullable: false),
- Required = table.Column(nullable: false),
- IsStatic = table.Column(nullable: false),
- Regex = table.Column(maxLength: 512, nullable: true),
- RegexDescription = table.Column(maxLength: 128, nullable: true),
- Description = table.Column(maxLength: 256, nullable: true),
- ValueType = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpClaimTypes", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AbpOrganizationUnits",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- ExtraProperties = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(maxLength: 40, nullable: true),
- CreationTime = table.Column(nullable: false),
- CreatorId = table.Column(nullable: true),
- LastModificationTime = table.Column(nullable: true),
- LastModifierId = table.Column(nullable: true),
- IsDeleted = table.Column(nullable: false, defaultValue: false),
- DeleterId = table.Column(nullable: true),
- DeletionTime = table.Column(nullable: true),
- TenantId = table.Column(nullable: true),
- ParentId = table.Column(nullable: true),
- Code = table.Column(maxLength: 95, nullable: false),
- DisplayName = table.Column(maxLength: 128, nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpOrganizationUnits", x => x.Id);
- table.ForeignKey(
- name: "FK_AbpOrganizationUnits_AbpOrganizationUnits_ParentId",
- column: x => x.ParentId,
- principalTable: "AbpOrganizationUnits",
- principalColumn: "Id",
- onDelete: ReferentialAction.Restrict);
- });
-
- migrationBuilder.CreateTable(
- name: "AbpPermissionGrants",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- TenantId = table.Column(nullable: true),
- Name = table.Column(maxLength: 128, nullable: false),
- ProviderName = table.Column(maxLength: 64, nullable: false),
- ProviderKey = table.Column(maxLength: 64, nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AbpRoles",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- ExtraProperties = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(maxLength: 40, nullable: true),
- TenantId = table.Column(nullable: true),
- Name = table.Column(maxLength: 256, nullable: false),
- NormalizedName = table.Column(maxLength: 256, nullable: false),
- IsDefault = table.Column(nullable: false),
- IsStatic = table.Column(nullable: false),
- IsPublic = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpRoles", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AbpSettings",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- Name = table.Column(maxLength: 128, nullable: false),
- Value = table.Column(maxLength: 2048, nullable: false),
- ProviderName = table.Column(maxLength: 64, nullable: true),
- ProviderKey = table.Column(maxLength: 64, nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpSettings", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AbpTenants",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- ExtraProperties = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(maxLength: 40, nullable: true),
- CreationTime = table.Column(nullable: false),
- CreatorId = table.Column(nullable: true),
- LastModificationTime = table.Column(nullable: true),
- LastModifierId = table.Column(nullable: true),
- IsDeleted = table.Column(nullable: false, defaultValue: false),
- DeleterId = table.Column(nullable: true),
- DeletionTime = table.Column(nullable: true),
- Name = table.Column(maxLength: 64, nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpTenants", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AbpUsers",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- ExtraProperties = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(maxLength: 40, nullable: true),
- CreationTime = table.Column(nullable: false),
- CreatorId = table.Column(nullable: true),
- LastModificationTime = table.Column(nullable: true),
- LastModifierId = table.Column(nullable: true),
- IsDeleted = table.Column(nullable: false, defaultValue: false),
- DeleterId = table.Column(nullable: true),
- DeletionTime = table.Column(nullable: true),
- TenantId = table.Column(nullable: true),
- UserName = table.Column(maxLength: 256, nullable: false),
- NormalizedUserName = table.Column(maxLength: 256, nullable: false),
- Name = table.Column(maxLength: 64, nullable: true),
- Surname = table.Column(maxLength: 64, nullable: true),
- Email = table.Column(maxLength: 256, nullable: false),
- NormalizedEmail = table.Column(maxLength: 256, nullable: false),
- EmailConfirmed = table.Column(nullable: false, defaultValue: false),
- PasswordHash = table.Column(maxLength: 256, nullable: true),
- SecurityStamp = table.Column(maxLength: 256, nullable: false),
- PhoneNumber = table.Column(maxLength: 16, nullable: true),
- PhoneNumberConfirmed = table.Column(nullable: false, defaultValue: false),
- TwoFactorEnabled = table.Column(nullable: false, defaultValue: false),
- LockoutEnd = table.Column(nullable: true),
- LockoutEnabled = table.Column(nullable: false, defaultValue: false),
- AccessFailedCount = table.Column(nullable: false, defaultValue: 0)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AbpUsers", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "CmsComments",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- TenantId = table.Column(nullable: true),
- EntityType = table.Column(maxLength: 64, nullable: false),
- EntityId = table.Column(maxLength: 64, nullable: false),
- Text = table.Column(maxLength: 512, nullable: false),
- RepliedCommentId = table.Column(nullable: true),
- CreatorId = table.Column(nullable: false),
- CreationTime = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_CmsComments", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "CmsRatings",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- TenantId = table.Column(nullable: true),
- EntityType = table.Column(maxLength: 64, nullable: false),
- EntityId = table.Column(maxLength: 64, nullable: false),
- StarCount = table.Column(nullable: false),
- CreatorId = table.Column(nullable: false),
- CreationTime = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_CmsRatings", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "CmsUserReactions",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- TenantId = table.Column(nullable: true),
- EntityType = table.Column(maxLength: 64, nullable: false),
- EntityId = table.Column(maxLength: 64, nullable: false),
- ReactionName = table.Column(maxLength: 32, nullable: false),
- CreatorId = table.Column(nullable: false),
- CreationTime = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_CmsUserReactions", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "CmsUsers",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- ExtraProperties = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(maxLength: 40, nullable: true),
- TenantId = table.Column(nullable: true),
- UserName = table.Column(maxLength: 256, nullable: false),
- Email = table.Column(maxLength: 256, nullable: false),
- Name = table.Column(maxLength: 64, nullable: true),
- Surname = table.Column(maxLength: 64, nullable: true),
- EmailConfirmed = table.Column