diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 3142e186c5..5587120951 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with rel-7.4 +name: Merge branch dev with rel-8.0 on: push: branches: - - rel-7.4 + - rel-8.0 permissions: contents: read jobs: - merge-dev-with-rel-7-4: + merge-dev-with-rel-8-0: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -18,13 +18,19 @@ jobs: ref: dev - name: Reset promotion branch run: | - git fetch origin rel-7.4:rel-7.4 - git reset --hard rel-7.4 + git fetch origin rel-8.0:rel-8.0 + git reset --hard rel-8.0 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-7-4/${{github.run_number}} - title: Merge branch dev with rel-7.4 - body: This PR generated automatically to merge dev with rel-7.4. Please review the changed files before merging to prevent any errors that may occur. - reviewers: ${{github.actor}} + branch: auto-merge/rel-8-0/${{github.run_number}} + title: Merge branch dev with rel-8.0 + body: This PR generated automatically to merge dev with rel-8.0. Please review the changed files before merging to prevent any errors that may occur. + reviewers: maliming token: ${{ github.token }} + - name: Merge Pull Request + env: + GH_TOKEN: ${{ secrets.BOT_SECRET }} + run: | + gh pr review auto-merge/rel-8-0/${{github.run_number}} --approve + gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --auto --delete-branch diff --git a/Directory.Packages.props b/Directory.Packages.props index 2e28ebc0ea..540c7f109d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -107,7 +107,7 @@ - + @@ -121,14 +121,14 @@ - + - - + + diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json index faf7c0b36d..a261c69dca 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json @@ -229,6 +229,7 @@ "ManageAccount": "Manage Account", "CommunityProfile": "Community Profile", "BlogProfile": "Blog Profile", - "Tickets": "Tickets" + "Tickets": "Tickets", + "Videos": "Videos" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 7b0394bac5..cf26edf473 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -437,6 +437,11 @@ "Testimonials": "Testimonials", "CoolestCompaniesUseABPFramework": "Coolest Companies Use ABP Framework", "Index_Page_Testimonial_1": "ABP Framework is not just a tool but a catalyst that has accelerated my growth as a developer. It has made it possible for me to build new features faster than ever before, reminiscent of the experiences of other users. The unified coding pattern has streamlined my projects, giving me more time to focus on creating rather than troubleshooting.\nI would say the ABP Framework has been the cornerstone of my early professional journey. It has facilitated my transition from an aspiring developer to a confident professional ready to make a mark in the software world. I am looking forward to the exciting projects that await me, knowing that ABP will be there to guide me. It is more than just a product; it's a partner in success.", - "Index_Page_Testimonial_2": "ABP Framework is not only a framework, it is also a guidance for project development/management, because it provides DDD, GenericRepository, DI, Microservice, Modularity trainings. Even if you are not going to use framework itself, you can develop yourself with docs.abp.io which is well and professionally prepared. (OpenIddict, Redis, Quartz etc.)\nBecause many thing pre-built, it shortens project development time significantly. (Such as login page, exception handling, data filtering-seeding, audit logging, localization, auto api controller etc.)\nAs an example from our app, i have used Local Event Bus for stock control. So, I am able to manage order movements by writing stock handler.\nIt is wonderful not to lose time for CreationTime, CreatorId. They are filled automatically." + "Index_Page_Testimonial_2": "ABP Framework is not only a framework, it is also a guidance for project development/management, because it provides DDD, GenericRepository, DI, Microservice, Modularity trainings. Even if you are not going to use framework itself, you can develop yourself with docs.abp.io which is well and professionally prepared. (OpenIddict, Redis, Quartz etc.)\nBecause many thing pre-built, it shortens project development time significantly. (Such as login page, exception handling, data filtering-seeding, audit logging, localization, auto api controller etc.)\nAs an example from our app, i have used Local Event Bus for stock control. So, I am able to manage order movements by writing stock handler.\nIt is wonderful not to lose time for CreationTime, CreatorId. They are filled automatically.", + "VideosLoginAndRegisterMessage": "To be able to watch videos, you must sign in.", + "Filter": "Filter", + "VideoCourses": "Video Courses" } } + + diff --git a/abp_io/README.md b/abp_io/README.md index 8819a4fb73..3f59187ea4 100644 --- a/abp_io/README.md +++ b/abp_io/README.md @@ -1,11 +1,32 @@ -## Abp.io platform localization +## ABP Platform Websites Localization -This project is all localized resources of the abp.io platform. +This is the localization project of [abp.io platform](https://abp.io). +All *.abp.io websites are built on top of ABP Framework, and it uses ABP Framework's localization system. +You can correct a wrong localization text, or you can translate it into your own language. +By doing so, [abp.io](https://abp.io) websites will be translated into a new language and it will help to expand the ABP Community. -If you like, you can contribute to the localization resources in this project. -For example: `AbpIoLocalization\AbpIoLocalization\Www\Localization\Resources\zh-Hans.json` -If the file is missing some translations or the translation is wrong, you can add it. -If the language file is missing (eg `kr.json`), you can also add it. -Please refer to the [Contribution Guide](https://github.com/abpframework/abp/blob/dev/docs/en/Contribution/Index.md) for details. \ No newline at end of file +## How to Translate abp.io Into Your Language: + +1. Install [ABP CLI](https://docs.abp.io/en/abp/latest/CLI) command line tool. + +2. Run the following command to generate the localization file. + For example, for translating from English to French `fr`: + + ```bash + abp translate -c fr + ``` +3. After you fill in the empty localization keys, run the following command to apply it. + ```bash + abp translate -a + ``` +4. Send your PR to the team; after the review process, we wil merge it. + +--- + + + +## References: +* [ABP CLI Translate Command](https://docs.abp.io/en/abp/latest/Contribution/Index#using-the-abp-translate-command) +* [Contribution Guide](https://github.com/abpframework/abp/blob/dev/docs/en/Contribution/Index.md) diff --git a/common.props b/common.props index b39a45b734..c64a4460d8 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 8.0.0 + 8.1.0 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ @@ -29,8 +29,8 @@ true content\ - - + + true content\ diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/POST.md b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/POST.md new file mode 100644 index 0000000000..5fcffd1092 --- /dev/null +++ b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/POST.md @@ -0,0 +1,223 @@ +# ABP.IO Platform 8.0 RC Has Been Released + +Today, we are happy to release the [ABP Framework](https://abp.io/) and [ABP Commercial](https://commercial.abp.io/) version **8.0 RC** (Release Candidate). This blog post introduces the new features and important changes in this new version. + +Try this version and provide feedback for a more stable version of ABP v8.0! Thanks to all of you. + +## Get Started with the 8.0 RC + +Follow the steps below to try version 8.0.0 RC today: + +1) **Upgrade** the ABP CLI to version `8.0.0-rc.1` using a command line terminal: + +````bash +dotnet tool update Volo.Abp.Cli -g --version 8.0.0-rc.1 +```` + +**or install** it if you haven't before: + +````bash +dotnet tool install Volo.Abp.Cli -g --version 8.0.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/latest/CLI) for all the available options. + +> You can also use the [Get Started](https://abp.io/get-started) page to generate a CLI command to create a new application. + +You can use any IDE that supports .NET 8.x, like [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/). + +## Migration Guides + +There are a few breaking changes in this version that may affect your application. +Please see the following migration documents, if you are upgrading from v7.x or earlier: + +* [ABP Framework 7.x to 8.0 Migration Guide](https://docs.abp.io/en/abp/8.0/Migration-Guides/Abp-8_0) +* [ABP Commercial 7.x to 8.0 Migration Guide](https://docs.abp.io/en/commercial/8.0/migration-guides/v8_0) + +## What's New with ABP Framework 8.0? + +In this section, I will introduce some major features released in this version. +Here is a brief list of titles explained in the next sections: + +* Upgraded to .NET 8.0 +* Upgraded to Angular 17 +* Dynamic Claims +* CDN Support for Bundling & Minification System +* Read-Only Repositories +* Account Module: Set Username After Social/External Login +* Other News... + +### Upgraded to .NET 8.0 + +We've upgraded the ABP Framework to .NET 8.0, so you need to move your solutions to .NET 8.0 if you want to use ABP 8.0. You can check [Microsoft’s Migrate from ASP.NET Core 7.0 to 8.0 documentation](https://learn.microsoft.com/en-us/aspnet/core/migration/70-80), to see how to update an existing ASP.NET Core 7.0 project to ASP.NET Core 8.0. + +### Upgraded to Angular 17 + +Angular 17 [was released on November 8](https://blog.angular.io/introducing-angular-v17-4d7033312e4b) and ABP Framework & ABP Commercial startup templates were immediately migrated to **Angular 17**! + +So, when you create a new solution with the Angular UI, you will take advantage of the new Angular with the new cutting-edge features and enhancements right from the start! + +### Dynamic Claims + +The **Dynamic Claims** feature is used to dynamically generate claims for the user in each request. It's used to automatically and dynamically override the configured claim values in the client's authentication token/cookie by the latest user claims. + +In the prior versions, whenever a user changed their email address or confirmed their own email address, or any other information related to the user (and if it's in the claims), he/she would need to logout and then login to refresh its claims. The new **Dynamic Claims** feature overcomes this problem and allows to **always get the latest user claims**. + +This feature is disabled by default and you can enable it easily for your existing MVC applications by following the [Dynamic Claims documentation](https://docs.abp.io/en/abp/8.0/Dynamic-Claims). For the other UI options (Angular & Blazor UIs), you don't need to enable this feature, since they obtain claims ftom a configuration endpoint. + +> **Note**: Beginning from the v8.0, all the startup templates are pre-configured and the **Dynamic Claims** feature is enabled by default. + +### CDN Support for Bundling & Minification System + +In this version, ABP Framework's [Bundling & Minification System](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Bundling-Minification) provides CDN support for MVC / Razor Pages UI. The bundling system automatically recognizes the external/CDN files and places them as link/script tags on the page along with the bundled CSS/JSS files. + +> Read the documentation for more info: https://docs.abp.io/en/abp/8.0/UI/AspNetCore/Bundling-Minification + +### Read-Only Repositories + +ABP Framework provides read-only repository interfaces (`IReadOnlyRepository<>` or `IReadOnlyBasicRepository<>`) to explicitly indicate that your purpose is to query data, but not change it. It uses [EF Core's No-Tracking Feature](https://learn.microsoft.com/en-us/ef/core/querying/tracking#no-tracking-queries) behind the scenes, which means the entities returned from the repository will not be tracked by the EF Core's [change tracker](https://learn.microsoft.com/en-us/ef/core/change-tracking/) and thanks to that you get significant performance gains. + +```csharp +public class MyService +{ + private readonly IReadOnlyRepository _bookRepository; + + public async Task MyMethod() + { + var books = await _bookRepository.GetListAsync(); //change tracking not involved + + //... + } +} +``` + +> In addition to the read-only repository interfaces, ABP Framework introduces the `IRepository.DisableTracking()` and `IRepository.EnableTracking()` extension methods to allow developers to disable/enable entity tracking by these methods manually. If you don't want to use the read-only repositories, you can use these methods to enable or disable the change tracker controlled. Read the documentation to learn more: [https://docs.abp.io/en/abp/8.0/Repositories#enabling-disabling-the-change-tracking](https://docs.abp.io/en/abp/8.0/Repositories#enabling-disabling-the-change-tracking) + +### Account Module: Set Username After Social/External Login + +Prior to this version, when you registered with your social accounts for the first time, your email address was becoming your username and it was shown everywhere in the application. Therefore, you would need to update your username later on and this is not a good user experience. + +Thus, in this version, we have enhanced this flow, and now, when you register as an external user for the first time, a username and email address are shown you in a form for you to revise and update if you want, before logging into the application. Thanks to that, after the social registration you would not need to update your username and email address. This is also good at the point of GDPR regulations because your email address will not be shown as a username and will not exposed. + +![](account-module-register.png) + +### Other News + +* LDAP over SSL (LDAPS) setting has been added and recommended to establish a secure connection. See [#17865](https://github.com/abpframework/abp/pull/17865) for more information. +* Object Mapping Enhancements (supports mapping collection of objects for custom object mappers). +* Email Sending Improvements (sending attachments with `IEmailSender.QueueAsync()` method). + +## What's New with ABP Commercial 8.0? + +We've also worked on ABP Commercial to align the features and changes made in the ABP Framework. The following sections introduce a few new features coming with ABP Commercial 8.0. + +### Suite: Generating Master/Detail Relationship + +In this version, we have introduced the **Master/Detail Relationship** support in Suite. The Master-Detail (or Master-Child) relationship refers to a hierarchical connection between two entities, where one entity (the master or parent entity) influences or controls the behavior or properties of another element (the child entity) relationship. The relationship between **Order - Order Lines** can be considered as an example of a master-detail relationship. + +![](suite-master-child-datagrid.png) + +ABP Suite allows you to create a master-detail relationship with a few clicks. It generates the necessary code for the master and detail tables, including the foreign key relationship between the two tables. + +To establish a master-detail relationship, you need to apply the following two steps: + +1-) Create the master entity, +2-) Create a child entity and associate it with a master entity. + +That's it! ABP Suite will be generating the entities, making the related configurations, establishing database relations (including the foreign key relationship), generating the UI for the master entity (with child-grids for child entities), and so on... + +It’s already documented and you can read the documentation at [https://docs.abp.io/en/commercial/8.0/abp-suite/creating-master-detail-relationship](https://docs.abp.io/en/commercial/8.0/abp-suite/creating-master-detail-relationship). + +#### Known Issues + +* After you generate CRUD pages via Suite for the Angular UI, you should start the backend project and run the `abp generate-proxy -t ng` command in the root directory of the Angular application manually. It will be automatically done with the next version, so you will not need to run the command manually in further versions. + +### Get Profile Picture From Social/External Logins + +A user's profile picture would be blank when they first register for an application using a social account through an external authentication provider like Google or Facebook because it hasn't been configured yet. The user must update their profile photo after logging into the application. + + +In order to save the user from having to change their profile picture after logging in for the first time, we have improved this behavior in this version and are now attempting to retrieve the user's profile picture from external authentication providers (like Google) and set it as their profile picture. Later on, if desired, he or she might modify the profile image. + +### Switch Ocelot to YARP for the API Gateway + +Until this version, ABP Commercial was using the [Ocelot](https://github.com/ThreeMammals/Ocelot) for the API Gateway, in the [Microservice Startup Template](https://docs.abp.io/en/commercial/latest/startup-templates/microservice/index). Since the **Ocelot** library is not actively maintained, we have searched for an alternative and decided to switch from Ocelot to [YARP](https://github.com/microsoft/reverse-proxy) for the API Gateway. YARP is maintained by Microsoft and is actively being developed and seems a better alternative than Ocelot and provides the same feature stack and even more. + +You can read the [Migrating to YARP](https://docs.abp.io/en/commercial/8.0/migration-guides/migrating-to-yarp) documentation for migrating your existing microservice application's API Gateway from [Ocelot](https://github.com/ThreeMammals/Ocelot) to [YARP](https://github.com/microsoft/reverse-proxy). + +> We have made the all related changes in the Microservice Startup Template, and also updated the documentation, which you can read [here](https://docs.abp.io/en/commercial/8.0/startup-templates/microservice/gateways). + +### Password Complexity Indicators (MVC & Blazor UIs) + +In v7.4, we have introduced the [Password Complexity Indicators for Angular UI](https://docs.abp.io/en/commercial/7.4/ui/angular/password-complexity-indicator-component) and with this version, we have implemented it for the MVC & Blazor UIs as well. You can use this feature to dynamically evaluate and rate the strength of user-generated passwords, providing real-time feedback to users as they create or update their passwords. + +![](password-complexity-indicators.png) + +### Read-Only View for Users Page + +In your application, you may want to grant permission to a specific group or people to read-only view the users of your application to be able to do some actions. For example, you may want to marketing team to see the users to organize campaigns for the customers, or make controls. In this case, you can grant default permissions for these groups, however, they could not see the details of a user, because in the current design, if the edit permission is not granted you can't see the detailed info for a user. + +![](identity-users.gif) + +In this version, we have added the read-only view action to the user's page. This allows you to only grant the default view permission to the specific users and allow them to view user information as read-only and not allow them to change or modify it. + +### Export & Import Users as Excel / CSV + +With v8.0, now it's possible to import and export user records in Excel and CSV formats. You can import external users, or import users from Excel or CSV files and also you can export users to Excel or CSV files: + +![](users-page.png) + +## Community News + +### Highlights from .NET 8.0 + +Our team has closely followed the ASP.NET Core and Entity Framework Core 8.0 releases, read Microsoft's guides and documentation, and adapted the changes to our ABP.IO Platform. We are proud to say that we've shipped the ABP 8.0 RC.1 based on .NET 8.0 just after Microsoft's .NET 8.0 release. + +In addition to the ABP's .NET 8.0 upgrade, our team has created 13 great articles to highlight the important features coming with ASP.NET Core 8.0 and Entity Framework Core 8.0. + +> You can read [this post](https://volosoft.com/blog/Highlights-for-ASP-NET-Entity-Framework-Core-NET-8-0) to see the list of all articles. + +### New ABP Community Articles + +In addition to [the 13 articles to highlight .NET 8.0 features written by our team](https://volosoft.com/blog/Highlights-for-ASP-NET-Entity-Framework-Core-NET-8-0), here are some of the recent posts added to the [ABP Community](https://community.abp.io/): + +* [Upgrade Your Existing Projects to .NET 8 & ABP 8.0](https://community.abp.io/posts/upgrade-your-existing-projects-to-.net-8-abp-8.0-x0n7hiqr) by [Engincan Veske](https://github.com/EngincanV) +* [How to Upload and Download Files in the ABP Framework using Angular](https://community.abp.io/posts/how-to-upload-and-download-files-in-the-abp-framework-using-angular-que8cdr8) by [Mahmut Gündoğdu](https://github.com/mahmut-gundogdu) +* New **ABP Framework Essentials** Videos by [Hamza Albreem](https://github.com/braim23): + * [ABP Essentials - Interception](https://community.abp.io/videos/abp-essentials-interception-ath78xhw) + * [ABP Essentials - Virtual File System](https://community.abp.io/videos/abp-essentials-virtual-file-system-hpgr2j72) + * [ABP Framework Essentials - Localization](https://community.abp.io/videos/abp-framework-essentials-localization-7taieh68) + * [ABP Framework Essentials - Dependency Injection](https://community.abp.io/videos/abp-framework-essentials-dependency-injection-q241mfrf) + * See the playlist for other videos of this series: https://www.youtube.com/playlist?list=PLsNclT2aHJcNupH2wz83y7htugpLoUZ_B + +Thanks to the ABP Community for all the content they have published. You can also [post your ABP related (text or video) content](https://community.abp.io/articles/submit) to the ABP Community. + +### We were in the .NET Conf 2023 + +Microsoft has released .NET 8.0 and celebrated it with a 3-day international online conference. The core team members of ABP Framework, [Alper Ebiçoğlu](https://twitter.com/alperebicoglu) and [Enis Necipoğlu](https://twitter.com/EnisNecipoglu) gave speeches at the .NET Conf 2023. + +[Alper Ebiçoğlu](https://twitter.com/alperebicoglu)'s topic was "Building Multi-Tenant ASP.NET Core Applications and ABP Framework" and in this talk, he talked about what's SaaS development, what are its pros and challenges and multi-tenant development with the open-source ABP Framework: + + + +On the other hand, [Enis Necipoğlu](https://twitter.com/EnisNecipoglu)'s topic was "Reactive programming with .NET MAUI" and he talked about applying reactive programming in .NET MAUI with MVVM and ReactiveUI: + + + +### ABP Community Talks 2023.8: What’s coming with .NET 8.0 & ABP v8.0 + +![](community-talk-2023-8.png) + +In this episode of ABP Community Talks, 2023.8; [Steve Sanderson](https://twitter.com/stevensanderson) will be our guest speaker and we'll talk about .NET 8.0 and ABP 8.0 with the ABP Core Team. We will dive into the features that came with .NET 8.0, how they are implemented in ABP 8.0, and the highlights in the .NET Conf 2023 with [Halil İbrahim Kalkan](https://github.com/hikalkan), [Alper Ebicoglu](https://github.com/ebicoglu), [Engincan Veske](https://github.com/EngincanV), [Berkan Sasmaz](https://github.com/berkansasmaz) and [Bige Besikci Yaman](https://github.com/bigebesikci). + +## Conclusion + +This version comes with some new features and a lot of enhancements to the existing features. You can see the [Road Map](https://docs.abp.io/en/abp/8.0/Road-Map) documentation to learn about the release schedule and planned features for the next releases. Please try ABP v8.0 RC and provide feedback to help us release a more stable version. + +Thanks for being a part of this community! diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/account-module-register.png b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/account-module-register.png new file mode 100644 index 0000000000..d58c0c52a9 Binary files /dev/null and b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/account-module-register.png differ diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/community-talk-2023-8.png b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/community-talk-2023-8.png new file mode 100644 index 0000000000..eec41bb17a Binary files /dev/null and b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/community-talk-2023-8.png differ diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/cover-image.png b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/cover-image.png new file mode 100644 index 0000000000..5ebaa2ba36 Binary files /dev/null and b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/cover-image.png differ diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/identity-users.gif b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/identity-users.gif new file mode 100644 index 0000000000..92dad96550 Binary files /dev/null and b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/identity-users.gif differ diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/password-complexity-indicators.png b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/password-complexity-indicators.png new file mode 100644 index 0000000000..98f8922c19 Binary files /dev/null and b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/password-complexity-indicators.png differ diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/suite-master-child-datagrid.png b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/suite-master-child-datagrid.png new file mode 100644 index 0000000000..c774e78671 Binary files /dev/null and b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/suite-master-child-datagrid.png differ diff --git a/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/users-page.png b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/users-page.png new file mode 100644 index 0000000000..860dfdfffd Binary files /dev/null and b/docs/en/Blog-Posts/2023-11-15 v8_0_Preview/users-page.png differ diff --git a/docs/en/Community-Articles/2023-11-06-Blazor-Fullstack-Web-Ui/Post.md b/docs/en/Community-Articles/2023-11-06-Blazor-Fullstack-Web-Ui/Post.md index c3203d481d..c1c38d7818 100644 --- a/docs/en/Community-Articles/2023-11-06-Blazor-Fullstack-Web-Ui/Post.md +++ b/docs/en/Community-Articles/2023-11-06-Blazor-Fullstack-Web-Ui/Post.md @@ -91,4 +91,5 @@ I summarized the new generation Blazor in a very simple way. This architecture w * You can check Dan Roth's GitHub issue 👉 [github.com/dotnet/aspnetcore/issues/46636](https://github.com/dotnet/aspnetcore/issues/46636). * Steven Sanderson's YouTube video is very good for understanding these concepts 👉 [Blazor United Prototype Video](https://youtu.be/48G_CEGXZZM). +* "Full Stack Web UI with Blazor" — .NET Conf 2023 video 👉 [learn.microsoft.com/en-us/shows/dotnetconf-2023/full-stack-web-ui-with-blazor-in-dotnet-8](https://learn.microsoft.com/en-us/shows/dotnetconf-2023/full-stack-web-ui-with-blazor-in-dotnet-8) diff --git a/docs/en/Community-Articles/2023-11-97-AOT-Compilation/Post.md b/docs/en/Community-Articles/2023-11-17-AOT-Compilation/Post.md similarity index 100% rename from docs/en/Community-Articles/2023-11-97-AOT-Compilation/Post.md rename to docs/en/Community-Articles/2023-11-17-AOT-Compilation/Post.md diff --git a/docs/en/Dapr/Index.md b/docs/en/Dapr/Index.md index 060b31aac3..464b56ea30 100644 --- a/docs/en/Dapr/Index.md +++ b/docs/en/Dapr/Index.md @@ -60,29 +60,6 @@ Alternatively, you can configure the options in the `Dapr` section of your `apps } ```` -### Injecting DaprClient - -ABP registers the `DaprClient` class to the [dependency injection](../Dependency-Injection.md) system. So, you can inject and use it whenever you need: - -````csharp -public class MyService : ITransientDependency -{ - private readonly DaprClient _daprClient; - - public MyService(DaprClient daprClient) - { - _daprClient = daprClient; - } - - public async Task DoItAsync() - { - // TODO: Use the injected _daprClient object - } -} -```` - -Injecting `DaprClient` is the recommended way of using it in your application code. When you inject it, the `IAbpDaprClientFactory` service is used to create it, which is explained in the next section. - ### IAbpDaprClientFactory `IAbpDaprClientFactory` can be used to create `DaprClient` or `HttpClient` objects to perform operations on Dapr. It uses `AbpDaprOptions`, so you can configure the settings in a central place. @@ -113,15 +90,14 @@ public class MyService : ITransientDependency }); // Create an HttpClient object - HttpClient httpClient = await _daprClientFactory - .CreateHttpClientAsync("target-app-id"); + HttpClient httpClient = await _daprClientFactory.CreateHttpClientAsync("target-app-id"); } } ```` `CreateHttpClientAsync` method also gets optional `daprEndpoint` and `daprApiToken` parameters. -> ABP uses `IAbpDaprClientFactory` when it needs to create a Dapr client. You can also use Dapr API to create client objects in your application. Using `IAbpDaprClientFactory` is recommended, but not required. +> You can use Dapr API to create client objects in your application. Using `IAbpDaprClientFactory` is recommended, but not required. ## C# API Client Proxies Integration @@ -412,7 +388,7 @@ Or you can set it in your `appsettings.json` file: } ```` -Once you set it, it is used when you inject `DaprClient` or use `IAbpDaprClientFactory`. If you need that value in your application, you can inject `IDaprApiTokenProvider` and use its `GetDaprApiToken()` method. +Once you set it, it is used when you use `IAbpDaprClientFactory`. If you need that value in your application, you can inject `IDaprApiTokenProvider` and use its `GetDaprApiToken()` method. ### App API Token diff --git a/docs/en/Dependency-Injection.md b/docs/en/Dependency-Injection.md index d8afe5c21c..143ec8cc19 100644 --- a/docs/en/Dependency-Injection.md +++ b/docs/en/Dependency-Injection.md @@ -480,6 +480,24 @@ This example simply checks if the service class has `MyLogAttribute` attribute a > Notice that `OnRegistered` callback might be called multiple times for the same service class if it exposes more than one service/interface. So, it's safe to use `Interceptors.TryAdd` method instead of `Interceptors.Add` method. See [the documentation](Dynamic-Proxying-Interceptors.md) of dynamic proxying / interceptors. +### IServiceCollection.OnActivated Event + +The `OnActivated` event is raised once a service is fully constructed. Here you can perform application-level tasks that depend on the service being fully constructed - these should be rare. + +````csharp +var serviceDescriptor = ServiceDescriptor.Transient(); +services.Add(serviceDescriptor); +if (setIsReadOnly) +{ + services.OnActivated(serviceDescriptor, x => + { + x.Instance.As().IsReadOnly = true; + }); +} +```` + +> Notice that `OnActivated` event can be registered multiple times for the same `ServiceDescriptor`. + ## 3rd-Party Providers While ABP has no core dependency to any 3rd-party DI provider, it's required to use a provider that supports dynamic proxying and some other advanced features to make some ABP features properly work. diff --git a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md index 4823cbaae9..ef174f92b0 100644 --- a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md +++ b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md @@ -152,4 +152,14 @@ Configure(options => }); ```` +**Example: Configure the queue and exchange optional arguments** + +```csharp +Configure(options => +{ + options.ExchangeArguments["x-delayed-type"] = "direct"; + options.QueueArguments["x-message-ttl"] = 60000; +}); +``` + Using these options classes can be combined with the `appsettings.json` way. Configuring an option property in the code overrides the value in the configuration file. diff --git a/docs/en/Dynamic-Claims.md b/docs/en/Dynamic-Claims.md index 3a2ef3ee58..5985be9510 100644 --- a/docs/en/Dynamic-Claims.md +++ b/docs/en/Dynamic-Claims.md @@ -1,14 +1,18 @@ # Dynamic Claims -## What is Dynamic Claims and Why do we need it +When a client authenticates and obtains an access token or an authentication cookie, the claims in that token or cookie are not changed unless it re-authenticates. For most of the claims, that may not be a problem since claims are not frequently changing values. However, some claims may be changed and these changes should be reflected to the current session immediately. For example, we can revoke a role from a user and that should be immediately effective, otherwise user will continue to use that role's permissions until re-login to the application. -We use claims-based authentication in ASP.NET Core, It will be store the claims in the cookie or token. But the claims are static, it will be not change after the user re-login. If the user changed its username or role, we still get the old claims. +ABP's dynamic claims feature is used to automatically and dynamically override the configured claim values in the client's authentication token/cookie by the latest values of these claims. -The `Dynamic Claims` feature is used to dynamically generate claims for the user in each request. You can always get the latest user claims. +## How to Use -## How to use it +This feature is disabled by default. You should enable it for your application and use the Dynamic Claims middleware. -This feature is disabled by default. You can enable it by following code: +> **Beginning from the v8.0, all the [startup templates](Startup-Templates/Index.md) are pre-configured and the dynamic claims feature is enabled by default. So, if you have created a solution with v8.0 and above, you don't need to make any configuration. Follow the instructions only if you've upgraded from a version lower than 8.0.** + +### Enabling the Dynamic Claims + +You can enable it by the following code: ````csharp public override void ConfigureServices(ServiceConfigurationContext context) @@ -20,7 +24,7 @@ public override void ConfigureServices(ServiceConfigurationContext context) } ```` -If you are using the tiered solution you need to set the `RemoteRefreshUrl` to the Auth Server url in the UI project. +This is typically done on the authentication server. In a monolith application, you will typically have a single application, so you can configure it. If you are using the tiered solution structure (where the UI part is hosted in a separate application) you will need to also set the `RemoteRefreshUrl` to the Authentication Server's URL in the UI application. Example: ````csharp public override void ConfigureServices(ServiceConfigurationContext context) @@ -33,46 +37,54 @@ public override void ConfigureServices(ServiceConfigurationContext context) } ```` -Then add the `DynamicClaims` middleware. +> The `RemoteRefreshUrl` is already configured inside methods `AddAbpOpenIdConnect` and `AddAbpJwtBearer`. + + +### The Dynamic Claims Middleware + +Add the `DynamicClaims` middleware to all the applications that performs authentication (including the authentication server): ````csharp -public override void OnApplicationInitialization(ApplicationInitializationContext context) +public override void OnApplicationInitialization( + ApplicationInitializationContext context) { - // Add this line before UseAuthorization. - app.UseDynamicClaims(); + //... + app.UseDynamicClaims(); // Add this line before UseAuthorization. app.UseAuthorization(); //... } ```` -## How it works +## How It Works The `DynamicClaims` middleware will use `IAbpClaimsPrincipalFactory` to dynamically generate claims for the current user(`HttpContext.User`) in each request. -There are two implementations of `IAbpDynamicClaimsPrincipalContributor` for different scenarios. +There are three pre-built implementations of `IAbpDynamicClaimsPrincipalContributor` for different scenarios: -### IdentityDynamicClaimsPrincipalContributor +* `IdentityDynamicClaimsPrincipalContributor`: Provided by the [Identity module](Modules/Identity.md) and generates and overrides the actual dynamic claims, and writes to the distributed cache. Typically works in the authentication server in a distributed system. +* `RemoteDynamicClaimsPrincipalContributor`: For distributed scenarios, this implementation works in the UI application. It tries to get dynamic claim values in the distributed cache. If not found in the distributed cache, it makes an HTTP call to the authentication server and requests filling it by the authentication server. `AbpClaimsPrincipalFactoryOptions.RemoteRefreshUrl` should be properly configure to make it running. +* `WebRemoteDynamicClaimsPrincipalContributor`: Similar to the `RemoteDynamicClaimsPrincipalContributor` but works in the microservice applications. -This implementation is used for the `Monolithic` solution. It will get the dynamic claims from the `IUserClaimsPrincipalFactory` and add/replace the current user claims. -It uses cache to improve performance. the cache will be invalidated when the user entity changed. +### IAbpDynamicClaimsPrincipalContributor -### RemoteDynamicClaimsPrincipalContributor +If you want to add your own dynamic claims contributor, you can create a class that implement the `IAbpDynamicClaimsPrincipalContributor` interface (and register it to the [dependency injection](Dependency-Injection.md) system. ABP Framework will call the `ContributeAsync` method to get the claims. It better to use a kind of cache to improve the performance since that is a frequently executed method (in every HTTP request). -This implementation is used for the `Tiered` solution. It will get the dynamic claims from the cache of the Auth Server. It will call the `RemoteRefreshUrl` of the Auth Server to refresh the cache when the cache is invalid. +## AbpClaimsPrincipalFactoryOptions -## IAbpDynamicClaimsPrincipalContributor +`AbpClaimsPrincipalFactoryOptions` is the main options class to configure the behavior of the dynamic claims system. It has the following properties: -If you want to add your own dynamic claims contributor, you can a class that implement the `IAbpDynamicClaimsPrincipalContributor` interface. The framework will call the `ContributeAsync` method when get the dynamic claims. +* `IsDynamicClaimsEnabled`: Enable or disable the dynamic claims feature. +* `RemoteRefreshUrl`: The `url ` of the Auth Server to refresh the cache. It will be used by the `RemoteDynamicClaimsPrincipalContributor`. The default value is `/api/account/dynamic-claims/refresh ` and you should provide the full URL in the authentication server, like `http://my-account-server/api/account/dynamic-claims/refresh `. +* `DynamicClaims`: A list of dynamic claim types. Only the claims in that list will be overridden by the dynamic claims system. +* `ClaimsMap`: A dictionary to map the claim types. This is used when the claim types are different between the Auth Server and the client. Already set up for common claim types by default. -> It better to use cache to improve performance. +## WebRemoteDynamicClaimsPrincipalContributorOptions -## AbpClaimsPrincipalFactoryOptions - -* `IsDynamicClaimsEnabled`: Enable or disable the dynamic claims feature. -* `RemoteRefreshUrl`: The url of the Auth Server to refresh the cache. It will be used by the `RemoteDynamicClaimsPrincipalContributor`. The default value is `/api/account/dynamic-claims/refresh`. -* `DynamicClaims`: A list of dynamic claim types, `DynamicClaims contributor`` will only handle the claim type in this list. -* `ClaimsMap`: A dictionary to map the claim types. This is used when the claim types are different between the Auth Server and the client. Already set up for common claim types by default +`WebRemoteDynamicClaimsPrincipalContributorOptions` is the options class to configure the behavior of the `WebRemoteDynamicClaimsPrincipalContributor`. It has the following properties: +* `IsEnabled`: Enable or disable the `WebRemoteDynamicClaimsPrincipalContributor`. `false` by default. +* `AuthenticationScheme`: The authentication scheme to authenticate the HTTP call to the authentication server. + ## See Also * [Authorization](Authorization.md) diff --git a/docs/en/Migration-Guides/Abp-8_0.md b/docs/en/Migration-Guides/Abp-8_0.md index 0bafa8b0c8..9285858501 100644 --- a/docs/en/Migration-Guides/Abp-8_0.md +++ b/docs/en/Migration-Guides/Abp-8_0.md @@ -103,7 +103,7 @@ You don't need to make any changes related to that, however it's important to kn In this version, `AbpAspNetCoreAsyncIntegratedTestBase` class has been set as `Obsolete` and it's recommended to use `AbpWebApplicationFactoryIntegratedTest` instead. -## Use NoTracking for readonly repositories for EF core. +## Use NoTracking for Readonly Repositories for EF Core In this version, ABP Framework provides read-only [repository](Repositories.md) interfaces (`IReadOnlyRepository<...>` or `IReadOnlyBasicRepository<...>`) to explicitly indicate that your purpose is to query data, but not change it. If so, you can inject these interfaces into your services. @@ -113,6 +113,12 @@ Entity Framework Core read-only repository implementation uses [EF Core's No-Tra > See the issue for more information: https://github.com/abpframework/abp/pull/17421 +## Use `IAbpDaprClientFactory` to Obtain `DaprClient` + +From this version on, instead of injecting the `DaprClient` directly, using the `IAbpDaprClientFactory.CreateAsync` method to create `DaprClient` or `HttpClient` objects to perform operations on Dapr is recommended. + +The documentation is already updated according to this suggestion and can be found at https://docs.abp.io/en/abp/8.0/Dapr/Index. So, if you want to learn more you can check the documentation or see the PR: https://github.com/abpframework/abp/pull/18117. + ## Angular UI # Guards @@ -238,7 +244,7 @@ You can see the following list of NuGet libraries that have been upgraded with . | NSubstitute | 4.3.0 | 5.1.0 | | NuGet.Versioning | 5.11.0 | 6.7.0 | | NUglify | 1.20.0 | 1.21.0 | -| Npgsql.EntityFrameworkCore.PostgreSQL | 7.0.0 | 8.0.0-rc.2 | +| Npgsql.EntityFrameworkCore.PostgreSQL | 7.0.0 | 8.0.0 | | NSubstitute.Analyzers.CSharp | 1.0.15 | 1.0.16 | | Octokit | 0.50.0 | 9.0.0 | | OpenIddict.Abstractions | 4.8.0 | 4.10.0 | @@ -248,14 +254,14 @@ You can see the following list of NuGet libraries that have been upgraded with . | OpenIddict.Validation.ServerIntegration | 4.8.0 | 4.10.0 | | Oracle.EntityFrameworkCore | 7.21.8 | 7.21.12 | | Polly | 7.2.3 | 8.2.0 | -| Pomelo.EntityFrameworkCore.MySql | 7.0.0 | 8.0.0-beta.1 | +| Pomelo.EntityFrameworkCore.MySql | 7.0.0 | 8.0.0-beta.2 | | Quartz | 3.4.0 | 3.7.0 | | Quartz.Extensions.DependencyInjection | 3.4.0 | 3.7.0 | | Quartz.Plugins.TimeZoneConverter | 3.4.0 | 3.7.0 | | Quartz.Serialization.Json | 3.3.3 | 3.7.0 | | RabbitMQ.Client | 6.3.0 | 6.6.0 | -| Rebus | 6.6.5 | 7.2.1 | -| Rebus.ServiceProvider | 7.0.0 | 9.1.0 | +| Rebus | 6.6.5 | 8.0.1 | +| Rebus.ServiceProvider | 7.0.0 | 10.0.0 | | Scriban | 5.4.4 | 5.9.0 | | Serilog | 2.11.0 | 3.1.1 | | Serilog.AspNetCore | 5.0.0 | 8.0.0 | diff --git a/docs/en/Modules/OpenIddict.md b/docs/en/Modules/OpenIddict.md index 20098eb975..ef8dfe92ef 100644 --- a/docs/en/Modules/OpenIddict.md +++ b/docs/en/Modules/OpenIddict.md @@ -349,7 +349,7 @@ public class MyClaimDestinationsHandler : IAbpOpenIddictClaimsPrincipalHandler, } } -Configure(options => +Configure(options => { options.ClaimsPrincipalHandlers.Add(); }); diff --git a/docs/en/Road-Map.md b/docs/en/Road-Map.md index e711dba5b2..05e071371a 100644 --- a/docs/en/Road-Map.md +++ b/docs/en/Road-Map.md @@ -4,17 +4,18 @@ This document provides a road map, release schedule and planned features for the ## Next Versions -### v8.0 +### v8.1 -The next version will be 8.0 and planned to release the stable 8.0 version in December, 2023. We will be mostly working on the following topics: +The next version will be 8.1 and planned to release the stable 8.1 version in February, 2024. We will be mostly working on the following topics: -* Enabling nullable annotations for all projects ([#16610](https://github.com/abpframework/abp/issues/16610)) -* Upgrade to .NET 8.0 ([#17355](https://github.com/abpframework/abp/issues/17355)) -* Use NoTracking for readonly repositories for EF Core ([#597](https://github.com/abpframework/abp/issues/597)) -* Support mapping collection of objects for custom object mappers ([#94](https://github.com/abpframework/abp/issues/94)) +* Blazor Full-Stack UI ([#16156](https://github.com/abpframework/abp/issues/16156)) +* Upgrade to OpenIddict 5.x ([#17605](https://github.com/abpframework/abp/issues/17605)) +* Angular Universal ([#15782](https://github.com/abpframework/abp/issues/15782)) +* Blazor - Forms & Validation Documentation ([#16400](https://github.com/abpframework/abp/issues/16400)) +* Deployment Documents Improvements ([#15034](https://github.com/abpframework/abp/issues/15034)) * Improvements on the existing features and provide more guides. -See the [8.0 milestone](https://github.com/abpframework/abp/milestone/88) for all the issues we've planned to work on. +See the [8.1 milestone](https://github.com/abpframework/abp/milestone/94) for all the issues we've planned to work on. ## Backlog Items diff --git a/docs/en/Themes/LeptonXLite/Blazor.md b/docs/en/Themes/LeptonXLite/Blazor.md index bcf6efb4d6..d2565bea40 100644 --- a/docs/en/Themes/LeptonXLite/Blazor.md +++ b/docs/en/Themes/LeptonXLite/Blazor.md @@ -135,13 +135,17 @@ builder.RootComponents.Add("#ApplicationContainer"); @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Main Layout"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyMainLayout.razor.cs`, in your blazor application as shown below: ```csharp [ExposeServices(typeof(MainLayout))] -[Dependency(ReplaceServices = true) +[Dependency(ReplaceServices = true)] namespace LeptonXLite.DemoApp.Blazor.MyComponents { public partial class MyMainLayout @@ -152,6 +156,7 @@ namespace LeptonXLite.DemoApp.Blazor.MyComponents ``` > Don't forget to remove the repeated attributes from the razor page! +> Don't forget to remove the `@code` section from the razor page! ### Toolbars @@ -206,6 +211,10 @@ The **branding component** is a simple component that can be used to display you @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Branding Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyBrandingComponent.razor.cs`, in your blazor application as shown below: @@ -243,6 +252,10 @@ On websites that have a lot of pages, **breadcrumb navigation** can greatly **en @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Breadcrumbs Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyBreadcrumbsComponent.razor.cs`, in your blazor application as shown below: @@ -281,6 +294,10 @@ Sidebar menus have been used as **a directory for Related Pages** for a **Servic @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Main Menu Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyMainMenu.razor.cs`, in your blazor application as shown below: @@ -319,6 +336,10 @@ Toolbar items are used to add **extra functionality to the toolbar**. The toolba @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Toolbar Items Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyToolbarItemsComponent.razor.cs`, in your blazor application as shown below: @@ -357,6 +378,10 @@ Think about a **multi-lingual** website and the first thing that could **hit you @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Language Switch Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyLanguageSwitchComponent.razor.cs`, in your blazor application as shown below: @@ -395,6 +420,10 @@ The **mobile** **language switch component** is used to switch the language of t @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Mobile Language Switch Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyMobilLanguageSwitchComponent.razor.cs`, in your blazor application as shown below: @@ -433,6 +462,10 @@ The **User Menu** is the **menu** that **drops down** when you **click your name @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My User Menu Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyUserMenuComponent.razor.cs`, in your blazor application as shown below: @@ -471,6 +504,10 @@ The **mobile user menu component** is used to display the **user menu on mobile @attribute [Dependency(ReplaceServices = true)] @Name + +@code { + string Name = "My Mobile User Menu Component"; +} ``` * If you prefer to use a code-behind file for the C# code of your component, create a razor component, like `MyMobileUserMenuComponent.razor.cs`, in your blazor application as shown below: diff --git a/docs/en/UI/Angular/CapsLock.directive.md b/docs/en/UI/Angular/Caps-Lock-Directive.md similarity index 100% rename from docs/en/UI/Angular/CapsLock.directive.md rename to docs/en/UI/Angular/Caps-Lock-Directive.md diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index 80ff5aa501..23180bdb06 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -1128,6 +1128,14 @@ "text": "Loading Directive", "path": "UI/Angular/Loading-Directive.md" }, + { + "text": "Show Password Directive", + "path": "UI/Angular/Show-Password-Directive.md" + }, + { + "text": "Caps Lock Directive", + "path": "UI/Angular/Caps-Lock-Directive.md" + }, { "text": "Toast Overlay", "path": "UI/Angular/Toaster-Service.md" diff --git a/docs/zh-Hans/Dapr/Index.md b/docs/zh-Hans/Dapr/Index.md index 64a9451737..a5237cbb71 100644 --- a/docs/zh-Hans/Dapr/Index.md +++ b/docs/zh-Hans/Dapr/Index.md @@ -60,29 +60,6 @@ Configure(options => } ```` -### 注入DaprClient - -ABP 将 `DaprClient` 类注册到 [依赖注入](../Dependency-Injection.md) 系统中.因此,你可以在需要时注入并使用它: - -````csharp -public class MyService : ITransientDependency -{ - private readonly DaprClient _daprClient; - - public MyService(DaprClient daprClient) - { - _daprClient = daprClient; - } - - public async Task DoItAsync() - { - // TODO: Use the injected _daprClient object - } -} -```` - -注入 `DaprClient` 是在应用程序代码中使用它的推荐方法.当你注入它时,将使用 `IAbpDaprClientFactory` 服务创建它,这会在下一节中将进行说明. - ### IAbpDaprClientFactory `IAbpDaprClientFactory` 可用于创建 `DaprClient` 或 `HttpClient` 对象来执行对 Dapr 的操作.它使用 `AbpDaprOptions`,因此你可以配置设置. @@ -113,15 +90,14 @@ public class MyService : ITransientDependency }); // Create an HttpClient object - HttpClient httpClient = await _daprClientFactory - .CreateHttpClientAsync("target-app-id"); + HttpClient httpClient = await _daprClientFactory.CreateHttpClientAsync("target-app-id"); } } ```` `CreateHttpClientAsync` 方法还获取可选的 `daprEndpoint` 和 `daprApiToken` 参数. -> ABP使用`IAbpDaprClientFactory`创建Dapr客户端.你也可以在应用程序中使用Dapr API创建客户端对象.推荐使用`IAbpDaprClientFactory`,但不是必需的. +> 你可以在应用程序中使用Dapr API创建客户端对象.推荐使用`IAbpDaprClientFactory`,但不是必需的. ## C# API 客户端代理集成 @@ -412,7 +388,7 @@ Configure(options => } ```` -一旦你设置了它,它就会在你注入`DaprClient`或使用`IAbpDaprClientFactory`时使用.如果你需要在应用程序中使用该值,你可以注入`IDaprApiTokenProvider`并使用其`GetDaprApiToken()`方法. +一旦你设置了它,它就会在使用`IAbpDaprClientFactory`时使用.如果你需要在应用程序中使用该值,你可以注入`IDaprApiTokenProvider`并使用其`GetDaprApiToken()`方法. ### App API Token diff --git a/docs/zh-Hans/Dependency-Injection.md b/docs/zh-Hans/Dependency-Injection.md index 2c22c123ab..4cc6616f52 100644 --- a/docs/zh-Hans/Dependency-Injection.md +++ b/docs/zh-Hans/Dependency-Injection.md @@ -310,6 +310,24 @@ public class AppModule : AbpModule > 注意, 如果服务类公开了多于一个服务或接口, `OnRegistered` 回调(callback)可能被同一服务类多次调用. 因此, 较安全的方法是使用 `Interceptors.TryAdd` 方法而不是 `Interceptors.Add` 方法. 请参阅动态代理(dynamic proxying)/拦截器 [文档](Dynamic-Proxying-Interceptors.md). +### IServiceCollection.OnActivated 事件 + +一旦服务完全构建完成`OnActivated`事件就会触发. 你可以执行依赖于服务已完全构建的的一些任务, 虽然这种情况可能很少见. + +````csharp +var serviceDescriptor = ServiceDescriptor.Transient(); +services.Add(serviceDescriptor); +if (setIsReadOnly) +{ + services.OnActivated(serviceDescriptor, x => + { + x.Instance.As().IsReadOnly = true; + }); +} +```` + +> 注意，`OnActivated`事件可以为一个`ServiceDescriptor`注册多次. + ## 第三方提供程序 虽然ABP框架没有对任何第三方DI提供程序的核心依赖, 但它必须使用一个提供程序来支持动态代理(dynamic proxying)和一些高级特性以便ABP特性能正常工作. diff --git a/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md index f45d4d90bf..57530e1d6f 100644 --- a/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md +++ b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md @@ -152,4 +152,14 @@ Configure(options => }); ```` +**示例：配置队列和交换机的额外参数** + +```csharp +Configure(options => +{ + options.ExchangeArguments["x-delayed-type"] = "direct"; + options.QueueArguments["x-message-ttl"] = 60000; +}); +``` + 使用这些选项类可以与 `appsettings.json` 组合在一起. 在代码中配置选项属性会覆盖配置文件中的值. diff --git a/docs/zh-Hans/Local-Event-Bus.md b/docs/zh-Hans/Local-Event-Bus.md index 9d7eb4b766..7a842a9e98 100644 --- a/docs/zh-Hans/Local-Event-Bus.md +++ b/docs/zh-Hans/Local-Event-Bus.md @@ -197,33 +197,20 @@ namespace AbpDemo 这个类订阅 `EntityCreatedEventData`,它在用户创建后发布. 你可能需要向新用户发送一封"欢迎"电子邮件. -这些事件有两种类型:过去时态的事件和进行时态的事件. - -### 用过去时态事件 - -当相关工作单元完成且实体更改成功保存到数据库时,将发布带有过去时态的事件. 如果在这些事件处理程序上抛出异常,则**无法回滚**事务,因为事务已经提交. - -事件类型; +有以下预定义的事件类型; * `EntityCreatedEventData` 当实体创建成功后发布. * `EntityUpdatedEventData` 当实体更新成功后发布. * `EntityDeletedEventData` 当实体删除成功后发布. * `EntityChangedEventData` 当实体创建,更新,删除后发布. 如果你需要监听任何类型的更改,它是一种快捷方式 - 而不是订阅单个事件. -### 用于进行时态事件 - -带有进行时态的事件在完成事务之前发布(如果数据库事务由所使用的数据库提供程序支持). 如果在这些事件处理程序上抛出异常,它**会回滚**事务,因为事务还没有完成,更改也没有保存到数据库中. - -事件类型; - -* `EntityCreatingEventData` 当新实体保存到数据库前发布. -* `EntityUpdatingEventData` 当已存在实体更新到数据库前发布. -* `EntityDeletingEventData` 删除实体前发布. -* `EntityChangingEventData` 当实体创建,更新,删除前发布. 如果你需要监听任何类型的更改,它是一种快捷方式 - 而不是订阅单个事件. - -#### 它是如何实现的? +### 它是如何实现的? 在将更改保存到数据库时发布预构建事件; * 对于 EF Core, 他们在 `DbContext.SaveChanges` 发布. * 对于 MongoDB, 在你调用仓储的 `InsertAsync`, `UpdateAsync` 或 `DeleteAsync` 方法发布(因为MongoDB没有更改追踪系统). + +## 另请参阅 + +* [分布式事件总线](Distributed-Event-Bus.md) \ No newline at end of file diff --git a/framework/Volo.Abp.abpmdl.json b/framework/Volo.Abp.abpmdl similarity index 76% rename from framework/Volo.Abp.abpmdl.json rename to framework/Volo.Abp.abpmdl index 68e65c4975..afc52ca801 100644 --- a/framework/Volo.Abp.abpmdl.json +++ b/framework/Volo.Abp.abpmdl @@ -7,839 +7,839 @@ }, "packages": { "AbpTestBase": { - "path": "test/AbpTestBase/AbpTestBase.abppkg.json", + "path": "test/AbpTestBase/AbpTestBase.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore": { - "path": "src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.abppkg.json", + "path": "src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Tests": { - "path": "test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.MultiTenancy.Tests": { - "path": "test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.abppkg.json", + "path": "test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.MultiTenancy": { - "path": "src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.MultiTenancy.Tests": { - "path": "test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.TestBase": { - "path": "src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.abppkg", "folder": "src" }, "Volo.Abp.EntityFrameworkCore": { - "path": "src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc": { - "path": "src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.abppkg", "folder": "src" }, "Volo.Abp.TestBase": { - "path": "src/Volo.Abp.TestBase/Volo.Abp.TestBase.abppkg.json", + "path": "src/Volo.Abp.TestBase/Volo.Abp.TestBase.abppkg", "folder": "src" }, "Volo.Abp.MongoDB": { - "path": "src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.abppkg.json", + "path": "src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.abppkg", "folder": "src" }, "Volo.Abp.Autofac": { - "path": "src/Volo.Abp.Autofac/Volo.Abp.Autofac.abppkg.json", + "path": "src/Volo.Abp.Autofac/Volo.Abp.Autofac.abppkg", "folder": "src" }, "Volo.Abp.Castle.Core": { - "path": "src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.abppkg.json", + "path": "src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.abppkg", "folder": "src" }, "Volo.Abp.Autofac.Tests": { - "path": "test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.abppkg.json", + "path": "test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.abppkg", "folder": "test" }, "Volo.Abp.Castle.Core.Tests": { - "path": "test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.abppkg.json", + "path": "test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.abppkg", "folder": "test" }, "Volo.Abp.AutoMapper": { - "path": "src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.abppkg.json", + "path": "src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.abppkg", "folder": "src" }, "Volo.Abp.AutoMapper.Tests": { - "path": "test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.abppkg.json", + "path": "test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Mvc.Tests": { - "path": "test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.abppkg", "folder": "test" }, "Volo.Abp.TestApp": { - "path": "test/Volo.Abp.TestApp/Volo.Abp.TestApp.abppkg.json", + "path": "test/Volo.Abp.TestApp/Volo.Abp.TestApp.abppkg", "folder": "test" }, "Volo.Abp.MemoryDb": { - "path": "src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.abppkg.json", + "path": "src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.abppkg", "folder": "src" }, "Volo.Abp.MemoryDb.Tests": { - "path": "test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.abppkg.json", + "path": "test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.abppkg", "folder": "test" }, "Volo.Abp.TestApp.Tests": { - "path": "test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.abppkg.json", + "path": "test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.abppkg", "folder": "test" }, "Volo.Abp.Http": { - "path": "src/Volo.Abp.Http/Volo.Abp.Http.abppkg.json", + "path": "src/Volo.Abp.Http/Volo.Abp.Http.abppkg", "folder": "src" }, "Volo.Abp.Http.Client": { - "path": "src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.abppkg.json", + "path": "src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.abppkg", "folder": "src" }, "Volo.Abp.Http.Client.Tests": { - "path": "test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.abppkg.json", + "path": "test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.abppkg", "folder": "test" }, "Volo.Abp.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "SimpleConsoleDemo": { - "path": "test/SimpleConsoleDemo/SimpleConsoleDemo.abppkg.json", + "path": "test/SimpleConsoleDemo/SimpleConsoleDemo.abppkg", "folder": "test" }, "Volo.Abp.EntityFrameworkCore.Tests.SecondContext": { - "path": "test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.abppkg.json", + "path": "test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Mvc.Versioning.Tests": { - "path": "test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.abppkg", "folder": "test" }, "Volo.Abp.VirtualFileSystem": { - "path": "src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.abppkg.json", + "path": "src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.abppkg", "folder": "src" }, "Volo.Abp.VirtualFileSystem.Tests": { - "path": "test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.abppkg.json", + "path": "test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.abppkg", "folder": "test" }, "Volo.Abp.Core": { - "path": "src/Volo.Abp.Core/Volo.Abp.Core.abppkg.json", + "path": "src/Volo.Abp.Core/Volo.Abp.Core.abppkg", "folder": "src" }, "Volo.Abp.Localization": { - "path": "src/Volo.Abp.Localization/Volo.Abp.Localization.abppkg.json", + "path": "src/Volo.Abp.Localization/Volo.Abp.Localization.abppkg", "folder": "src" }, "Volo.Abp.Localization.Tests": { - "path": "test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.abppkg.json", + "path": "test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.abppkg", "folder": "test" }, "Volo.Abp.Core.Tests": { - "path": "test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.abppkg.json", + "path": "test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.abppkg", "folder": "test" }, "Volo.Abp.ApiVersioning.Abstractions": { - "path": "src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.abppkg.json", + "path": "src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.Data": { - "path": "src/Volo.Abp.Data/Volo.Abp.Data.abppkg.json", + "path": "src/Volo.Abp.Data/Volo.Abp.Data.abppkg", "folder": "src" }, "Volo.Abp.Data.Tests": { - "path": "test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.abppkg.json", + "path": "test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.abppkg", "folder": "test" }, "Volo.Abp.MultiTenancy": { - "path": "src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.abppkg.json", + "path": "src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.abppkg", "folder": "src" }, "Volo.Abp.ObjectMapping": { - "path": "src/Volo.Abp.ObjectMapping/Volo.Abp.ObjectMapping.abppkg.json", + "path": "src/Volo.Abp.ObjectMapping/Volo.Abp.ObjectMapping.abppkg", "folder": "src" }, "Volo.Abp.Validation": { - "path": "src/Volo.Abp.Validation/Volo.Abp.Validation.abppkg.json", + "path": "src/Volo.Abp.Validation/Volo.Abp.Validation.abppkg", "folder": "src" }, "Volo.Abp.Validation.Tests": { - "path": "test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.abppkg.json", + "path": "test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.abppkg", "folder": "test" }, "Volo.Abp.Security": { - "path": "src/Volo.Abp.Security/Volo.Abp.Security.abppkg.json", + "path": "src/Volo.Abp.Security/Volo.Abp.Security.abppkg", "folder": "src" }, "Volo.Abp.Guids": { - "path": "src/Volo.Abp.Guids/Volo.Abp.Guids.abppkg.json", + "path": "src/Volo.Abp.Guids/Volo.Abp.Guids.abppkg", "folder": "src" }, "Volo.Abp.Threading": { - "path": "src/Volo.Abp.Threading/Volo.Abp.Threading.abppkg.json", + "path": "src/Volo.Abp.Threading/Volo.Abp.Threading.abppkg", "folder": "src" }, "Volo.Abp.Ddd.Tests": { - "path": "test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.abppkg.json", + "path": "test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.abppkg", "folder": "test" }, "Volo.Abp.Http.Abstractions": { - "path": "src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.abppkg.json", + "path": "src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.Authorization": { - "path": "src/Volo.Abp.Authorization/Volo.Abp.Authorization.abppkg.json", + "path": "src/Volo.Abp.Authorization/Volo.Abp.Authorization.abppkg", "folder": "src" }, "Volo.Abp.Json": { - "path": "src/Volo.Abp.Json/Volo.Abp.Json.abppkg.json", + "path": "src/Volo.Abp.Json/Volo.Abp.Json.abppkg", "folder": "src" }, "Volo.Abp.Timing": { - "path": "src/Volo.Abp.Timing/Volo.Abp.Timing.abppkg.json", + "path": "src/Volo.Abp.Timing/Volo.Abp.Timing.abppkg", "folder": "src" }, "Volo.Abp.UI": { - "path": "src/Volo.Abp.UI/Volo.Abp.UI.abppkg.json", + "path": "src/Volo.Abp.UI/Volo.Abp.UI.abppkg", "folder": "src" }, "Volo.Abp.UI.Navigation": { - "path": "src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.abppkg.json", + "path": "src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.abppkg", "folder": "src" }, "Volo.Abp.UI.Navigation.Tests": { - "path": "test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.abppkg.json", + "path": "test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.abppkg", "folder": "test" }, "Volo.Abp.Settings": { - "path": "src/Volo.Abp.Settings/Volo.Abp.Settings.abppkg.json", + "path": "src/Volo.Abp.Settings/Volo.Abp.Settings.abppkg", "folder": "src" }, "Volo.Abp.Caching": { - "path": "src/Volo.Abp.Caching/Volo.Abp.Caching.abppkg.json", + "path": "src/Volo.Abp.Caching/Volo.Abp.Caching.abppkg", "folder": "src" }, "Volo.Abp.EventBus": { - "path": "src/Volo.Abp.EventBus/Volo.Abp.EventBus.abppkg.json", + "path": "src/Volo.Abp.EventBus/Volo.Abp.EventBus.abppkg", "folder": "src" }, "Volo.Abp.EventBus.Tests": { - "path": "test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.abppkg.json", + "path": "test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.abppkg", "folder": "test" }, "Volo.Abp.Caching.Tests": { - "path": "test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.abppkg.json", + "path": "test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.abppkg", "folder": "test" }, "Volo.Abp.Serialization": { - "path": "src/Volo.Abp.Serialization/Volo.Abp.Serialization.abppkg.json", + "path": "src/Volo.Abp.Serialization/Volo.Abp.Serialization.abppkg", "folder": "src" }, "Volo.Abp.Serialization.Tests": { - "path": "test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.abppkg.json", + "path": "test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.abppkg", "folder": "test" }, "Volo.Abp.Authorization.Tests": { - "path": "test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.abppkg.json", + "path": "test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Authentication.OAuth": { - "path": "src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Authentication.OAuth.Tests": { - "path": "test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.abppkg", "folder": "test" }, "Volo.Abp.Uow": { - "path": "src/Volo.Abp.Uow/Volo.Abp.Uow.abppkg.json", + "path": "src/Volo.Abp.Uow/Volo.Abp.Uow.abppkg", "folder": "src" }, "Volo.Abp.Uow.Tests": { - "path": "test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.abppkg.json", + "path": "test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.abppkg", "folder": "test" }, "Volo.Abp.Ddd.Domain": { - "path": "src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.abppkg.json", + "path": "src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.abppkg", "folder": "src" }, "Volo.Abp.Ddd.Application": { - "path": "src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.abppkg.json", + "path": "src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.abppkg", "folder": "src" }, "Volo.Abp.Auditing": { - "path": "src/Volo.Abp.Auditing/Volo.Abp.Auditing.abppkg.json", + "path": "src/Volo.Abp.Auditing/Volo.Abp.Auditing.abppkg", "folder": "src" }, "Volo.Abp.Auditing.Tests": { - "path": "test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.abppkg.json", + "path": "test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.abppkg", "folder": "test" }, "Volo.Abp.MongoDB.Tests": { - "path": "test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.EntityFrameworkCore.SqlServer": { - "path": "src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.abppkg.json", + "path": "src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.abppkg", "folder": "src" }, "Volo.Abp.EventBus.RabbitMQ": { - "path": "src/Volo.Abp.EventBus.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.abppkg.json", + "path": "src/Volo.Abp.EventBus.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Tests": { - "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.abppkg", "folder": "test" }, "Volo.Abp.Emailing": { - "path": "src/Volo.Abp.Emailing/Volo.Abp.Emailing.abppkg.json", + "path": "src/Volo.Abp.Emailing/Volo.Abp.Emailing.abppkg", "folder": "src" }, "Volo.Abp.Sms": { - "path": "src/Volo.Abp.Sms/Volo.Abp.Sms.abppkg.json", + "path": "src/Volo.Abp.Sms/Volo.Abp.Sms.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Bundling": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Packages": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.abppkg", "folder": "src" }, "Volo.Abp.EntityFrameworkCore.MySQL": { - "path": "src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.abppkg.json", + "path": "src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs": { - "path": "src/Volo.Abp.BackgroundJobs/Volo.Abp.BackgroundJobs.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs/Volo.Abp.BackgroundJobs.abppkg", "folder": "src" }, "Volo.Abp.BackgroundWorkers": { - "path": "src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.abppkg.json", + "path": "src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.Tests": { - "path": "test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.abppkg.json", + "path": "test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.abppkg", "folder": "test" }, "Volo.Abp.BackgroundJobs.Abstractions": { - "path": "src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.HangFire": { - "path": "src/Volo.Abp.BackgroundJobs.HangFire/Volo.Abp.BackgroundJobs.HangFire.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.HangFire/Volo.Abp.BackgroundJobs.HangFire.abppkg", "folder": "src" }, "Volo.Abp.HangFire": { - "path": "src/Volo.Abp.HangFire/Volo.Abp.HangFire.abppkg.json", + "path": "src/Volo.Abp.HangFire/Volo.Abp.HangFire.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.RabbitMQ": { - "path": "src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo.Abp.BackgroundJobs.RabbitMQ.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo.Abp.BackgroundJobs.RabbitMQ.abppkg", "folder": "src" }, "Volo.Abp.RabbitMQ": { - "path": "src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.abppkg.json", + "path": "src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.abppkg", "folder": "src" }, "Volo.Abp.Emailing.Tests": { - "path": "test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.abppkg.json", + "path": "test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.abppkg", "folder": "src" }, "Volo.Abp.EntityFrameworkCore.PostgreSql": { - "path": "src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.abppkg.json", + "path": "src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.abppkg", "folder": "src" }, "Volo.Abp.Localization.Abstractions": { - "path": "src/Volo.Abp.Localization.Abstractions/Volo.Abp.Localization.Abstractions.abppkg.json", + "path": "src/Volo.Abp.Localization.Abstractions/Volo.Abp.Localization.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.Security.Tests": { - "path": "test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.abppkg.json", + "path": "test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.abppkg", "folder": "test" }, "Volo.Abp.Settings.Tests": { - "path": "test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.abppkg.json", + "path": "test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.abppkg", "folder": "test" }, "Volo.Abp.Http.Client.IdentityModel": { - "path": "src/Volo.Abp.Http.Client.IdentityModel/Volo.Abp.Http.Client.IdentityModel.abppkg.json", + "path": "src/Volo.Abp.Http.Client.IdentityModel/Volo.Abp.Http.Client.IdentityModel.abppkg", "folder": "src" }, "Volo.Abp.IdentityModel": { - "path": "src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.abppkg.json", + "path": "src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.Client": { - "path": "src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.Contracts": { - "path": "src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.abppkg", "folder": "src" }, "Volo.Abp.Features": { - "path": "src/Volo.Abp.Features/Volo.Abp.Features.abppkg.json", + "path": "src/Volo.Abp.Features/Volo.Abp.Features.abppkg", "folder": "src" }, "Volo.Abp.Features.Tests": { - "path": "test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.abppkg.json", + "path": "test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Authentication.JwtBearer": { - "path": "src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.abppkg", "folder": "src" }, "Volo.Abp.Cli": { - "path": "src/Volo.Abp.Cli/Volo.Abp.Cli.abppkg.json", + "path": "src/Volo.Abp.Cli/Volo.Abp.Cli.abppkg", "folder": "src" }, "Volo.Abp.FluentValidation": { - "path": "src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.abppkg.json", + "path": "src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.abppkg", "folder": "src" }, "Volo.Abp.FluentValidation.Tests": { - "path": "test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.abppkg.json", + "path": "test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.abppkg", "folder": "test" }, "Volo.Abp.EntityFrameworkCore.Sqlite": { - "path": "src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.abppkg.json", + "path": "src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.abppkg", "folder": "src" }, "Volo.Abp.Cli.Core": { - "path": "src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.abppkg.json", + "path": "src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.abppkg", "folder": "src" }, "Volo.Abp.Specifications": { - "path": "src/Volo.Abp.Specifications/Volo.Abp.Specifications.abppkg.json", + "path": "src/Volo.Abp.Specifications/Volo.Abp.Specifications.abppkg", "folder": "src" }, "Volo.Abp.Specifications.Tests": { - "path": "test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.abppkg.json", + "path": "test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.abppkg", "folder": "test" }, "Volo.Abp.Cli.Core.Tests": { - "path": "test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.abppkg.json", + "path": "test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Mvc.UI.Widgets": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.abppkg", "folder": "src" }, "Volo.Abp.Ldap": { - "path": "src/Volo.Abp.Ldap/Volo.Abp.Ldap.abppkg.json", + "path": "src/Volo.Abp.Ldap/Volo.Abp.Ldap.abppkg", "folder": "src" }, "Volo.Abp.Ldap.Tests": { - "path": "test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.abppkg.json", + "path": "test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.abppkg", "folder": "test" }, "Volo.Abp.Dapper": { - "path": "src/Volo.Abp.Dapper/Volo.Abp.Dapper.abppkg.json", + "path": "src/Volo.Abp.Dapper/Volo.Abp.Dapper.abppkg", "folder": "src" }, "Volo.Abp.Dapper.Tests": { - "path": "test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.abppkg.json", + "path": "test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.abppkg", "folder": "test" }, "Volo.Abp.MailKit": { - "path": "src/Volo.Abp.MailKit/Volo.Abp.MailKit.abppkg.json", + "path": "src/Volo.Abp.MailKit/Volo.Abp.MailKit.abppkg", "folder": "src" }, "Volo.Abp.MailKit.Tests": { - "path": "test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.abppkg.json", + "path": "test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.abppkg", "folder": "test" }, "Volo.Abp.ObjectMapping.Tests": { - "path": "test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.abppkg.json", + "path": "test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.abppkg", "folder": "test" }, "Volo.Abp.Ddd.Application.Contracts": { - "path": "src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.abppkg.json", + "path": "src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.abppkg", "folder": "src" }, "Volo.Abp.Minify": { - "path": "src/Volo.Abp.Minify/Volo.Abp.Minify.abppkg.json", + "path": "src/Volo.Abp.Minify/Volo.Abp.Minify.abppkg", "folder": "src" }, "Volo.Abp.Minify.Tests": { - "path": "test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.abppkg.json", + "path": "test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Serilog": { - "path": "src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Serilog.Tests": { - "path": "test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.abppkg", "folder": "test" }, "Volo.Abp.Http.Client.IdentityModel.Web": { - "path": "src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.abppkg.json", + "path": "src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.Quartz": { - "path": "src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.abppkg", "folder": "src" }, "Volo.Abp.Quartz": { - "path": "src/Volo.Abp.Quartz/Volo.Abp.Quartz.abppkg.json", + "path": "src/Volo.Abp.Quartz/Volo.Abp.Quartz.abppkg", "folder": "src" }, "Volo.Abp.BackgroundWorkers.Quartz": { - "path": "src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.abppkg.json", + "path": "src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.abppkg", "folder": "src" }, "Volo.Abp.Http.Client.IdentityModel.Web.Tests": { - "path": "test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.abppkg.json", + "path": "test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.abppkg", "folder": "test" }, "Volo.Abp.ObjectExtending": { - "path": "src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.abppkg.json", + "path": "src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.abppkg", "folder": "src" }, "Volo.Abp.ObjectExtending.Tests": { - "path": "test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.abppkg.json", + "path": "test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.abppkg", "folder": "test" }, "Volo.Abp.TextTemplating": { - "path": "src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.abppkg.json", + "path": "src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.abppkg", "folder": "src" }, "Volo.Abp.TextTemplating.Tests": { - "path": "test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.abppkg.json", + "path": "test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.abppkg", "folder": "test" }, "Volo.Abp.Validation.Abstractions": { - "path": "src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.abppkg.json", + "path": "src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.SignalR": { - "path": "src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.SignalR.Tests": { - "path": "test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests": { - "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring": { - "path": "src/Volo.Abp.BlobStoring/Volo.Abp.BlobStoring.abppkg.json", + "path": "src/Volo.Abp.BlobStoring/Volo.Abp.BlobStoring.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Tests": { - "path": "test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring.FileSystem": { - "path": "src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.FileSystem.Tests": { - "path": "test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.abppkg", "folder": "test" }, "Volo.Abp.EntityFrameworkCore.Oracle.Devart": { - "path": "src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.abppkg.json", + "path": "src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Azure": { - "path": "src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Azure.Tests": { - "path": "test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring.Minio": { - "path": "src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Minio.Tests": { - "path": "test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.abppkg", "folder": "test" }, "Volo.Abp.EntityFrameworkCore.Oracle": { - "path": "src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.abppkg.json", + "path": "src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.abppkg", "folder": "src" }, "Volo.Abp.Caching.StackExchangeRedis": { - "path": "src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.abppkg.json", + "path": "src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.abppkg", "folder": "src" }, "Volo.Abp.Caching.StackExchangeRedis.Tests": { - "path": "test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.abppkg.json", + "path": "test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring.Aliyun": { - "path": "src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Aliyun.Tests": { - "path": "test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring.Aws": { - "path": "src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Aws.Tests": { - "path": "test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.abppkg", "folder": "test" }, "Volo.Abp.Kafka": { - "path": "src/Volo.Abp.Kafka/Volo.Abp.Kafka.abppkg.json", + "path": "src/Volo.Abp.Kafka/Volo.Abp.Kafka.abppkg", "folder": "src" }, "Volo.Abp.EventBus.Kafka": { - "path": "src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.abppkg.json", + "path": "src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.abppkg", "folder": "src" }, "Volo.Abp.GlobalFeatures": { - "path": "src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.abppkg.json", + "path": "src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.abppkg", "folder": "src" }, "Volo.Abp.GlobalFeatures.Tests": { - "path": "test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.abppkg.json", + "path": "test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.abppkg", "folder": "test" }, "Volo.Abp.MultiLingualObjects": { - "path": "src/Volo.Abp.MultiLingualObjects/Volo.Abp.MultiLingualObjects.abppkg.json", + "path": "src/Volo.Abp.MultiLingualObjects/Volo.Abp.MultiLingualObjects.abppkg", "folder": "src" }, "Volo.Abp.MultiLingualObjects.Tests": { - "path": "test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.abppkg.json", + "path": "test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.abppkg", "folder": "test" }, "Volo.Abp.Http.Client.IdentityModel.WebAssembly": { - "path": "src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.Client.Common": { - "path": "src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Components.WebAssembly": { - "path": "src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Components.WebAssembly.Theming": { - "path": "src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.abppkg", "folder": "src" }, "Volo.Abp.Autofac.WebAssembly": { - "path": "src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Authentication.OpenIdConnect": { - "path": "src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.abppkg", "folder": "src" }, "Volo.Abp.EventBus.Rebus": { - "path": "src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.abppkg.json", + "path": "src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.abppkg", "folder": "src" }, "Volo.Abp.ExceptionHandling": { - "path": "src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.abppkg.json", + "path": "src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Components": { - "path": "src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.abppkg", "folder": "src" }, "Volo.Abp.Swashbuckle": { - "path": "src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.abppkg.json", + "path": "src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.abppkg", "folder": "src" }, "Volo.Abp.Json.Tests": { - "path": "test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.abppkg.json", + "path": "test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.abppkg", "folder": "test" }, "Volo.Abp.Http.Tests": { - "path": "test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.abppkg.json", + "path": "test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Components.Web": { - "path": "src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Components.Web.Theming": { - "path": "src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.abppkg", "folder": "src" }, "Volo.Abp.EventBus.Abstractions": { - "path": "src/Volo.Abp.EventBus.Abstractions/Volo.Abp.EventBus.Abstractions.abppkg.json", + "path": "src/Volo.Abp.EventBus.Abstractions/Volo.Abp.EventBus.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.Sms.Aliyun": { - "path": "src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.abppkg.json", + "path": "src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.abppkg", "folder": "src" }, "Volo.Abp.Sms.Aliyun.Tests": { - "path": "test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.abppkg.json", + "path": "test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Components.Server": { - "path": "src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Components.Server.Theming": { - "path": "src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.AzureServiceBus": { - "path": "src/Volo.Abp.AzureServiceBus/Volo.Abp.AzureServiceBus.abppkg.json", + "path": "src/Volo.Abp.AzureServiceBus/Volo.Abp.AzureServiceBus.abppkg", "folder": "src" }, "Volo.Abp.EventBus.Azure": { - "path": "src/Volo.Abp.EventBus.Azure/Volo.Abp.EventBus.Azure.abppkg.json", + "path": "src/Volo.Abp.EventBus.Azure/Volo.Abp.EventBus.Azure.abppkg", "folder": "src" }, "Volo.Abp.Authorization.Abstractions": { - "path": "src/Volo.Abp.Authorization.Abstractions/Volo.Abp.Authorization.Abstractions.abppkg.json", + "path": "src/Volo.Abp.Authorization.Abstractions/Volo.Abp.Authorization.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.TextTemplating.Core": { - "path": "src/Volo.Abp.TextTemplating.Core/Volo.Abp.TextTemplating.Core.abppkg.json", + "path": "src/Volo.Abp.TextTemplating.Core/Volo.Abp.TextTemplating.Core.abppkg", "folder": "src" }, "Volo.Abp.TextTemplating.Scriban": { - "path": "src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.abppkg.json", + "path": "src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.abppkg", "folder": "src" }, "Volo.Abp.TextTemplating.Razor": { - "path": "src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.abppkg.json", + "path": "src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.abppkg", "folder": "src" }, "Volo.Abp.TextTemplating.Razor.Tests": { - "path": "test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.abppkg.json", + "path": "test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.abppkg", "folder": "test" }, "Volo.Abp.TextTemplating.Scriban.Tests": { - "path": "test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.abppkg.json", + "path": "test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.abppkg", "folder": "test" }, "Volo.Abp.MongoDB.Tests.SecondContext": { - "path": "test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.abppkg.json", + "path": "test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.abppkg", "folder": "test" }, "Volo.Abp.IdentityModel.Tests": { - "path": "test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.abppkg.json", + "path": "test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.abppkg", "folder": "test" }, "Volo.Abp.Threading.Tests": { - "path": "test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.abppkg.json", + "path": "test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.abppkg", "folder": "test" }, "Volo.Abp.DistributedLocking": { - "path": "src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.abppkg.json", + "path": "src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.abppkg", "folder": "src" }, "Volo.Abp.Auditing.Contracts": { - "path": "src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.abppkg.json", + "path": "src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.abppkg", "folder": "src" }, "Volo.Abp.Http.Client.Web": { - "path": "src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.abppkg.json", + "path": "src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.abppkg", "folder": "src" }, "Volo.Abp.DistributedLocking.Abstractions": { - "path": "src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.abppkg.json", + "path": "src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.DistributedLocking.Abstractions.Tests": { - "path": "test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.abppkg.json", + "path": "test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.abppkg", "folder": "test" }, "Volo.Abp.BackgroundWorkers.Hangfire": { - "path": "src/Volo.Abp.BackgroundWorkers.Hangfire/Volo.Abp.BackgroundWorkers.Hangfire.abppkg.json", + "path": "src/Volo.Abp.BackgroundWorkers.Hangfire/Volo.Abp.BackgroundWorkers.Hangfire.abppkg", "folder": "src" }, "Volo.Abp.Gdpr.Abstractions": { - "path": "src/Volo.Abp.Gdpr.Abstractions/Volo.Abp.Gdpr.Abstractions.abppkg.json", + "path": "src/Volo.Abp.Gdpr.Abstractions/Volo.Abp.Gdpr.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.RemoteServices": { - "path": "src/Volo.Abp.RemoteServices/Volo.Abp.RemoteServices.abppkg.json", + "path": "src/Volo.Abp.RemoteServices/Volo.Abp.RemoteServices.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.PlugIn": { - "path": "test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.abppkg", "folder": "test" }, "Volo.Abp.Json.Newtonsoft": { - "path": "src/Volo.Abp.Json.Newtonsoft/Volo.Abp.Json.Newtonsoft.abppkg.json", + "path": "src/Volo.Abp.Json.Newtonsoft/Volo.Abp.Json.Newtonsoft.abppkg", "folder": "src" }, "Volo.Abp.Json.SystemTextJson": { - "path": "src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.abppkg.json", + "path": "src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.abppkg", "folder": "src" }, "Volo.Abp.Json.Abstractions": { - "path": "src/Volo.Abp.Json.Abstractions/Volo.Abp.Json.Abstractions.abppkg.json", + "path": "src/Volo.Abp.Json.Abstractions/Volo.Abp.Json.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.NewtonsoftJson": { - "path": "src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson.abppkg", "folder": "src" }, "Volo.Abp.Dapr": { - "path": "src/Volo.Abp.Dapr/Volo.Abp.Dapr.abppkg.json", + "path": "src/Volo.Abp.Dapr/Volo.Abp.Dapr.abppkg", "folder": "src" }, "Volo.Abp.EventBus.Dapr": { - "path": "src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.abppkg.json", + "path": "src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.abppkg", "folder": "src" }, "Volo.Abp.Http.Client.Dapr": { - "path": "src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.abppkg.json", + "path": "src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.Dapr": { - "path": "src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.Dapr.EventBus": { - "path": "src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.abppkg", "folder": "src" }, "Volo.Abp.DistributedLocking.Dapr": { - "path": "src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.abppkg.json", + "path": "src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.abppkg", "folder": "src" } } diff --git a/framework/Volo.Abp.abpsln.json b/framework/Volo.Abp.abpsln similarity index 64% rename from framework/Volo.Abp.abpsln.json rename to framework/Volo.Abp.abpsln index 36a045623e..2f34cdcfbe 100644 --- a/framework/Volo.Abp.abpsln.json +++ b/framework/Volo.Abp.abpsln @@ -2,7 +2,7 @@ "template": "empty", "modules": { "Volo.Abp": { - "path": "Volo.Abp.abpmdl.json" + "path": "Volo.Abp.abpmdl" } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.abppkg.json b/framework/src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.abppkg.json rename to framework/src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Microsoft/Extensions/DependencyInjection/AbpJwtBearerExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Microsoft/Extensions/DependencyInjection/AbpJwtBearerExtensions.cs new file mode 100644 index 0000000000..5f48cc92d5 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Microsoft/Extensions/DependencyInjection/AbpJwtBearerExtensions.cs @@ -0,0 +1,36 @@ +using System; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Volo.Abp.Security.Claims; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class AbpJwtBearerExtensions +{ + public static AuthenticationBuilder AddAbpJwtBearer(this AuthenticationBuilder builder) + => builder.AddAbpJwtBearer(JwtBearerDefaults.AuthenticationScheme, _ => { }); + + public static AuthenticationBuilder AddAbpJwtBearer(this AuthenticationBuilder builder, Action configureOptions) + => builder.AddAbpJwtBearer(JwtBearerDefaults.AuthenticationScheme, configureOptions); + + public static AuthenticationBuilder AddAbpJwtBearer(this AuthenticationBuilder builder, string authenticationScheme, Action configureOptions) + => builder.AddAbpJwtBearer(authenticationScheme, "Bearer", configureOptions); + + public static AuthenticationBuilder AddAbpJwtBearer(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action configureOptions) + { + builder.Services.Configure(options => + { + var jwtBearerOption = new JwtBearerOptions(); + configureOptions?.Invoke(jwtBearerOption); + if (!jwtBearerOption.Authority.IsNullOrEmpty()) + { + options.RemoteRefreshUrl = jwtBearerOption.Authority.RemovePostFix("/") + options.RemoteRefreshUrl; + } + }); + + return builder.AddJwtBearer(authenticationScheme, displayName, options => + { + configureOptions?.Invoke(options); + }); + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj index a0f4b31158..d43da06dde 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj @@ -18,10 +18,12 @@ + + diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/AbpAspNetCoreAuthenticationJwtBearerModule.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/AbpAspNetCoreAuthenticationJwtBearerModule.cs index 1fa5077a91..89d957fe57 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/AbpAspNetCoreAuthenticationJwtBearerModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/AbpAspNetCoreAuthenticationJwtBearerModule.cs @@ -1,10 +1,25 @@ -using Volo.Abp.Modularity; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.Authentication.JwtBearer.DynamicClaims; +using Volo.Abp.Caching; +using Volo.Abp.Modularity; using Volo.Abp.Security; +using Volo.Abp.Security.Claims; namespace Volo.Abp.AspNetCore.Authentication.JwtBearer; -[DependsOn(typeof(AbpSecurityModule))] +[DependsOn(typeof(AbpSecurityModule), typeof(AbpCachingModule))] public class AbpAspNetCoreAuthenticationJwtBearerModule : AbpModule { + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddHttpClient(); + context.Services.AddHttpContextAccessor(); + if (context.Services.ExecutePreConfiguredActions().IsEnabled && + context.Services.ExecutePreConfiguredActions().IsRemoteRefreshEnabled) + { + context.Services.AddTransient(); + context.Services.AddTransient(); + } + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributor.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributor.cs new file mode 100644 index 0000000000..454977b4b6 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributor.cs @@ -0,0 +1,10 @@ +using Volo.Abp.DependencyInjection; +using Volo.Abp.Security.Claims; + +namespace Volo.Abp.AspNetCore.Authentication.JwtBearer.DynamicClaims; + +[DisableConventionalRegistration] +public class WebRemoteDynamicClaimsPrincipalContributor : RemoteDynamicClaimsPrincipalContributorBase +{ + +} diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributorCache.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributorCache.cs new file mode 100644 index 0000000000..3a3b16131d --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributorCache.cs @@ -0,0 +1,75 @@ +using System; +using System.Net.Http; +using System.Threading.Tasks; +using IdentityModel.Client; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Volo.Abp.Caching; +using Volo.Abp.Security.Claims; + +namespace Volo.Abp.AspNetCore.Authentication.JwtBearer.DynamicClaims; + +public class WebRemoteDynamicClaimsPrincipalContributorCache : RemoteDynamicClaimsPrincipalContributorCacheBase +{ + public const string HttpClientName = nameof(WebRemoteDynamicClaimsPrincipalContributorCache); + + protected IDistributedCache Cache { get; } + protected IHttpClientFactory HttpClientFactory { get; } + protected IHttpContextAccessor HttpContextAccessor { get; } + protected IOptions Options { get; } + + public WebRemoteDynamicClaimsPrincipalContributorCache( + IDistributedCache cache, + IHttpClientFactory httpClientFactory, + IOptions abpClaimsPrincipalFactoryOptions, + IHttpContextAccessor httpContextAccessor, + IOptions options) + : base(abpClaimsPrincipalFactoryOptions) + { + Cache = cache; + HttpClientFactory = httpClientFactory; + HttpContextAccessor = httpContextAccessor; + Options = options; + } + + protected async override Task GetCacheAsync(Guid userId, Guid? tenantId = null) + { + return await Cache.GetAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId)); + } + + protected async override Task RefreshAsync(Guid userId, Guid? tenantId = null) + { + try + { + if (HttpContextAccessor.HttpContext == null) + { + throw new AbpException($"Failed to refresh remote claims for user: {userId} - HttpContext is null!"); + } + + var authenticateResult = await HttpContextAccessor.HttpContext.AuthenticateAsync(Options.Value.AuthenticationScheme); + if (!authenticateResult.Succeeded) + { + throw new AbpException($"Failed to refresh remote claims for user: {userId} - authentication failed!"); + } + + var accessToken = authenticateResult.Properties?.GetTokenValue("access_token"); + if (accessToken.IsNullOrWhiteSpace()) + { + throw new AbpException($"Failed to refresh remote claims for user: {userId} - access_token is null or empty!"); + } + + var client = HttpClientFactory.CreateClient(HttpClientName); + var requestMessage = new HttpRequestMessage(HttpMethod.Post, AbpClaimsPrincipalFactoryOptions.Value.RemoteRefreshUrl); + requestMessage.SetBearerToken(accessToken); + var response = await client.SendAsync(requestMessage); + response.EnsureSuccessStatusCode(); + } + catch (Exception e) + { + Logger.LogWarning(e, $"Failed to refresh remote claims for user: {userId}"); + throw; + } + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributorOptions.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributorOptions.cs new file mode 100644 index 0000000000..1d51a29661 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo/Abp/AspNetCore/Authentication/JwtBearer/DynamicClaims/WebRemoteDynamicClaimsPrincipalContributorOptions.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Authentication.JwtBearer; + +namespace Volo.Abp.AspNetCore.Authentication.JwtBearer.DynamicClaims; + +public class WebRemoteDynamicClaimsPrincipalContributorOptions +{ + public bool IsEnabled { get; set; } + + public string AuthenticationScheme { get; set; } + + public WebRemoteDynamicClaimsPrincipalContributorOptions() + { + IsEnabled = false; + AuthenticationScheme = JwtBearerDefaults.AuthenticationScheme; + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs index 7d2c1fe6d6..d07cca857f 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Volo.Abp.AspNetCore.Authentication.OpenIdConnect; using Volo.Abp.AspNetCore.MultiTenancy; +using Volo.Abp.Security.Claims; namespace Microsoft.Extensions.DependencyInjection; @@ -24,6 +25,16 @@ public static class AbpOpenIdConnectExtensions public static AuthenticationBuilder AddAbpOpenIdConnect(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action configureOptions) { + builder.Services.Configure(options => + { + var openIdConnectOptions = new OpenIdConnectOptions(); + configureOptions?.Invoke(openIdConnectOptions); + if (!openIdConnectOptions.Authority.IsNullOrEmpty()) + { + options.RemoteRefreshUrl = openIdConnectOptions.Authority.RemovePostFix("/") + options.RemoteRefreshUrl; + } + }); + return builder.AddOpenIdConnect(authenticationScheme, displayName, options => { options.ClaimActions.MapAbpClaimTypes(); @@ -38,7 +49,7 @@ public static class AbpOpenIdConnectExtensions }; options.AccessDeniedPath = "/"; - + options.Events.OnTokenValidated = async (context) => { var client = context.HttpContext.RequestServices.GetRequiredService(); diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs index 6da6e12cf4..60ee5c7b20 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.Net; +using System.Net.Http; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting.StaticWebAssets; using Microsoft.AspNetCore.Http.Connections; @@ -8,6 +10,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Hosting; using Volo.Abp.AspNetCore.Auditing; +using Volo.Abp.AspNetCore.Components.Server.Extensibility; using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.SignalR; @@ -30,7 +33,11 @@ public class AbpAspNetCoreComponentsServerModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { StaticWebAssetsLoader.UseStaticWebAssets(context.Services.GetHostingEnvironment(), context.Services.GetConfiguration()); - context.Services.AddHttpClient(); + context.Services.AddHttpClient(nameof(BlazorServerLookupApiRequestService)) + .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler + { + AutomaticDecompression = DecompressionMethods.All + }); var serverSideBlazorBuilder = context.Services.AddServerSideBlazor(options => { if (context.Services.GetHostingEnvironment().IsDevelopment()) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/Extensibility/BlazorServerLookupApiRequestService.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/Extensibility/BlazorServerLookupApiRequestService.cs index 00a5086031..3211aec50d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/Extensibility/BlazorServerLookupApiRequestService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/Extensibility/BlazorServerLookupApiRequestService.cs @@ -41,27 +41,25 @@ public class BlazorServerLookupApiRequestService : ILookupApiRequestService, ITr public async Task SendAsync(string url) { - var client = HttpClientFactory.CreateClient(); + var client = HttpClientFactory.CreateClient(nameof(BlazorServerLookupApiRequestService)); var requestMessage = new HttpRequestMessage(HttpMethod.Get, url); var uri = new Uri(url, UriKind.RelativeOrAbsolute); if (!uri.IsAbsoluteUri) { - var baseUrl = string.Empty; - try + var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultOrNullAsync("Default"); + if (remoteServiceConfig != null) { - //Blazor tiered -- mode - var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync("Default"); - baseUrl = remoteServiceConfig.BaseUrl; + // Blazor tiered mode + var baseUrl = remoteServiceConfig.BaseUrl; client.BaseAddress = new Uri(baseUrl); AddHeaders(requestMessage); - await HttpClientAuthenticator.Authenticate(new RemoteServiceHttpClientAuthenticateContext(client, - requestMessage, new RemoteServiceConfiguration(baseUrl), string.Empty)); + await HttpClientAuthenticator.Authenticate(new RemoteServiceHttpClientAuthenticateContext(client, requestMessage, new RemoteServiceConfiguration(baseUrl), string.Empty)); } - catch (AbpException) // Blazor-Server mode. + else { - baseUrl = NavigationManager.BaseUri; - client.BaseAddress = new Uri(baseUrl); + // Blazor server mode + client.BaseAddress = new Uri(NavigationManager.BaseUri); foreach (var header in HttpContextAccessor.HttpContext!.Request.Headers) { requestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray()); diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpBlazorMessageLocalizerHelper.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpBlazorMessageLocalizerHelper.cs index 16a0c26e6b..1c461f33aa 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpBlazorMessageLocalizerHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpBlazorMessageLocalizerHelper.cs @@ -20,7 +20,7 @@ public class AbpBlazorMessageLocalizerHelper { var argumentsList = arguments?.ToList(); return argumentsList?.Count > 0 - ? stringLocalizer[message, LocalizeMessageArguments(argumentsList)] + ? stringLocalizer[message, LocalizeMessageArguments(argumentsList).ToArray()] : stringLocalizer[message]; } catch @@ -29,7 +29,7 @@ public class AbpBlazorMessageLocalizerHelper } } - private IEnumerable LocalizeMessageArguments(List arguments) + private IEnumerable LocalizeMessageArguments(List arguments) { foreach (var argument in arguments) { diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Security/AbpComponentsClaimsCache.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Security/AbpComponentsClaimsCache.cs index 8df1824e81..74cbd37e29 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Security/AbpComponentsClaimsCache.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Security/AbpComponentsClaimsCache.cs @@ -1,9 +1,9 @@ using System.Security.Claims; using System.Threading.Tasks; +using JetBrains.Annotations; using Microsoft.AspNetCore.Components.Authorization; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.DependencyInjection; -using Volo.Abp.Security.Claims; namespace Volo.Abp.AspNetCore.Components.Web.Security; @@ -12,18 +12,16 @@ public class AbpComponentsClaimsCache : IScopedDependency public ClaimsPrincipal Principal { get; private set; } = default!; private readonly AuthenticationStateProvider? _authenticationStateProvider; - private readonly IAbpClaimsPrincipalFactory _abpClaimsPrincipalFactory; public AbpComponentsClaimsCache( IClientScopeServiceProviderAccessor serviceProviderAccessor) { _authenticationStateProvider = serviceProviderAccessor.ServiceProvider.GetService(); - _abpClaimsPrincipalFactory = serviceProviderAccessor.ServiceProvider.GetRequiredService(); if (_authenticationStateProvider != null) { _authenticationStateProvider.AuthenticationStateChanged += async (task) => { - Principal = await _abpClaimsPrincipalFactory.CreateDynamicAsync((await task).User); + Principal = (await task).User; }; } } @@ -34,7 +32,6 @@ public class AbpComponentsClaimsCache : IScopedDependency { var authenticationState = await _authenticationStateProvider.GetAuthenticationStateAsync(); Principal = authenticationState.User; - await _abpClaimsPrincipalFactory.CreateDynamicAsync(Principal); } } } diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Extensibility/WebAssemblyLookupApiRequestService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Extensibility/WebAssemblyLookupApiRequestService.cs index 01378f5ddd..4acdafdb15 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Extensibility/WebAssemblyLookupApiRequestService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Extensibility/WebAssemblyLookupApiRequestService.cs @@ -32,14 +32,18 @@ public class WebAssemblyLookupApiRequestService : ILookupApiRequestService, ITra public async Task SendAsync(string url) { - var client = HttpClientFactory.CreateClient(); + var client = HttpClientFactory.CreateClient(nameof(WebAssemblyLookupApiRequestService)); var requestMessage = new HttpRequestMessage(HttpMethod.Get, url); AddHeaders(requestMessage); var uri = new Uri(url, UriKind.RelativeOrAbsolute); if (!uri.IsAbsoluteUri) { - var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync("Default"); + var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultOrNullAsync("Default"); + if (remoteServiceConfig == null) + { + throw new AbpException("Remote service configuration 'Default' was not found!"); + } client.BaseAddress = new Uri(remoteServiceConfig.BaseUrl); await HttpClientAuthenticator.Authenticate(new RemoteServiceHttpClientAuthenticateContext(client, requestMessage, new RemoteServiceConfiguration(remoteServiceConfig.BaseUrl), string.Empty)); } diff --git a/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.abppkg.json b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientCommonModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientCommonModule.cs index d3734e7c66..b7cd9d3a30 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientCommonModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientCommonModule.cs @@ -7,6 +7,7 @@ using Volo.Abp.Features; using Volo.Abp.Http.Client; using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.Security.Claims; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.AspNetCore.Mvc.Client; @@ -40,5 +41,12 @@ public class AbpAspNetCoreMvcClientCommonModule : AbpModule context.Services.AddTransient(); context.Services.AddTransient(); + + var abpClaimsPrincipalFactoryOptions = context.Services.ExecutePreConfiguredActions(); + if (abpClaimsPrincipalFactoryOptions.IsRemoteRefreshEnabled) + { + context.Services.AddTransient(); + context.Services.AddTransient(); + } } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributor.cs index d9339b57df..ae88d00ef8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributor.cs @@ -1,44 +1,10 @@ -using System; -using System.Linq; -using System.Security.Claims; -using System.Security.Principal; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; +using Volo.Abp.DependencyInjection; using Volo.Abp.Security.Claims; namespace Volo.Abp.AspNetCore.Mvc.Client; -public class RemoteDynamicClaimsPrincipalContributor : AbpDynamicClaimsPrincipalContributorBase +[DisableConventionalRegistration] +public class RemoteDynamicClaimsPrincipalContributor : RemoteDynamicClaimsPrincipalContributorBase { - public async override Task ContributeAsync(AbpClaimsPrincipalContributorContext context) - { - var identity = context.ClaimsPrincipal.Identities.FirstOrDefault(); - if (identity == null) - { - return; - } - var userId = identity.FindUserId(); - if (userId == null) - { - return; - } - - var dynamicClaimsCache = context.GetRequiredService(); - AbpDynamicClaimCacheItem dynamicClaims; - try - { - dynamicClaims = await dynamicClaimsCache.GetAsync(userId.Value, identity.FindTenantId()); - } - catch (Exception e) - { - // In case if failed refresh remote dynamic cache, We force to clear the claims principal. - context.ClaimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity()); - var logger = context.GetRequiredService>(); - logger.LogWarning(e, $"Failed to refresh remote dynamic claims cache for user: {userId.Value}"); - return; - } - - await AddDynamicClaimsAsync(context, identity, dynamicClaims.Claims); - } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributorCache.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributorCache.cs index e9b03e847c..738884fe06 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributorCache.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteDynamicClaimsPrincipalContributorCache.cs @@ -3,24 +3,20 @@ using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Volo.Abp.Caching; -using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client; using Volo.Abp.Http.Client.Authentication; using Volo.Abp.Security.Claims; namespace Volo.Abp.AspNetCore.Mvc.Client; -public class RemoteDynamicClaimsPrincipalContributorCache : ITransientDependency +public class RemoteDynamicClaimsPrincipalContributorCache : RemoteDynamicClaimsPrincipalContributorCacheBase { public const string HttpClientName = nameof(RemoteDynamicClaimsPrincipalContributorCache); - public ILogger Logger { get; set; } protected IDistributedCache Cache { get; } protected IHttpClientFactory HttpClientFactory { get; } - protected IOptions AbpClaimsPrincipalFactoryOptions { get; } protected IRemoteServiceHttpClientAuthenticator HttpClientAuthenticator { get; } public RemoteDynamicClaimsPrincipalContributorCache( @@ -28,25 +24,20 @@ public class RemoteDynamicClaimsPrincipalContributorCache : ITransientDependency IHttpClientFactory httpClientFactory, IOptions abpClaimsPrincipalFactoryOptions, IRemoteServiceHttpClientAuthenticator httpClientAuthenticator) + : base(abpClaimsPrincipalFactoryOptions) { Cache = cache; HttpClientFactory = httpClientFactory; - AbpClaimsPrincipalFactoryOptions = abpClaimsPrincipalFactoryOptions; HttpClientAuthenticator = httpClientAuthenticator; - - Logger = NullLogger.Instance; } - public virtual async Task GetAsync(Guid userId, Guid? tenantId = null) + protected async override Task GetCacheAsync(Guid userId, Guid? tenantId = null) { - Logger.LogDebug($"Get dynamic claims cache for user: {userId}"); - var dynamicClaims = await Cache.GetAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId)); - if (dynamicClaims != null && !dynamicClaims.Claims.IsNullOrEmpty()) - { - return dynamicClaims; - } + return await Cache.GetAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId)); + } - Logger.LogDebug($"Refresh dynamic claims for user: {userId} from remote service."); + protected async override Task RefreshAsync(Guid userId, Guid? tenantId = null) + { try { var client = HttpClientFactory.CreateClient(HttpClientName); @@ -60,13 +51,5 @@ public class RemoteDynamicClaimsPrincipalContributorCache : ITransientDependency Logger.LogWarning(e, $"Failed to refresh remote claims for user: {userId}"); throw; } - - dynamicClaims = await Cache.GetAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId)); - if (dynamicClaims == null || dynamicClaims.Claims.IsNullOrEmpty()) - { - throw new AbpException($"Failed to refresh remote claims for user: {userId}"); - } - - return dynamicClaims!; } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs index 455848db84..877fe05e37 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs @@ -289,7 +289,16 @@ public class AbpInputTagHelperService : AbpTagHelperService label.Attributes.Add("data-bs-html", "true"); } label.Attributes.Add("title", TagHelper.LabelTooltip); - label.InnerHtml.AppendHtml($" "); + var iconClass = TagHelper.LabelTooltipIcon; + if (iconClass.StartsWith("bi-")) + { + iconClass = "bi " + iconClass; + } + else if (iconClass.StartsWith("fa-")) + { + iconClass = "fa " + iconClass; + } + label.InnerHtml.AppendHtml($" "); } return label.ToHtmlString(); @@ -372,7 +381,16 @@ public class AbpInputTagHelperService : AbpTagHelperService var innerOutput = await labelTagHelper.ProcessAndGetOutputAsync(attributeList, context, "label", TagMode.StartTagAndEndTag); if (!TagHelper.LabelTooltip.IsNullOrEmpty()) { - innerOutput.Content.AppendHtml($" "); + var iconClass = TagHelper.LabelTooltipIcon; + if (iconClass.StartsWith("bi-")) + { + iconClass = "bi " + iconClass; + } + else if (iconClass.StartsWith("fa-")) + { + iconClass = "fa " + iconClass; + } + innerOutput.Content.AppendHtml($" "); } return innerOutput.Render(_encoder); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs index 54e8720b17..d55c08b161 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs @@ -547,7 +547,16 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp } label.Attributes.Add("title", TagHelper.LabelTooltip); - label.InnerHtml.AppendHtml($" "); + var iconClass = TagHelper.LabelTooltipIcon; + if (iconClass.StartsWith("bi-")) + { + iconClass = "bi " + iconClass; + } + else if (iconClass.StartsWith("fa-")) + { + iconClass = "fa " + iconClass; + } + label.InnerHtml.AppendHtml($" "); } return label.ToHtmlString(); @@ -607,7 +616,16 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp await labelTagHelper.ProcessAndGetOutputAsync(attributeList, context, "label", TagMode.StartTagAndEndTag); if (!TagHelper.LabelTooltip.IsNullOrEmpty()) { - innerOutput.Content.AppendHtml($" "); + var iconClass = TagHelper.LabelTooltipIcon; + if (iconClass.StartsWith("bi-")) + { + iconClass = "bi " + iconClass; + } + else if (iconClass.StartsWith("fa-")) + { + iconClass = "fa " + iconClass; + } + innerOutput.Content.AppendHtml($" "); } return innerOutput.Render(Encoder); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.abppkg.json b/framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.abppkg.json b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.abppkg.json b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.abppkg.json rename to framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.abppkg diff --git a/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.abppkg.json b/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.abppkg similarity index 100% rename from framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.abppkg.json rename to framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.abppkg diff --git a/framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.abppkg.json b/framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.abppkg similarity index 100% rename from framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.abppkg.json rename to framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.abppkg diff --git a/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.abppkg.json b/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.abppkg similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.abppkg.json rename to framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.abppkg diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo.Abp.Authorization.Abstractions.abppkg.json b/framework/src/Volo.Abp.Authorization.Abstractions/Volo.Abp.Authorization.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.Authorization.Abstractions/Volo.Abp.Authorization.Abstractions.abppkg.json rename to framework/src/Volo.Abp.Authorization.Abstractions/Volo.Abp.Authorization.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.abppkg.json b/framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.abppkg similarity index 100% rename from framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.abppkg.json rename to framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.abppkg diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.abppkg.json b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.abppkg similarity index 100% rename from framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.abppkg.json rename to framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.abppkg diff --git a/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.abppkg.json b/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.abppkg similarity index 100% rename from framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.abppkg.json rename to framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.abppkg diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs b/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs index 4ee9ba5916..043f824b1a 100644 --- a/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs +++ b/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Autofac.Core; using Autofac.Extras.DynamicProxy; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Autofac; using Volo.Abp.Castle.DynamicProxy; using Volo.Abp.DependencyInjection; @@ -14,10 +15,14 @@ public static class AbpRegistrationBuilderExtensions { public static IRegistrationBuilder ConfigureAbpConventions( this IRegistrationBuilder registrationBuilder, + ServiceDescriptor serviceDescriptor, IModuleContainer moduleContainer, - ServiceRegistrationActionList registrationActionList) + ServiceRegistrationActionList registrationActionList, + ServiceActivatedActionList activatedActionList) where TActivatorData : ReflectionActivatorData { + registrationBuilder = registrationBuilder.InvokeActivatedActions(activatedActionList, serviceDescriptor); + var serviceType = registrationBuilder.RegistrationData.Services.OfType().FirstOrDefault()?.ServiceType; if (serviceType == null) { @@ -36,6 +41,24 @@ public static class AbpRegistrationBuilderExtensions return registrationBuilder; } + private static IRegistrationBuilder InvokeActivatedActions( + this IRegistrationBuilder registrationBuilder, + ServiceActivatedActionList activatedActionList, + ServiceDescriptor serviceDescriptor) + where TActivatorData : ReflectionActivatorData + { + registrationBuilder.OnActivated(context => + { + var serviceActivatedContext = new OnServiceActivatedContext(context.Instance!); + foreach (var action in activatedActionList.GetActions(serviceDescriptor)) + { + action.Invoke(serviceActivatedContext); + } + }); + + return registrationBuilder; + } + private static IRegistrationBuilder InvokeRegistrationActions( this IRegistrationBuilder registrationBuilder, ServiceRegistrationActionList registrationActionList, 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 56a5d7480c..9e86a0e3ce 100644 --- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs +++ b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs @@ -183,6 +183,7 @@ public static class AutofacRegistration { var moduleContainer = services.GetSingletonInstance(); var registrationActionList = services.GetRegistrationActionList(); + var activatedActionList = services.GetServiceActivatedActionList(); foreach (var descriptor in services) { @@ -196,7 +197,7 @@ public static class AutofacRegistration .RegisterGeneric(descriptor.ImplementationType) .As(descriptor.ServiceType) .ConfigureLifecycle(descriptor.Lifetime, lifetimeScopeTagForSingletons) - .ConfigureAbpConventions(moduleContainer, registrationActionList); + .ConfigureAbpConventions(descriptor, moduleContainer, registrationActionList, activatedActionList); } else { @@ -204,7 +205,7 @@ public static class AutofacRegistration .RegisterType(descriptor.ImplementationType) .As(descriptor.ServiceType) .ConfigureLifecycle(descriptor.Lifetime, lifetimeScopeTagForSingletons) - .ConfigureAbpConventions(moduleContainer, registrationActionList); + .ConfigureAbpConventions(descriptor, moduleContainer, registrationActionList, activatedActionList); } } else if (descriptor.ImplementationFactory != null) diff --git a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.abppkg.json b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.abppkg similarity index 100% rename from framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.abppkg.json rename to framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.abppkg diff --git a/framework/src/Volo.Abp.AzureServiceBus/Volo.Abp.AzureServiceBus.abppkg.json b/framework/src/Volo.Abp.AzureServiceBus/Volo.Abp.AzureServiceBus.abppkg similarity index 100% rename from framework/src/Volo.Abp.AzureServiceBus/Volo.Abp.AzureServiceBus.abppkg.json rename to framework/src/Volo.Abp.AzureServiceBus/Volo.Abp.AzureServiceBus.abppkg diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.abppkg.json b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.abppkg.json rename to framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo.Abp.BackgroundJobs.HangFire.abppkg.json b/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo.Abp.BackgroundJobs.HangFire.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo.Abp.BackgroundJobs.HangFire.abppkg.json rename to framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo.Abp.BackgroundJobs.HangFire.abppkg diff --git a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.abppkg.json b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.abppkg.json rename to framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.abppkg diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo.Abp.BackgroundJobs.RabbitMQ.abppkg.json b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo.Abp.BackgroundJobs.RabbitMQ.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo.Abp.BackgroundJobs.RabbitMQ.abppkg.json rename to framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo.Abp.BackgroundJobs.RabbitMQ.abppkg diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo.Abp.BackgroundJobs.abppkg.json b/framework/src/Volo.Abp.BackgroundJobs/Volo.Abp.BackgroundJobs.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundJobs/Volo.Abp.BackgroundJobs.abppkg.json rename to framework/src/Volo.Abp.BackgroundJobs/Volo.Abp.BackgroundJobs.abppkg diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo.Abp.BackgroundWorkers.Hangfire.abppkg.json b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo.Abp.BackgroundWorkers.Hangfire.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo.Abp.BackgroundWorkers.Hangfire.abppkg.json rename to framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo.Abp.BackgroundWorkers.Hangfire.abppkg diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.abppkg.json b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.abppkg.json rename to framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.abppkg diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.abppkg.json b/framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.abppkg similarity index 100% rename from framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.abppkg.json rename to framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.abppkg diff --git a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.abppkg.json b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.abppkg similarity index 100% rename from framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.abppkg.json rename to framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.abppkg diff --git a/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.abppkg.json b/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.abppkg similarity index 100% rename from framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.abppkg.json rename to framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.abppkg diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.abppkg.json b/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.abppkg similarity index 100% rename from framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.abppkg.json rename to framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.abppkg diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.abppkg.json b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.abppkg similarity index 100% rename from framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.abppkg.json rename to framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.abppkg diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.abppkg.json b/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.abppkg similarity index 100% rename from framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.abppkg.json rename to framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.abppkg diff --git a/framework/src/Volo.Abp.BlobStoring/Volo.Abp.BlobStoring.abppkg.json b/framework/src/Volo.Abp.BlobStoring/Volo.Abp.BlobStoring.abppkg similarity index 100% rename from framework/src/Volo.Abp.BlobStoring/Volo.Abp.BlobStoring.abppkg.json rename to framework/src/Volo.Abp.BlobStoring/Volo.Abp.BlobStoring.abppkg diff --git a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.abppkg.json b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.abppkg similarity index 100% rename from framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.abppkg.json rename to framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.abppkg diff --git a/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.abppkg.json b/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.abppkg similarity index 100% rename from framework/src/Volo.Abp.Caching/Volo.Abp.Caching.abppkg.json rename to framework/src/Volo.Abp.Caching/Volo.Abp.Caching.abppkg diff --git a/framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.abppkg.json b/framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.abppkg similarity index 100% rename from framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.abppkg.json rename to framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.abppkg diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.abppkg.json b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.abppkg similarity index 100% rename from framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.abppkg.json rename to framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.abppkg 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 3c6e891d84..7c477da368 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 @@ -119,7 +119,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien var skipBundling = commandLineArgs.Options.ContainsKey(Options.SkipBundling.Long) || commandLineArgs.Options.ContainsKey(Options.SkipBundling.Short); if (!skipBundling) { - await RunBundleForBlazorWasmOrMauiBlazorTemplateAsync(projectArgs); + await RunBundleInternalAsync(projectArgs); } await ConfigurePwaSupportForAngular(projectArgs); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 2ee023445c..1ad125b275 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -419,26 +419,49 @@ public abstract class ProjectCreationCommandBase } } - protected async Task RunBundleForBlazorWasmOrMauiBlazorTemplateAsync(ProjectBuildArgs projectArgs) + protected virtual async Task RunBundleInternalAsync(ProjectBuildArgs projectArgs) { - if ((AppTemplateBase.IsAppTemplate(projectArgs.TemplateName) || AppNoLayersTemplateBase.IsAppNoLayersTemplate(projectArgs.TemplateName)) - && projectArgs.UiFramework is UiFramework.Blazor or UiFramework.MauiBlazor) + if (!ShouldRunBundleCommand(projectArgs)) { - var isWebassembly = projectArgs.UiFramework == UiFramework.Blazor; - var message = isWebassembly ? "Generating bundles for Blazor Wasm" : "Generating bundles for MAUI Blazor"; - Logger.LogInformation($"{message}..."); + return; + } + + var isWebassembly = projectArgs.UiFramework == UiFramework.Blazor; + var message = isWebassembly ? "Generating bundles for Blazor Wasm" : "Generating bundles for MAUI Blazor"; + Logger.LogInformation(message + "..."); - await EventBus.PublishAsync(new ProjectCreationProgressEvent - { - Message = message - }, false); + await EventBus.PublishAsync(new ProjectCreationProgressEvent + { + Message = message + }, false); + + var path = projectArgs.OutputFolder; + if (projectArgs.TemplateName == MicroserviceProTemplate.TemplateName) + { + path = Path.Combine(path, "apps"); + } + + var directory = Path.GetDirectoryName( + Directory.GetFiles(path, isWebassembly ? "*.Blazor.csproj" : "*.MauiBlazor.csproj", SearchOption.AllDirectories).First() + ); - var directory = Path.GetDirectoryName( - Directory.GetFiles(projectArgs.OutputFolder, isWebassembly? "*.Blazor.csproj" :"*.MauiBlazor.csproj", SearchOption.AllDirectories).First() - ); + await _bundlingService.BundleAsync(directory, true, projectType: isWebassembly ? BundlingConsts.WebAssembly : BundlingConsts.MauiBlazor); + } - await _bundlingService.BundleAsync(directory, true, projectType: isWebassembly ? BundlingConsts.WebAssembly : BundlingConsts.MauiBlazor); + protected virtual bool ShouldRunBundleCommand(ProjectBuildArgs projectArgs) + { + if ((AppTemplateBase.IsAppTemplate(projectArgs.TemplateName) || AppNoLayersTemplateBase.IsAppNoLayersTemplate(projectArgs.TemplateName)) + && projectArgs.UiFramework is UiFramework.Blazor or UiFramework.MauiBlazor) + { + return true; } + + if (projectArgs.TemplateName == MicroserviceProTemplate.TemplateName && projectArgs.UiFramework is UiFramework.Blazor) + { + return true; + } + + return false; } protected async Task CreateInitialMigrationsAsync(ProjectBuildArgs projectArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs index 4c1a05841f..3edbd32e25 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs @@ -45,7 +45,7 @@ public class RemoveProjectFromSolutionStep : ProjectBuildPipelineStep private void RemoveProjectFromAbpmdlFile(ProjectBuildContext context) { - var abpmdlFile = context.FindFile(_solutionFilePath.RemovePostFix(".sln") + ".abpmdl.json"); + var abpmdlFile = context.FindFile(_solutionFilePath.RemovePostFix(".sln") + ".abpmdl"); if (abpmdlFile == null) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs index b37736696f..76a4ddc042 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs @@ -20,9 +20,12 @@ public class AppTemplateChangeConsoleTestClientPortSettingsStep : ProjectBuildPi public override void Execute(ProjectBuildContext context) { - context - .GetFile("/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json") - .ReplaceText("44300", RemoteServicePort) - .ReplaceText("44301", AuthServerPort); + var appsettingsFile = context.FindFile("/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json"); + + if(appsettingsFile != null) + { + appsettingsFile.ReplaceText("44300", RemoteServicePort); + appsettingsFile.ReplaceText("44301", AuthServerPort); + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs index a811650725..c5fad3a45d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs @@ -45,7 +45,7 @@ public class AppTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPip _hasDbMigrations ? "EntityFrameworkCore.DbMigrations" : "EntityFrameworkCore", "MongoDB" ); - + ChangeNamespaceAndKeyword( context, "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs", @@ -154,13 +154,6 @@ public class AppTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPip //MyCompanyName.MyProjectName.Domain.Tests - ChangeProjectReference( - context, - "/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj", - "EntityFrameworkCore.Tests", - "MongoDB.Tests" - ); - ChangeNamespaceAndKeyword( context, "/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs", @@ -201,6 +194,22 @@ public class AppTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPip "MyProjectNameMongoDbCollectionFixtureBase" ); + ChangeNamespaceAndKeyword( + context, + "/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs", + "MyCompanyName.MyProjectName.EntityFrameworkCore", + "MyCompanyName.MyProjectName.MongoDB", + "MyProjectNameEntityFrameworkCoreTestModule", + "MyProjectNameMongoDbTestModule" + ); + + ChangeProjectReference( + context, + "/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj", + "EntityFrameworkCore", + "MongoDB" + ); + // TODO: remove this method after published 6.0.0 ProvideIdentityServerBackwardCompatibility(context); @@ -254,8 +263,6 @@ public class AppTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPip return; } } - - throw new ApplicationException($"Could not find the '{oldReference}' reference in the project '{targetProjectFilePath}'!"); } private void ChangeNamespaceAndKeyword( @@ -318,7 +325,7 @@ public class AppTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPip throw new ApplicationException("Could not find the 'Default' connection string in appsettings.json file!"); } - + // TODO: remove this method after published 6.0.0 private void ProvideIdentityServerBackwardCompatibility(ProjectBuildContext context) { diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.abppkg.json b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.abppkg similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo.Abp.Cli.abppkg.json rename to framework/src/Volo.Abp.Cli/Volo.Abp.Cli.abppkg diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionLifetimeEventExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionLifetimeEventExtensions.cs new file mode 100644 index 0000000000..14e2d28d51 --- /dev/null +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionLifetimeEventExtensions.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using Volo.Abp.DependencyInjection; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class ServiceCollectionLifetimeEventExtensions +{ + // OnActivated + public static void OnActivated(this IServiceCollection services, ServiceDescriptor descriptor, Action onActivatedAction) + { + GetOrCreateOnActivatedActionList(services).Add(new KeyValuePair>(descriptor, onActivatedAction)); + } + + public static ServiceActivatedActionList GetServiceActivatedActionList(this IServiceCollection services) + { + return GetOrCreateOnActivatedActionList(services); + } + + private static ServiceActivatedActionList GetOrCreateOnActivatedActionList(IServiceCollection services) + { + var actionList = services.GetSingletonInstanceOrNull>()?.Value; + if (actionList == null) + { + actionList = new ServiceActivatedActionList(); + services.AddObjectAccessor(actionList); + } + + return actionList; + } +} diff --git a/framework/src/Volo.Abp.Core/Volo.Abp.Core.abppkg.json b/framework/src/Volo.Abp.Core/Volo.Abp.Core.abppkg similarity index 100% rename from framework/src/Volo.Abp.Core/Volo.Abp.Core.abppkg.json rename to framework/src/Volo.Abp.Core/Volo.Abp.Core.abppkg diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IOnServiceActivatedContext.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IOnServiceActivatedContext.cs new file mode 100644 index 0000000000..b2e1d10a93 --- /dev/null +++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IOnServiceActivatedContext.cs @@ -0,0 +1,6 @@ +namespace Volo.Abp.DependencyInjection; + +public interface IOnServiceActivatedContext +{ + public object Instance { get; } +} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/OnServiceActivatedContext.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/OnServiceActivatedContext.cs new file mode 100644 index 0000000000..91af1e130b --- /dev/null +++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/OnServiceActivatedContext.cs @@ -0,0 +1,11 @@ +namespace Volo.Abp.DependencyInjection; + +public class OnServiceActivatedContext : IOnServiceActivatedContext +{ + public object Instance { get; set; } + + public OnServiceActivatedContext(object instance) + { + Instance = instance; + } +} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceActivatedActionList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceActivatedActionList.cs new file mode 100644 index 0000000000..3e3c4afd9e --- /dev/null +++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceActivatedActionList.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.Extensions.DependencyInjection; + +namespace Volo.Abp.DependencyInjection; + +public class ServiceActivatedActionList : List>> +{ + public List> GetActions(ServiceDescriptor descriptor) + { + return this.Where(x => x.Key == descriptor).Select(x => x.Value).ToList(); + } +} diff --git a/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.abppkg.json b/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.abppkg similarity index 100% rename from framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.abppkg.json rename to framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.abppkg diff --git a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.abppkg.json b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.abppkg similarity index 100% rename from framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.abppkg.json rename to framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.abppkg diff --git a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj index 34a505110c..3d1a6e9532 100644 --- a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj +++ b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj @@ -11,12 +11,14 @@ + - + + diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs index 92a2961cd4..d78b65b5af 100644 --- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs +++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs @@ -3,9 +3,13 @@ using System.Globalization; using System.Net.Http; using System.Net.Http.Headers; using System.Text.Json; +using System.Threading.Tasks; using Dapr.Client; +using IdentityModel.Client; using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Client; +using Volo.Abp.Http.Client.Authentication; using Volo.Abp.Json.SystemTextJson; using Volo.Abp.MultiTenancy; using Volo.Abp.Tracing; @@ -20,23 +24,26 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency protected ICurrentTenant CurrentTenant { get; } protected ICorrelationIdProvider CorrelationIdProvider { get; } protected IOptions AbpCorrelationIdOptions { get; } + protected IRemoteServiceHttpClientAuthenticator RemoteServiceHttpClientAuthenticator { get; } public AbpDaprClientFactory( IOptions options, IOptions systemTextJsonSerializerOptions, IDaprApiTokenProvider daprApiTokenProvider, ICurrentTenant currentTenant, ICorrelationIdProvider correlationIdProvider, - IOptions abpCorrelationIdOptions) + IOptions abpCorrelationIdOptions, + IRemoteServiceHttpClientAuthenticator remoteServiceHttpClientAuthenticator) { DaprApiTokenProvider = daprApiTokenProvider; CurrentTenant = currentTenant; CorrelationIdProvider = correlationIdProvider; AbpCorrelationIdOptions = abpCorrelationIdOptions; + RemoteServiceHttpClientAuthenticator = remoteServiceHttpClientAuthenticator; DaprOptions = options.Value; JsonSerializerOptions = CreateJsonSerializerOptions(systemTextJsonSerializerOptions.Value); } - public virtual DaprClient Create(Action? builderAction = null) + public virtual Task CreateAsync(Action? builderAction = null) { var builder = new DaprClientBuilder() .UseJsonSerializationOptions(JsonSerializerOptions); @@ -59,10 +66,10 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency builderAction?.Invoke(builder); - return builder.Build(); + return Task.FromResult(builder.Build()); } - public virtual HttpClient CreateHttpClient( + public virtual async Task CreateHttpClientAsync( string? appId = null, string? daprEndpoint = null, string? daprApiToken = null) @@ -81,6 +88,22 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency AddHeaders(httpClient); + var request = new HttpRequestMessage(); + await RemoteServiceHttpClientAuthenticator.Authenticate( + new RemoteServiceHttpClientAuthenticateContext( + httpClient, + request, + new RemoteServiceConfiguration("/"), + string.Empty + ) + ); + + var bearerToken = request.Headers.Authorization?.Parameter; + if (!bearerToken.IsNullOrWhiteSpace()) + { + httpClient.SetBearerToken(bearerToken); + } + return httpClient; } diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs index 65605bc342..06c8c0c4bc 100644 --- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs +++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs @@ -2,13 +2,19 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using Volo.Abp.Http.Client; using Volo.Abp.Json; using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; +using Volo.Abp.RemoteServices; namespace Volo.Abp.Dapr; -[DependsOn(typeof(AbpJsonModule), typeof(AbpMultiTenancyAbstractionsModule))] +[DependsOn( + typeof(AbpJsonModule), + typeof(AbpMultiTenancyAbstractionsModule), + typeof(AbpHttpClientModule) +)] public class AbpDaprModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) @@ -16,12 +22,6 @@ public class AbpDaprModule : AbpModule var configuration = context.Services.GetConfiguration(); ConfigureDaprOptions(configuration); - - context.Services.TryAddSingleton( - serviceProvider => serviceProvider - .GetRequiredService() - .Create() - ); } private void ConfigureDaprOptions(IConfiguration configuration) diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs index bbf074af6c..0fdb05ea6d 100644 --- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs +++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs @@ -1,14 +1,15 @@ using System; using System.Net.Http; +using System.Threading.Tasks; using Dapr.Client; namespace Volo.Abp.Dapr; public interface IAbpDaprClientFactory { - DaprClient Create(Action? builderAction = null); + Task CreateAsync(Action? builderAction = null); - HttpClient CreateHttpClient( + Task CreateHttpClientAsync( string? appId = null, string? daprEndpoint = null, string? daprApiToken = null diff --git a/framework/src/Volo.Abp.Data/Volo.Abp.Data.abppkg.json b/framework/src/Volo.Abp.Data/Volo.Abp.Data.abppkg similarity index 100% rename from framework/src/Volo.Abp.Data/Volo.Abp.Data.abppkg.json rename to framework/src/Volo.Abp.Data/Volo.Abp.Data.abppkg diff --git a/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.abppkg.json b/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.abppkg similarity index 100% rename from framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.abppkg.json rename to framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.abppkg diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.abppkg.json b/framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.abppkg similarity index 100% rename from framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.abppkg.json rename to framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.abppkg diff --git a/framework/src/Volo.Abp.Ddd.Domain/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs b/framework/src/Volo.Abp.Ddd.Domain/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs index a877c673f1..6e98d442c5 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs @@ -84,22 +84,16 @@ public static class ServiceCollectionRepositoryExtensions bool replaceExisting, bool isReadOnlyRepository = false) { - ServiceDescriptor descriptor; + var descriptor = ServiceDescriptor.Transient(serviceType, implementationType); if (isReadOnlyRepository) { - services.TryAddTransient(implementationType); - descriptor = ServiceDescriptor.Transient(serviceType, provider => + services.OnActivated(descriptor, context => { - var repository = provider.GetRequiredService(implementationType); + var repository = context.Instance.As(); ObjectHelper.TrySetProperty(repository.As(), x => x.IsChangeTrackingEnabled, _ => false); - return repository; }); } - else - { - descriptor = ServiceDescriptor.Transient(serviceType, implementationType); - } if (replaceExisting) { diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.abppkg.json b/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.abppkg similarity index 100% rename from framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.abppkg.json rename to framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.abppkg diff --git a/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.abppkg.json b/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.abppkg.json rename to framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.abppkg.json b/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.abppkg similarity index 100% rename from framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.abppkg.json rename to framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.abppkg diff --git a/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/DaprAbpDistributedLock.cs b/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/DaprAbpDistributedLock.cs index 100fece989..335fd3d930 100644 --- a/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/DaprAbpDistributedLock.cs +++ b/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/DaprAbpDistributedLock.cs @@ -31,7 +31,7 @@ public class DaprAbpDistributedLock : IAbpDistributedLock, ITransientDependency { name = DistributedLockKeyNormalizer.NormalizeKey(name); - var daprClient = DaprClientFactory.Create(); + var daprClient = await DaprClientFactory.CreateAsync(); var lockResponse = await daprClient.Lock( DistributedLockDaprOptions.StoreName, name, diff --git a/framework/src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.abppkg.json b/framework/src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.abppkg similarity index 100% rename from framework/src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.abppkg.json rename to framework/src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.abppkg diff --git a/framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.abppkg.json b/framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.abppkg similarity index 100% rename from framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.abppkg.json rename to framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.abppkg diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.abppkg.json b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.abppkg similarity index 100% rename from framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.abppkg.json rename to framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.abppkg diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.abppkg.json b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.abppkg similarity index 100% rename from framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.abppkg.json rename to framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.abppkg diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.abppkg.json b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.abppkg similarity index 100% rename from framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.abppkg.json rename to framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.abppkg diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.abppkg.json b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.abppkg similarity index 100% rename from framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.abppkg.json rename to framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.abppkg diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.abppkg.json b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.abppkg similarity index 100% rename from framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.abppkg.json rename to framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.abppkg diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.abppkg.json b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.abppkg similarity index 100% rename from framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.abppkg.json rename to framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.abppkg diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.abppkg.json b/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.abppkg similarity index 100% rename from framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.abppkg.json rename to framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.abppkg diff --git a/framework/src/Volo.Abp.EventBus.Abstractions/Volo.Abp.EventBus.Abstractions.abppkg.json b/framework/src/Volo.Abp.EventBus.Abstractions/Volo.Abp.EventBus.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.EventBus.Abstractions/Volo.Abp.EventBus.Abstractions.abppkg.json rename to framework/src/Volo.Abp.EventBus.Abstractions/Volo.Abp.EventBus.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.EventBus.Azure/Volo.Abp.EventBus.Azure.abppkg.json b/framework/src/Volo.Abp.EventBus.Azure/Volo.Abp.EventBus.Azure.abppkg similarity index 100% rename from framework/src/Volo.Abp.EventBus.Azure/Volo.Abp.EventBus.Azure.abppkg.json rename to framework/src/Volo.Abp.EventBus.Azure/Volo.Abp.EventBus.Azure.abppkg diff --git a/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.abppkg.json b/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.abppkg similarity index 100% rename from framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.abppkg.json rename to framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.abppkg diff --git a/framework/src/Volo.Abp.EventBus.Dapr/Volo/Abp/EventBus/Dapr/DaprDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.Dapr/Volo/Abp/EventBus/Dapr/DaprDistributedEventBus.cs index f4c3e6242f..ce6dee2cfc 100644 --- a/framework/src/Volo.Abp.EventBus.Dapr/Volo/Abp/EventBus/Dapr/DaprDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus.Dapr/Volo/Abp/EventBus/Dapr/DaprDistributedEventBus.cs @@ -255,7 +255,7 @@ public class DaprDistributedEventBus : DistributedEventBusBase, ISingletonDepend protected virtual async Task PublishToDaprAsync(string eventName, object eventData, Guid? messageId = null, string? correlationId = null) { - var client = DaprClientFactory.Create(); + var client = await DaprClientFactory.CreateAsync(); var data = new AbpDaprEventData(DaprEventBusOptions.PubSubName, eventName, (messageId ?? GuidGenerator.Create()).ToString("N"), Serializer.SerializeToString(eventData), correlationId); await client.PublishEventAsync(pubsubName: DaprEventBusOptions.PubSubName, topicName: eventName, data: data); } diff --git a/framework/src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.abppkg.json b/framework/src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.abppkg similarity index 100% rename from framework/src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.abppkg.json rename to framework/src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.abppkg diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.abppkg.json b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.abppkg similarity index 100% rename from framework/src/Volo.Abp.EventBus.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.abppkg.json rename to framework/src/Volo.Abp.EventBus.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.abppkg diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs index a017d53d5d..130f5b38e2 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs @@ -1,4 +1,5 @@ -using Volo.Abp.RabbitMQ; +using System.Collections.Generic; +using Volo.Abp.RabbitMQ; namespace Volo.Abp.EventBus.RabbitMq; @@ -13,9 +14,13 @@ public class AbpRabbitMqEventBusOptions public string ExchangeName { get; set; } = default!; public string? ExchangeType { get; set; } - + public ushort? PrefetchCount { get; set; } + public IDictionary QueueArguments { get; set; } = new Dictionary(); + + public IDictionary ExchangeArguments { get; set; } = new Dictionary(); + public string GetExchangeTypeOrDefault() { return string.IsNullOrEmpty(ExchangeType) diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs index 2c0bb7aab5..dbaedf7779 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs @@ -79,14 +79,16 @@ public class RabbitMqDistributedEventBus : DistributedEventBusBase, ISingletonDe new ExchangeDeclareConfiguration( AbpRabbitMqEventBusOptions.ExchangeName, type: AbpRabbitMqEventBusOptions.GetExchangeTypeOrDefault(), - durable: true + durable: true, + arguments: AbpRabbitMqEventBusOptions.ExchangeArguments ), new QueueDeclareConfiguration( AbpRabbitMqEventBusOptions.ClientName, durable: true, exclusive: false, autoDelete: false, - prefetchCount: AbpRabbitMqEventBusOptions.PrefetchCount + prefetchCount: AbpRabbitMqEventBusOptions.PrefetchCount, + arguments: AbpRabbitMqEventBusOptions.QueueArguments ), AbpRabbitMqEventBusOptions.ConnectionName ); diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.abppkg.json b/framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.abppkg similarity index 100% rename from framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.abppkg.json rename to framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.abppkg diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.csproj b/framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.csproj index 5923f966fe..e724024b8f 100644 --- a/framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.csproj +++ b/framework/src/Volo.Abp.EventBus.Rebus/Volo.Abp.EventBus.Rebus.csproj @@ -21,13 +21,8 @@ - - - - - diff --git a/framework/src/Volo.Abp.EventBus/Volo.Abp.EventBus.abppkg.json b/framework/src/Volo.Abp.EventBus/Volo.Abp.EventBus.abppkg similarity index 100% rename from framework/src/Volo.Abp.EventBus/Volo.Abp.EventBus.abppkg.json rename to framework/src/Volo.Abp.EventBus/Volo.Abp.EventBus.abppkg diff --git a/framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.abppkg.json b/framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.abppkg similarity index 100% rename from framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.abppkg.json rename to framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.abppkg diff --git a/framework/src/Volo.Abp.Features/Volo.Abp.Features.abppkg.json b/framework/src/Volo.Abp.Features/Volo.Abp.Features.abppkg similarity index 100% rename from framework/src/Volo.Abp.Features/Volo.Abp.Features.abppkg.json rename to framework/src/Volo.Abp.Features/Volo.Abp.Features.abppkg diff --git a/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.abppkg.json b/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.abppkg similarity index 100% rename from framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.abppkg.json rename to framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.abppkg diff --git a/framework/src/Volo.Abp.Gdpr.Abstractions/Volo.Abp.Gdpr.Abstractions.abppkg.json b/framework/src/Volo.Abp.Gdpr.Abstractions/Volo.Abp.Gdpr.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.Gdpr.Abstractions/Volo.Abp.Gdpr.Abstractions.abppkg.json rename to framework/src/Volo.Abp.Gdpr.Abstractions/Volo.Abp.Gdpr.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.abppkg.json b/framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.abppkg similarity index 100% rename from framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.abppkg.json rename to framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.abppkg diff --git a/framework/src/Volo.Abp.Guids/Volo.Abp.Guids.abppkg.json b/framework/src/Volo.Abp.Guids/Volo.Abp.Guids.abppkg similarity index 100% rename from framework/src/Volo.Abp.Guids/Volo.Abp.Guids.abppkg.json rename to framework/src/Volo.Abp.Guids/Volo.Abp.Guids.abppkg diff --git a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.abppkg.json b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.abppkg similarity index 100% rename from framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.abppkg.json rename to framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.abppkg diff --git a/framework/src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.abppkg.json b/framework/src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.abppkg.json rename to framework/src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.abppkg.json b/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.abppkg.json rename to framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.abppkg diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.abppkg.json b/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.abppkg.json rename to framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.abppkg diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.abppkg.json b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.abppkg.json rename to framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.abppkg diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo.Abp.Http.Client.IdentityModel.abppkg.json b/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo.Abp.Http.Client.IdentityModel.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http.Client.IdentityModel/Volo.Abp.Http.Client.IdentityModel.abppkg.json rename to framework/src/Volo.Abp.Http.Client.IdentityModel/Volo.Abp.Http.Client.IdentityModel.abppkg diff --git a/framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.abppkg.json b/framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.abppkg.json rename to framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.abppkg diff --git a/framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.abppkg.json b/framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.abppkg.json rename to framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.abppkg diff --git a/framework/src/Volo.Abp.Http/Volo.Abp.Http.abppkg.json b/framework/src/Volo.Abp.Http/Volo.Abp.Http.abppkg similarity index 100% rename from framework/src/Volo.Abp.Http/Volo.Abp.Http.abppkg.json rename to framework/src/Volo.Abp.Http/Volo.Abp.Http.abppkg diff --git a/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.abppkg.json b/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.abppkg similarity index 100% rename from framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.abppkg.json rename to framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.abppkg diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.abppkg.json b/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.abppkg.json rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.abppkg.json b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.abppkg similarity index 100% rename from framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.abppkg.json rename to framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.abppkg diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.abppkg.json b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.abppkg similarity index 100% rename from framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.abppkg.json rename to framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.abppkg diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj index 14b719c5be..d3a36d1ba8 100644 --- a/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj @@ -7,7 +7,7 @@ netstandard2.0;netstandard2.1;net8.0 enable Nullable - Volo.Abp.Imaging.MagicNet + Volo.Abp.Imaging.MagickNet $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/framework/src/Volo.Abp.Json.Abstractions/Volo.Abp.Json.Abstractions.abppkg.json b/framework/src/Volo.Abp.Json.Abstractions/Volo.Abp.Json.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.Json.Abstractions/Volo.Abp.Json.Abstractions.abppkg.json rename to framework/src/Volo.Abp.Json.Abstractions/Volo.Abp.Json.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.Json.Newtonsoft/Volo.Abp.Json.Newtonsoft.abppkg.json b/framework/src/Volo.Abp.Json.Newtonsoft/Volo.Abp.Json.Newtonsoft.abppkg similarity index 100% rename from framework/src/Volo.Abp.Json.Newtonsoft/Volo.Abp.Json.Newtonsoft.abppkg.json rename to framework/src/Volo.Abp.Json.Newtonsoft/Volo.Abp.Json.Newtonsoft.abppkg diff --git a/framework/src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.abppkg.json b/framework/src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.abppkg similarity index 100% rename from framework/src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.abppkg.json rename to framework/src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.abppkg diff --git a/framework/src/Volo.Abp.Json/Volo.Abp.Json.abppkg.json b/framework/src/Volo.Abp.Json/Volo.Abp.Json.abppkg similarity index 100% rename from framework/src/Volo.Abp.Json/Volo.Abp.Json.abppkg.json rename to framework/src/Volo.Abp.Json/Volo.Abp.Json.abppkg diff --git a/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.abppkg.json b/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.abppkg similarity index 100% rename from framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.abppkg.json rename to framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.abppkg diff --git a/framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.abppkg.json b/framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.abppkg similarity index 100% rename from framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.abppkg.json rename to framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.abppkg diff --git a/framework/src/Volo.Abp.Localization.Abstractions/Volo.Abp.Localization.Abstractions.abppkg.json b/framework/src/Volo.Abp.Localization.Abstractions/Volo.Abp.Localization.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.Localization.Abstractions/Volo.Abp.Localization.Abstractions.abppkg.json rename to framework/src/Volo.Abp.Localization.Abstractions/Volo.Abp.Localization.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.Localization/Volo.Abp.Localization.abppkg.json b/framework/src/Volo.Abp.Localization/Volo.Abp.Localization.abppkg similarity index 100% rename from framework/src/Volo.Abp.Localization/Volo.Abp.Localization.abppkg.json rename to framework/src/Volo.Abp.Localization/Volo.Abp.Localization.abppkg diff --git a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.abppkg.json b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.abppkg similarity index 100% rename from framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.abppkg.json rename to framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.abppkg diff --git a/framework/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.abppkg.json b/framework/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.abppkg similarity index 100% rename from framework/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.abppkg.json rename to framework/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.abppkg diff --git a/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.abppkg.json b/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.abppkg similarity index 100% rename from framework/src/Volo.Abp.Minify/Volo.Abp.Minify.abppkg.json rename to framework/src/Volo.Abp.Minify/Volo.Abp.Minify.abppkg diff --git a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.abppkg.json b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.abppkg similarity index 100% rename from framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.abppkg.json rename to framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.abppkg diff --git a/framework/src/Volo.Abp.MultiLingualObjects/Volo.Abp.MultiLingualObjects.abppkg.json b/framework/src/Volo.Abp.MultiLingualObjects/Volo.Abp.MultiLingualObjects.abppkg similarity index 100% rename from framework/src/Volo.Abp.MultiLingualObjects/Volo.Abp.MultiLingualObjects.abppkg.json rename to framework/src/Volo.Abp.MultiLingualObjects/Volo.Abp.MultiLingualObjects.abppkg diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.abppkg.json b/framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.abppkg similarity index 100% rename from framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.abppkg.json rename to framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.abppkg diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.abppkg.json b/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.abppkg similarity index 100% rename from framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.abppkg.json rename to framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.abppkg diff --git a/framework/src/Volo.Abp.ObjectMapping/Volo.Abp.ObjectMapping.abppkg.json b/framework/src/Volo.Abp.ObjectMapping/Volo.Abp.ObjectMapping.abppkg similarity index 100% rename from framework/src/Volo.Abp.ObjectMapping/Volo.Abp.ObjectMapping.abppkg.json rename to framework/src/Volo.Abp.ObjectMapping/Volo.Abp.ObjectMapping.abppkg diff --git a/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.abppkg.json b/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.abppkg similarity index 100% rename from framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.abppkg.json rename to framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.abppkg diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.abppkg.json b/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.abppkg similarity index 100% rename from framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.abppkg.json rename to framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.abppkg diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ExchangeDeclareConfiguration.cs b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ExchangeDeclareConfiguration.cs index ca904cc94f..5c239893c7 100644 --- a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ExchangeDeclareConfiguration.cs +++ b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ExchangeDeclareConfiguration.cs @@ -18,12 +18,13 @@ public class ExchangeDeclareConfiguration string exchangeName, string type, bool durable = false, - bool autoDelete = false) + bool autoDelete = false, + IDictionary? arguments = null) { ExchangeName = exchangeName; Type = type; Durable = durable; AutoDelete = autoDelete; - Arguments = new Dictionary(); + Arguments = arguments?? new Dictionary(); } } diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs index 4b03c788c6..eb59ec3058 100644 --- a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs +++ b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs @@ -23,13 +23,14 @@ public class QueueDeclareConfiguration bool durable = true, bool exclusive = false, bool autoDelete = false, - ushort? prefetchCount = null) + ushort? prefetchCount = null, + IDictionary? arguments = null) { QueueName = queueName; Durable = durable; Exclusive = exclusive; AutoDelete = autoDelete; - Arguments = new Dictionary(); + Arguments = arguments?? new Dictionary(); PrefetchCount = prefetchCount; } diff --git a/framework/src/Volo.Abp.RemoteServices/Volo.Abp.RemoteServices.abppkg.json b/framework/src/Volo.Abp.RemoteServices/Volo.Abp.RemoteServices.abppkg similarity index 100% rename from framework/src/Volo.Abp.RemoteServices/Volo.Abp.RemoteServices.abppkg.json rename to framework/src/Volo.Abp.RemoteServices/Volo.Abp.RemoteServices.abppkg diff --git a/framework/src/Volo.Abp.Security/Volo.Abp.Security.abppkg.json b/framework/src/Volo.Abp.Security/Volo.Abp.Security.abppkg similarity index 100% rename from framework/src/Volo.Abp.Security/Volo.Abp.Security.abppkg.json rename to framework/src/Volo.Abp.Security/Volo.Abp.Security.abppkg diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs index 75bf67bee6..1ed46c0def 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs @@ -12,11 +12,13 @@ public class AbpClaimsPrincipalFactoryOptions public List DynamicClaims { get; } + public bool IsRemoteRefreshEnabled { get; set; } + public string RemoteRefreshUrl { get; set; } public Dictionary> ClaimsMap { get; set; } - public bool IsDynamicClaimsEnabled { get; set; } + public bool IsDynamicClaimsEnabled { get; set; } public AbpClaimsPrincipalFactoryOptions() { @@ -36,6 +38,7 @@ public class AbpClaimsPrincipalFactoryOptions }; RemoteRefreshUrl = "/api/account/dynamic-claims/refresh"; + IsRemoteRefreshEnabled = true; ClaimsMap = new Dictionary>() { diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/RemoteDynamicClaimsPrincipalContributorBase.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/RemoteDynamicClaimsPrincipalContributorBase.cs new file mode 100644 index 0000000000..b54f5becbd --- /dev/null +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/RemoteDynamicClaimsPrincipalContributorBase.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Claims; +using System.Security.Principal; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; + +namespace Volo.Abp.Security.Claims; + +public abstract class RemoteDynamicClaimsPrincipalContributorBase : AbpDynamicClaimsPrincipalContributorBase + where TContributor : class + where TContributorCache : RemoteDynamicClaimsPrincipalContributorCacheBase +{ + public async override Task ContributeAsync(AbpClaimsPrincipalContributorContext context) + { + var identity = context.ClaimsPrincipal.Identities.FirstOrDefault(); + if (identity == null) + { + return; + } + + var userId = identity.FindUserId(); + if (userId == null) + { + return; + } + + var dynamicClaimsCache = context.GetRequiredService().As(); + AbpDynamicClaimCacheItem dynamicClaims; + try + { + dynamicClaims = await dynamicClaimsCache.GetAsync(userId.Value, identity.FindTenantId()); + } + catch (Exception e) + { + // In case if failed refresh remote dynamic cache, We force to clear the claims principal. + context.ClaimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity()); + var logger = context.GetRequiredService>(); + logger.LogWarning(e, $"Failed to refresh remote dynamic claims cache for user: {userId.Value}"); + return; + } + + if (dynamicClaims.Claims.IsNullOrEmpty()) + { + return; + } + + await AddDynamicClaimsAsync(context, identity, dynamicClaims.Claims); + } +} diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/RemoteDynamicClaimsPrincipalContributorCacheBase.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/RemoteDynamicClaimsPrincipalContributorCacheBase.cs new file mode 100644 index 0000000000..fce2324812 --- /dev/null +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/RemoteDynamicClaimsPrincipalContributorCacheBase.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; + +namespace Volo.Abp.Security.Claims; + +public abstract class RemoteDynamicClaimsPrincipalContributorCacheBase +{ + public ILogger Logger { get; set; } + + protected IOptions AbpClaimsPrincipalFactoryOptions { get; } + + protected RemoteDynamicClaimsPrincipalContributorCacheBase(IOptions abpClaimsPrincipalFactoryOptions) + { + AbpClaimsPrincipalFactoryOptions = abpClaimsPrincipalFactoryOptions; + + Logger = NullLogger.Instance; + } + + public async Task GetAsync(Guid userId, Guid? tenantId = null) + { + Logger.LogDebug($"Get dynamic claims cache for user: {userId}"); + var dynamicClaims = await GetCacheAsync(userId, tenantId); + if (dynamicClaims != null) + { + return dynamicClaims; + } + + Logger.LogDebug($"Refresh dynamic claims for user: {userId} from remote service."); + try + { + await RefreshAsync(userId, tenantId); + } + catch (Exception e) + { + Logger.LogWarning(e, $"Failed to refresh remote claims for user: {userId}"); + throw; + } + + dynamicClaims = await GetCacheAsync(userId, tenantId); + if (dynamicClaims == null) + { + throw new AbpException($"Failed to refresh remote claims for user: {userId}"); + } + + return dynamicClaims; + } + + protected abstract Task GetCacheAsync(Guid userId, Guid? tenantId = null); + + protected abstract Task RefreshAsync(Guid userId, Guid? tenantId = null); +} diff --git a/framework/src/Volo.Abp.Serialization/Volo.Abp.Serialization.abppkg.json b/framework/src/Volo.Abp.Serialization/Volo.Abp.Serialization.abppkg similarity index 100% rename from framework/src/Volo.Abp.Serialization/Volo.Abp.Serialization.abppkg.json rename to framework/src/Volo.Abp.Serialization/Volo.Abp.Serialization.abppkg diff --git a/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.abppkg.json b/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.abppkg similarity index 100% rename from framework/src/Volo.Abp.Settings/Volo.Abp.Settings.abppkg.json rename to framework/src/Volo.Abp.Settings/Volo.Abp.Settings.abppkg diff --git a/framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.abppkg.json b/framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.abppkg similarity index 100% rename from framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.abppkg.json rename to framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.abppkg diff --git a/framework/src/Volo.Abp.Sms/Volo.Abp.Sms.abppkg.json b/framework/src/Volo.Abp.Sms/Volo.Abp.Sms.abppkg similarity index 100% rename from framework/src/Volo.Abp.Sms/Volo.Abp.Sms.abppkg.json rename to framework/src/Volo.Abp.Sms/Volo.Abp.Sms.abppkg diff --git a/framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.abppkg.json b/framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.abppkg similarity index 100% rename from framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.abppkg.json rename to framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.abppkg diff --git a/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.abppkg.json b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.abppkg similarity index 100% rename from framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.abppkg.json rename to framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.abppkg diff --git a/framework/src/Volo.Abp.TestBase/Volo.Abp.TestBase.abppkg.json b/framework/src/Volo.Abp.TestBase/Volo.Abp.TestBase.abppkg similarity index 100% rename from framework/src/Volo.Abp.TestBase/Volo.Abp.TestBase.abppkg.json rename to framework/src/Volo.Abp.TestBase/Volo.Abp.TestBase.abppkg diff --git a/framework/src/Volo.Abp.TextTemplating.Core/Volo.Abp.TextTemplating.Core.abppkg.json b/framework/src/Volo.Abp.TextTemplating.Core/Volo.Abp.TextTemplating.Core.abppkg similarity index 100% rename from framework/src/Volo.Abp.TextTemplating.Core/Volo.Abp.TextTemplating.Core.abppkg.json rename to framework/src/Volo.Abp.TextTemplating.Core/Volo.Abp.TextTemplating.Core.abppkg diff --git a/framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.abppkg.json b/framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.abppkg similarity index 100% rename from framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.abppkg.json rename to framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.abppkg diff --git a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.abppkg.json b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.abppkg similarity index 100% rename from framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.abppkg.json rename to framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.abppkg diff --git a/framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.abppkg.json b/framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.abppkg similarity index 100% rename from framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.abppkg.json rename to framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.abppkg diff --git a/framework/src/Volo.Abp.Threading/Volo.Abp.Threading.abppkg.json b/framework/src/Volo.Abp.Threading/Volo.Abp.Threading.abppkg similarity index 100% rename from framework/src/Volo.Abp.Threading/Volo.Abp.Threading.abppkg.json rename to framework/src/Volo.Abp.Threading/Volo.Abp.Threading.abppkg diff --git a/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.abppkg.json b/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.abppkg similarity index 100% rename from framework/src/Volo.Abp.Timing/Volo.Abp.Timing.abppkg.json rename to framework/src/Volo.Abp.Timing/Volo.Abp.Timing.abppkg diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.abppkg.json b/framework/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.abppkg similarity index 100% rename from framework/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.abppkg.json rename to framework/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.abppkg diff --git a/framework/src/Volo.Abp.UI/Volo.Abp.UI.abppkg.json b/framework/src/Volo.Abp.UI/Volo.Abp.UI.abppkg similarity index 100% rename from framework/src/Volo.Abp.UI/Volo.Abp.UI.abppkg.json rename to framework/src/Volo.Abp.UI/Volo.Abp.UI.abppkg diff --git a/framework/src/Volo.Abp.Uow/Volo.Abp.Uow.abppkg.json b/framework/src/Volo.Abp.Uow/Volo.Abp.Uow.abppkg similarity index 100% rename from framework/src/Volo.Abp.Uow/Volo.Abp.Uow.abppkg.json rename to framework/src/Volo.Abp.Uow/Volo.Abp.Uow.abppkg diff --git a/framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.abppkg.json b/framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.abppkg similarity index 100% rename from framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.abppkg.json rename to framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.abppkg diff --git a/framework/src/Volo.Abp.Validation/Volo.Abp.Validation.abppkg.json b/framework/src/Volo.Abp.Validation/Volo.Abp.Validation.abppkg similarity index 100% rename from framework/src/Volo.Abp.Validation/Volo.Abp.Validation.abppkg.json rename to framework/src/Volo.Abp.Validation/Volo.Abp.Validation.abppkg diff --git a/framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.abppkg.json b/framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.abppkg similarity index 100% rename from framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.abppkg.json rename to framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.abppkg diff --git a/framework/test/AbpTestBase/AbpTestBase.abppkg.json b/framework/test/AbpTestBase/AbpTestBase.abppkg similarity index 100% rename from framework/test/AbpTestBase/AbpTestBase.abppkg.json rename to framework/test/AbpTestBase/AbpTestBase.abppkg diff --git a/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.abppkg.json b/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.abppkg similarity index 100% rename from framework/test/SimpleConsoleDemo/SimpleConsoleDemo.abppkg.json rename to framework/test/SimpleConsoleDemo/SimpleConsoleDemo.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.abppkg diff --git a/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.abppkg.json b/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.abppkg.json rename to framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.abppkg diff --git a/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.abppkg.json b/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.abppkg.json rename to framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.abppkg diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.abppkg.json b/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.abppkg.json rename to framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.abppkg diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.abppkg.json b/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.abppkg.json rename to framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.abppkg diff --git a/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.abppkg.json b/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.abppkg.json rename to framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.abppkg diff --git a/framework/test/Volo.Abp.Autofac.Tests/Volo/Abp/Autofac/AutoFac_OnActivated_Tests.cs b/framework/test/Volo.Abp.Autofac.Tests/Volo/Abp/Autofac/AutoFac_OnActivated_Tests.cs new file mode 100644 index 0000000000..b2af6d85da --- /dev/null +++ b/framework/test/Volo.Abp.Autofac.Tests/Volo/Abp/Autofac/AutoFac_OnActivated_Tests.cs @@ -0,0 +1,39 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Shouldly; +using Volo.Abp.Autofac.Interception; +using Xunit; + +namespace Volo.Abp.Autofac; + +public class AutoFac_OnActivated_Tests : Autofac_Interception_Test +{ + protected override Task AfterAddApplicationAsync(IServiceCollection services) + { + var serviceDescriptor = ServiceDescriptor.Transient(); + services.Add(serviceDescriptor); + services.OnActivated(serviceDescriptor, x => + { + x.Instance.As().Name += "1"; + }); + services.OnActivated(serviceDescriptor, x => + { + x.Instance.As().Name += "2"; + }); + + return base.AfterAddApplicationAsync(services); + } + + [Fact] + public void Should_Call_OnActivated() + { + var server = ServiceProvider.GetRequiredService(); + server.Name.ShouldBe("MyServer12"); + } +} + +class MyServer +{ + public string Name { get; set; } = "MyServer"; +} diff --git a/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.abppkg.json b/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.abppkg.json rename to framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.abppkg diff --git a/framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.abppkg.json b/framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.abppkg.json rename to framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.abppkg diff --git a/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.abppkg.json b/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.abppkg.json rename to framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.abppkg diff --git a/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.abppkg.json b/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.abppkg.json rename to framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.abppkg diff --git a/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.abppkg.json b/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.abppkg.json rename to framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.abppkg diff --git a/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.abppkg.json b/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.abppkg.json rename to framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.abppkg diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.abppkg.json b/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.abppkg.json rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.abppkg diff --git a/framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.abppkg.json b/framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.abppkg.json rename to framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.abppkg diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.abppkg.json b/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.abppkg.json rename to framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.abppkg diff --git a/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.abppkg.json b/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.abppkg.json rename to framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.abppkg diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.abppkg.json b/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.abppkg.json rename to framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.abppkg diff --git a/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.abppkg.json b/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.abppkg.json rename to framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.abppkg diff --git a/framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.abppkg.json b/framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.abppkg.json rename to framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.abppkg diff --git a/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.abppkg.json b/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.abppkg.json rename to framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.abppkg diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.abppkg.json b/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.abppkg.json rename to framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.abppkg diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs index ca98017e0a..4a7a9fb28f 100644 --- a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs +++ b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs @@ -31,15 +31,15 @@ public class RepositoryRegistration_Tests //Assert //MyTestAggregateRootWithoutPk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); //MyTestAggregateRootWithGuidPk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); @@ -69,24 +69,24 @@ public class RepositoryRegistration_Tests //Assert //MyTestAggregateRootWithoutPk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); //MyTestAggregateRootWithGuidPk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); //MyTestEntityWithInt32Pk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyBasicRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); + services.ShouldContainTransient(typeof(IReadOnlyBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); } @@ -114,20 +114,20 @@ public class RepositoryRegistration_Tests services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); //MyTestAggregateRootWithGuidPk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyBasicRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); + services.ShouldContainTransient(typeof(IReadOnlyBasicRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); //MyTestEntityWithInt32Pk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyBasicRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); + services.ShouldContainTransient(typeof(IReadOnlyBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); } @@ -209,10 +209,10 @@ public class RepositoryRegistration_Tests services.ShouldNotContainService(typeof(IRepository)); //MyTestAggregateRootWithGuidPk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestDefaultRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestDefaultRepository)); } @@ -234,11 +234,11 @@ public class RepositoryRegistration_Tests new MyTestRepositoryRegistrar(options).AddRepositories(); //MyTestAggregateRootWithGuidPk - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyRepository)); - services.ShouldContainTransientImplementationFactory(typeof(IReadOnlyBasicRepository)); + services.ShouldContainTransient(typeof(IReadOnlyRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); + services.ShouldContainTransient(typeof(IReadOnlyBasicRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IBasicRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); services.ShouldContainTransient(typeof(IRepository), typeof(MyTestAggregateRootWithDefaultPkCustomRepository)); } diff --git a/framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.abppkg.json b/framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.abppkg.json rename to framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.abppkg diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.abppkg.json b/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.abppkg.json rename to framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.abppkg diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.abppkg.json b/framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.abppkg similarity index 100% rename from framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.abppkg.json rename to framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.abppkg diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.abppkg.json b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.abppkg.json rename to framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.abppkg diff --git a/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.abppkg.json b/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.abppkg.json rename to framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.abppkg diff --git a/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.abppkg.json b/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.abppkg.json rename to framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.abppkg diff --git a/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.abppkg.json b/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.abppkg.json rename to framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.abppkg diff --git a/framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.abppkg.json b/framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.abppkg.json rename to framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.abppkg diff --git a/framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.abppkg.json b/framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.abppkg.json rename to framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.abppkg diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.abppkg.json b/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.abppkg.json rename to framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.abppkg diff --git a/framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.abppkg.json b/framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.abppkg.json rename to framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.abppkg diff --git a/framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.abppkg.json b/framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.abppkg.json rename to framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.abppkg diff --git a/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo.Abp.Imaging.Abstractions.Tests.abppkg.json b/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo.Abp.Imaging.Abstractions.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo.Abp.Imaging.Abstractions.Tests.abppkg.json rename to framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo.Abp.Imaging.Abstractions.Tests.abppkg diff --git a/framework/test/Volo.Abp.Imaging.AspNetCore.Tests/Volo.Abp.Imaging.AspNetCore.Tests.abppkg.json b/framework/test/Volo.Abp.Imaging.AspNetCore.Tests/Volo.Abp.Imaging.AspNetCore.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Imaging.AspNetCore.Tests/Volo.Abp.Imaging.AspNetCore.Tests.abppkg.json rename to framework/test/Volo.Abp.Imaging.AspNetCore.Tests/Volo.Abp.Imaging.AspNetCore.Tests.abppkg diff --git a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo.Abp.Imaging.ImageSharp.Tests.abppkg.json b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo.Abp.Imaging.ImageSharp.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo.Abp.Imaging.ImageSharp.Tests.abppkg.json rename to framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo.Abp.Imaging.ImageSharp.Tests.abppkg diff --git a/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo.Abp.Imaging.MagickNet.Tests.abppkg.json b/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo.Abp.Imaging.MagickNet.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo.Abp.Imaging.MagickNet.Tests.abppkg.json rename to framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo.Abp.Imaging.MagickNet.Tests.abppkg diff --git a/framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.abppkg.json b/framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.abppkg.json rename to framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.abppkg diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.abppkg.json b/framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.abppkg.json rename to framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.abppkg diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.abppkg.json b/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.abppkg.json rename to framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.abppkg diff --git a/framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.abppkg.json b/framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.abppkg.json rename to framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.abppkg diff --git a/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.abppkg.json b/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.abppkg.json rename to framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.abppkg diff --git a/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.abppkg.json b/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.abppkg.json rename to framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.abppkg diff --git a/framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.abppkg.json b/framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.abppkg similarity index 100% rename from framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.abppkg.json rename to framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.abppkg diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.abppkg.json b/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.abppkg.json rename to framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.abppkg diff --git a/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.abppkg.json b/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.abppkg.json rename to framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.abppkg diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.abppkg.json b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.abppkg.json rename to framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.abppkg diff --git a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.abppkg.json b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.abppkg.json rename to framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.abppkg diff --git a/framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.abppkg.json b/framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.abppkg.json rename to framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.abppkg diff --git a/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.abppkg.json b/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.abppkg.json rename to framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.abppkg diff --git a/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.abppkg.json b/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.abppkg.json rename to framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.abppkg diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.abppkg.json b/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.abppkg.json rename to framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.abppkg diff --git a/framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.abppkg.json b/framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.abppkg.json rename to framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.abppkg diff --git a/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.abppkg.json b/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.abppkg.json rename to framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.abppkg diff --git a/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.abppkg.json b/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.abppkg.json rename to framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.abppkg diff --git a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.abppkg.json b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.abppkg similarity index 100% rename from framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.abppkg.json rename to framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.abppkg diff --git a/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.abppkg.json b/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.abppkg.json rename to framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.abppkg diff --git a/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.abppkg.json b/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.abppkg.json rename to framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.abppkg diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.abppkg.json b/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.abppkg.json rename to framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.abppkg diff --git a/framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.abppkg.json b/framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.abppkg.json rename to framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.abppkg diff --git a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.abppkg.json b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.abppkg.json rename to framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.abppkg diff --git a/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.abppkg.json b/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.abppkg.json rename to framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.abppkg diff --git a/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.abppkg.json b/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.abppkg.json rename to framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.abppkg diff --git a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.abppkg.json b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.abppkg similarity index 100% rename from framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.abppkg.json rename to framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.abppkg diff --git a/modules/account/Volo.Abp.Account.abpmdl.json b/modules/account/Volo.Abp.Account.abpmdl similarity index 82% rename from modules/account/Volo.Abp.Account.abpmdl.json rename to modules/account/Volo.Abp.Account.abpmdl index 39ecf6ca19..1c68c5785d 100644 --- a/modules/account/Volo.Abp.Account.abpmdl.json +++ b/modules/account/Volo.Abp.Account.abpmdl @@ -7,39 +7,39 @@ }, "packages": { "Volo.Abp.Account.Web.OpenIddict": { - "path": "src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json", + "path": "src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg", "folder": "src" }, "Volo.Abp.Account.Web.IdentityServer": { - "path": "src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.abppkg.json", + "path": "src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.abppkg", "folder": "src" }, "Volo.Abp.Account.Web": { - "path": "src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.json", + "path": "src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg", "folder": "src" }, "Volo.Abp.Account.HttpApi.Client": { - "path": "src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.json", + "path": "src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Abp.Account.HttpApi": { - "path": "src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.json", + "path": "src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg", "folder": "src" }, "Volo.Abp.Account.Application": { - "path": "src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.json", + "path": "src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg", "folder": "src" }, "Volo.Abp.Account.Application.Contracts": { - "path": "src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.json", + "path": "src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg", "folder": "src" }, "Volo.Abp.Account.Application.Tests": { - "path": "test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.abppkg.json", + "path": "test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.abppkg", "folder": "test" }, "Volo.Abp.Account.Blazor": { - "path": "src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.json", + "path": "src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg", "folder": "src" } } diff --git a/modules/account/Volo.Abp.Account.abpsln.json b/modules/account/Volo.Abp.Account.abpsln similarity index 53% rename from modules/account/Volo.Abp.Account.abpsln.json rename to modules/account/Volo.Abp.Account.abpsln index 7a1b7818a9..734b61a247 100644 --- a/modules/account/Volo.Abp.Account.abpsln.json +++ b/modules/account/Volo.Abp.Account.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.Account": { - "path": "Volo.Abp.Account.abpmdl.json" + "path": "Volo.Abp.Account.abpmdl" } } } \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.json rename to modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.json b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.json rename to modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.json b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.json rename to modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg diff --git a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.json b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.json rename to modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg diff --git a/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.json b/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.json rename to modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj index 4db5816a22..284925acd8 100644 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj +++ b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.abppkg.json b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.abppkg.json rename to modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.abppkg diff --git a/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json rename to modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg diff --git a/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.json b/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg similarity index 100% rename from modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.json rename to modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg diff --git a/modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.abppkg.json b/modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.abppkg similarity index 100% rename from modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.abppkg.json rename to modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.abppkg diff --git a/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json b/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl similarity index 79% rename from modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json rename to modules/audit-logging/Volo.Abp.AuditLogging.abpmdl index 7235552474..8d840eb261 100644 --- a/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json +++ b/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl @@ -7,35 +7,35 @@ }, "packages": { "Volo.Abp.AuditLogging.Domain": { - "path": "src/Volo.Abp.AuditLogging.Domain/Volo.Abp.AuditLogging.Domain.abppkg.json", + "path": "src/Volo.Abp.AuditLogging.Domain/Volo.Abp.AuditLogging.Domain.abppkg", "folder": "src" }, "Volo.Abp.AuditLogging.Domain.Shared": { - "path": "src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.AuditLogging.EntityFrameworkCore": { - "path": "src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.AuditLogging.MongoDB": { - "path": "src/Volo.Abp.AuditLogging.MongoDB/Volo.Abp.AuditLogging.MongoDB.abppkg.json", + "path": "src/Volo.Abp.AuditLogging.MongoDB/Volo.Abp.AuditLogging.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.AuditLogging.Tests": { - "path": "test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.abppkg.json", + "path": "test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.abppkg", "folder": "test" }, "Volo.Abp.AuditLogging.TestBase": { - "path": "test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.abppkg.json", + "path": "test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.abppkg", "folder": "test" }, "Volo.Abp.AuditLogging.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.AuditLogging.MongoDB.Tests": { - "path": "test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg", "folder": "test" } } diff --git a/modules/audit-logging/Volo.Abp.AuditLogging.abpsln.json b/modules/audit-logging/Volo.Abp.AuditLogging.abpsln similarity index 53% rename from modules/audit-logging/Volo.Abp.AuditLogging.abpsln.json rename to modules/audit-logging/Volo.Abp.AuditLogging.abpsln index 380c46c413..2c9968c6ea 100644 --- a/modules/audit-logging/Volo.Abp.AuditLogging.abpsln.json +++ b/modules/audit-logging/Volo.Abp.AuditLogging.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.AuditLogging": { - "path": "Volo.Abp.AuditLogging.abpmdl.json" + "path": "Volo.Abp.AuditLogging.abpmdl" } } } \ No newline at end of file diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.abppkg.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.abppkg similarity index 100% rename from modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.abppkg.json rename to modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.abppkg diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json index 19507eb2d6..3c2870646a 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json @@ -54,9 +54,9 @@ "Yes": "Yes", "No": "No", "Changes": "Changes", - "AverageExecutionDurationInLogsPerDay": "Average execution duration", + "AverageExecutionDurationInLogsPerDay": "Average Execution Duration", "AverageExecutionDurationInMilliseconds": "Average execution duration in milliseconds", - "ErrorRateInLogs": "Error rate in logs", + "ErrorRateInLogs": "Error Rate in Logs", "Success": "Success", "Fault": "Fault", "NoChanges": "No change(s)", diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/tr.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/tr.json index 0a607401aa..a88c4e3c03 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/tr.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/tr.json @@ -53,9 +53,9 @@ "Yes": "Evet", "No": "Hayır", "UserNameFilter": "Kullanıcı Filtresi", - "AverageExecutionDurationInLogsPerDay": "Ortalama işlem süresi", + "AverageExecutionDurationInLogsPerDay": "Ortalama İşlem Süresi", "AverageExecutionDurationInMilliseconds": "Milisaniye cinsinden ortalama işlem süresi", - "ErrorRateInLogs": "Loglardaki hata oranı", + "ErrorRateInLogs": "Loglardaki Hata Oranı", "Success": "Başarılı", "Fault": "Hatalı", "NoChanges": "Değişiklik yok", diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo.Abp.AuditLogging.Domain.abppkg.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo.Abp.AuditLogging.Domain.abppkg similarity index 100% rename from modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo.Abp.AuditLogging.Domain.abppkg.json rename to modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo.Abp.AuditLogging.Domain.abppkg diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.abppkg.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.abppkg similarity index 100% rename from modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.abppkg.json rename to modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.abppkg diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj index 0e2827a94d..0e616b6b9d 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj @@ -14,8 +14,8 @@ - - + + true content\ diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo.Abp.AuditLogging.MongoDB.abppkg.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo.Abp.AuditLogging.MongoDB.abppkg similarity index 100% rename from modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo.Abp.AuditLogging.MongoDB.abppkg.json rename to modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo.Abp.AuditLogging.MongoDB.abppkg diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.abppkg.json b/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.abppkg.json rename to modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.abppkg diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg.json b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg similarity index 100% rename from modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg.json rename to modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.abppkg.json b/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.abppkg similarity index 100% rename from modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.abppkg.json rename to modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.abppkg diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.abppkg.json b/modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.abppkg similarity index 100% rename from modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.abppkg.json rename to modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.abppkg diff --git a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json b/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl similarity index 76% rename from modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json rename to modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl index afaaa34965..c7e7a52c23 100644 --- a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json +++ b/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl @@ -8,55 +8,55 @@ }, "packages": { "Volo.Abp.BackgroundJobs.DemoApp": { - "path": "app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.abppkg.json", + "path": "app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.abppkg", "folder": "app" }, "Volo.Abp.BackgroundJobs.DemoApp.RabbitMq": { - "path": "app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.abppkg.json", + "path": "app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.abppkg", "folder": "app" }, "Volo.Abp.BackgroundJobs.DemoApp.Quartz": { - "path": "app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg.json", + "path": "app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg", "folder": "app" }, "Volo.Abp.BackgroundJobs.DemoApp.HangFire": { - "path": "app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.abppkg.json", + "path": "app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.abppkg", "folder": "app" }, "Volo.Abp.BackgroundJobs.DemoApp.Shared": { - "path": "app/Volo.Abp.BackgroundJobs.DemoApp.Shared/Volo.Abp.BackgroundJobs.DemoApp.Shared.abppkg.json", + "path": "app/Volo.Abp.BackgroundJobs.DemoApp.Shared/Volo.Abp.BackgroundJobs.DemoApp.Shared.abppkg", "folder": "app" }, "Volo.Abp.BackgroundJobs.Domain": { - "path": "src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.Domain.Shared": { - "path": "src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.EntityFrameworkCore": { - "path": "src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.MongoDB": { - "path": "src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.json", + "path": "src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.BackgroundJobs.TestBase": { - "path": "test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.abppkg.json", + "path": "test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.abppkg", "folder": "test" }, "Volo.Abp.BackgroundJobs.Domain.Tests": { - "path": "test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.abppkg", "folder": "test" }, "Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.BackgroundJobs.MongoDB.Tests": { - "path": "test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.abppkg", "folder": "test" } } diff --git a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpsln.json b/modules/background-jobs/Volo.Abp.BackgroundJobs.abpsln similarity index 53% rename from modules/background-jobs/Volo.Abp.BackgroundJobs.abpsln.json rename to modules/background-jobs/Volo.Abp.BackgroundJobs.abpsln index 08b606ec39..fbd21955b0 100644 --- a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpsln.json +++ b/modules/background-jobs/Volo.Abp.BackgroundJobs.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.BackgroundJobs": { - "path": "Volo.Abp.BackgroundJobs.abpmdl.json" + "path": "Volo.Abp.BackgroundJobs.abpmdl" } } } \ No newline at end of file diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.abppkg.json b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.abppkg similarity index 100% rename from modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.abppkg.json rename to modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.abppkg diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg.json b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg similarity index 100% rename from modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg.json rename to modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.abppkg.json b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.abppkg similarity index 100% rename from modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.abppkg.json rename to modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.abppkg diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/Volo.Abp.BackgroundJobs.DemoApp.Shared.abppkg.json b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/Volo.Abp.BackgroundJobs.DemoApp.Shared.abppkg similarity index 100% rename from modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/Volo.Abp.BackgroundJobs.DemoApp.Shared.abppkg.json rename to modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/Volo.Abp.BackgroundJobs.DemoApp.Shared.abppkg diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.abppkg.json b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.abppkg similarity index 100% rename from modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.abppkg.json rename to modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.abppkg diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg similarity index 100% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.json rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg similarity index 100% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.json rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg similarity index 100% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.json rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj index 03b3761ab8..469cfdcfdc 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg similarity index 100% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.json rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.abppkg.json b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.abppkg similarity index 100% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.abppkg.json rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.abppkg diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.abppkg.json b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.abppkg.json rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.abppkg diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.abppkg.json b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.abppkg similarity index 100% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.abppkg.json rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.abppkg diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.abppkg.json b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.abppkg similarity index 100% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.abppkg.json rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.abppkg diff --git a/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json b/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl similarity index 76% rename from modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json rename to modules/basic-theme/Volo.Abp.BasicTheme.abpmdl index 38278730f3..a4fac2a634 100644 --- a/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json +++ b/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl @@ -7,31 +7,31 @@ }, "packages": { "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo": { - "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo": { - "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg", "folder": "test" }, "Volo.Abp.AspNetCore.Components.Server.BasicTheme": { - "path": "src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Components.Web.BasicTheme": { - "path": "src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme": { - "path": "src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic": { - "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json", + "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg", "folder": "src" }, "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests": { - "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg.json", + "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg", "folder": "test" } } diff --git a/modules/basic-theme/Volo.Abp.BasicTheme.abpsln.json b/modules/basic-theme/Volo.Abp.BasicTheme.abpsln similarity index 53% rename from modules/basic-theme/Volo.Abp.BasicTheme.abpsln.json rename to modules/basic-theme/Volo.Abp.BasicTheme.abpsln index 97199e5fa6..ed01aae60b 100644 --- a/modules/basic-theme/Volo.Abp.BasicTheme.abpsln.json +++ b/modules/basic-theme/Volo.Abp.BasicTheme.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.BasicTheme": { - "path": "Volo.Abp.BasicTheme.abpmdl.json" + "path": "Volo.Abp.BasicTheme.abpmdl" } } } \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg similarity index 100% rename from modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg.json rename to modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg similarity index 100% rename from modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg.json rename to modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg similarity index 100% rename from modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg.json rename to modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg similarity index 100% rename from modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json rename to modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj index af2e32dd9a..d558129dcf 100644 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj +++ b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg similarity index 100% rename from modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg.json rename to modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg similarity index 100% rename from modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg.json rename to modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 10c19fa8ef..c8f74eb4a4 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/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": "~7.4.2", + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.0.0-rc.2", "@abp/prismjs": "^~7.3.2", "@abp/highlight.js": "^~7.3.2" }, diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg similarity index 100% rename from modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg.json rename to modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index 821542e442..62017c3fe8 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/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": "~7.4.2", - "@abp/prismjs": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2", + "@abp/prismjs": "~8.0.0-rc.2" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index d3f9b5d9b6..cbad328e00 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,175 +43,175 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.2.tgz#e9c3361edb3aa22bfb5667f99605a26752843e91" - integrity sha512-KQRgMfvvtMS9StvHk0k15RB3UY6Z/5IN1CqjC/WSlHbn9SXNorEzkJ0gi1xoy/Hs0DTyPm74xnvd6GdQUShLQg== +"@abp/clipboard@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.0.0-rc.2.tgz#6f9eb3da44e62aee8bb7cd38ef5d9e105aff6f94" + integrity sha512-ytYIh5R8V6LbjdofeaRI14V7fO1A066SVn8Uc5G2aTq6WpeepzpwfJjDA7i/3sNO14FhnCLI2a5/IMP0zzxNCw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" clipboard "^2.0.8" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.2.tgz#41c9c847c8b6f89a7c126e346a020c494ddb74e9" - integrity sha512-ap9bifcEzIXaM10reSEhOrdpJS+ZvNXk7R+Nl/malvJjxeUlln/bRVROtidFp9RP1eFYecDywQE86gfdSmBtTg== +"@abp/prismjs@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.0.0-rc.2.tgz#db3dc72cfd4341ce879a7a2622f21424318ea90e" + integrity sha512-QYo/dCGkmzeAoj+L02WD5n5GVniqqzEZav6I6hFOJpP8pz9xfAqt6gDFlcXKqlGc4NaswfCxMtt0nfFATOJgwQ== dependencies: - "@abp/clipboard" "~7.4.2" - "@abp/core" "~7.4.2" + "@abp/clipboard" "~8.0.0-rc.2" + "@abp/core" "~8.0.0-rc.2" prismjs "^1.26.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json b/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl similarity index 80% rename from modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json rename to modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl index ed056b6014..eda96299b2 100644 --- a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json +++ b/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl @@ -16,39 +16,39 @@ }, "packages": { "BlobStoring.Database.Host.ConsoleApp.ConsoleApp": { - "path": "host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg.json", + "path": "host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg", "folder": "host/BlobStoring.Database.Host.ConsoleApp/src" }, "Volo.Abp.BlobStoring.Database.Domain": { - "path": "src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Database.Domain.Shared": { - "path": "src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Database.EntityFrameworkCore": { - "path": "src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Database.MongoDB": { - "path": "src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.json", + "path": "src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.BlobStoring.Database.TestBase": { - "path": "test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring.Database.MongoDB.Tests": { - "path": "test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.BlobStoring.Database.Domain.Tests": { - "path": "test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.abppkg", "folder": "test" } } diff --git a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpsln.json b/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpsln similarity index 64% rename from modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpsln.json rename to modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpsln index e90f5d10ff..4f0c58c7f5 100644 --- a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpsln.json +++ b/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpsln @@ -1,10 +1,10 @@ { "modules": { "Volo.Abp.BlobStoring.Database": { - "path": "Volo.Abp.BlobStoring.Database.abpmdl.json" + "path": "Volo.Abp.BlobStoring.Database.abpmdl" }, "BlobStoring.Database.Host.ConsoleApp": { - "path": "host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl.json" + "path": "host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl" } } } \ No newline at end of file diff --git a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl.json b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl similarity index 77% rename from modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl.json rename to modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl index e8b2a715c8..6118e5a96d 100644 --- a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl.json +++ b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.abpmdl @@ -6,7 +6,7 @@ }, "packages": { "BlobStoring.Database.Host.ConsoleApp.ConsoleApp": { - "path": "src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg.json", + "path": "src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg", "folder": "src" } } diff --git a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg.json b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg similarity index 100% rename from modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg.json rename to modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg similarity index 100% rename from modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.json rename to modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg similarity index 100% rename from modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.json rename to modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg similarity index 100% rename from modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.json rename to modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj index c030a29ef8..bf190d6c56 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg similarity index 100% rename from modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.json rename to modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.abppkg.json b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.abppkg similarity index 100% rename from modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.abppkg.json rename to modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.abppkg diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.abppkg.json b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.abppkg.json rename to modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.abppkg diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.abppkg.json b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.abppkg similarity index 100% rename from modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.abppkg.json rename to modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.abppkg diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.abppkg.json b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.abppkg similarity index 100% rename from modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.abppkg.json rename to modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.abppkg diff --git a/modules/blogging/Volo.Blogging.abpmdl.json b/modules/blogging/Volo.Blogging.abpmdl similarity index 81% rename from modules/blogging/Volo.Blogging.abpmdl.json rename to modules/blogging/Volo.Blogging.abpmdl index 48c3da23d5..81656030ba 100644 --- a/modules/blogging/Volo.Blogging.abpmdl.json +++ b/modules/blogging/Volo.Blogging.abpmdl @@ -8,95 +8,95 @@ }, "packages": { "Volo.BloggingTestApp": { - "path": "app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg.json", + "path": "app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg", "folder": "app" }, "Volo.Blogging.Domain": { - "path": "src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.json", + "path": "src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg", "folder": "src" }, "Volo.Blogging.Domain.Shared": { - "path": "src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.json", + "path": "src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg", "folder": "src" }, "Volo.Blogging.Application": { - "path": "src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.json", + "path": "src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg", "folder": "src" }, "Volo.Blogging.Application.Contracts": { - "path": "src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.json", + "path": "src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg", "folder": "src" }, "Volo.Blogging.EntityFrameworkCore": { - "path": "src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Blogging.HttpApi": { - "path": "src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.json", + "path": "src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg", "folder": "src" }, "Volo.Blogging.HttpApi.Client": { - "path": "src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.json", + "path": "src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Blogging.Web": { - "path": "src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.json", + "path": "src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg", "folder": "src" }, "Volo.BloggingTestApp.EntityFrameworkCore": { - "path": "app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.json", + "path": "app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg", "folder": "app" }, "Volo.Blogging.TestBase": { - "path": "test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.abppkg.json", + "path": "test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.abppkg", "folder": "test" }, "Volo.Blogging.EntityFrameworkCore.Tests": { - "path": "test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Blogging.Application.Tests": { - "path": "test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.abppkg.json", + "path": "test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.abppkg", "folder": "test" }, "Volo.Blogging.MongoDB": { - "path": "src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.json", + "path": "src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg", "folder": "src" }, "Volo.BloggingTestApp.MongoDB": { - "path": "app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.json", + "path": "app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg", "folder": "app" }, "Volo.Blogging.MongoDB.Tests": { - "path": "test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Blogging.Domain.Tests": { - "path": "test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.abppkg.json", + "path": "test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.abppkg", "folder": "test" }, "Volo.Blogging.Admin.Application.Contracts": { - "path": "src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.json", + "path": "src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg", "folder": "src" }, "Volo.Blogging.Admin.Application": { - "path": "src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.json", + "path": "src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg", "folder": "src" }, "Volo.Blogging.Admin.HttpApi": { - "path": "src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.json", + "path": "src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg", "folder": "src" }, "Volo.Blogging.Admin.HttpApi.Client": { - "path": "src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.json", + "path": "src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Blogging.Admin.Web": { - "path": "src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.json", + "path": "src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg", "folder": "src" }, "Volo.Blogging.Application.Contracts.Shared": { - "path": "src/Volo.Blogging.Application.Contracts.Shared/Volo.Blogging.Application.Contracts.Shared.abppkg.json", + "path": "src/Volo.Blogging.Application.Contracts.Shared/Volo.Blogging.Application.Contracts.Shared.abppkg", "folder": "src" } } diff --git a/modules/blogging/Volo.Blogging.abpsln.json b/modules/blogging/Volo.Blogging.abpsln similarity index 53% rename from modules/blogging/Volo.Blogging.abpsln.json rename to modules/blogging/Volo.Blogging.abpsln index c36288cbcd..0805eec9df 100644 --- a/modules/blogging/Volo.Blogging.abpsln.json +++ b/modules/blogging/Volo.Blogging.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Blogging": { - "path": "Volo.Blogging.abpmdl.json" + "path": "Volo.Blogging.abpmdl" } } } \ No newline at end of file diff --git a/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.json b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg similarity index 100% rename from modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.json rename to modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg diff --git a/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.json b/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg similarity index 100% rename from modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.json rename to modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg.json b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg similarity index 100% rename from modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg.json rename to modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 12064a0559..c1c940ca8a 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": "~7.4.2", - "@abp/blogging": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2", + "@abp/blogging": "~8.0.0-rc.2" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 03ce157c26..195a61b3a5 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,201 +43,201 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-7.4.2.tgz#9e59b50bf3d31318504e6c7100c49194450979d3" - integrity sha512-jrsCUNWiLlG4CaYdGd8YmepE/iZD5BxqKFewSAPKGP/u/FZPJKPPOIUIRd34wewDcNcyvElkLAPFotjkxjFPxA== +"@abp/blogging@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-8.0.0-rc.2.tgz#ff3f6c55804acc3cd2bd922f4e93cdd5ea7b12e2" + integrity sha512-SfnUT7VuPuwVJinSbTEX4sTAE1A2TkG9yPR7oEe1Lmtnohe133fWBjfQzW113eqI2MKvVlB/BpQZ36jKOJ+yLQ== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - "@abp/owl.carousel" "~7.4.2" - "@abp/prismjs" "~7.4.2" - "@abp/tui-editor" "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + "@abp/owl.carousel" "~8.0.0-rc.2" + "@abp/prismjs" "~8.0.0-rc.2" + "@abp/tui-editor" "~8.0.0-rc.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.2.tgz#e9c3361edb3aa22bfb5667f99605a26752843e91" - integrity sha512-KQRgMfvvtMS9StvHk0k15RB3UY6Z/5IN1CqjC/WSlHbn9SXNorEzkJ0gi1xoy/Hs0DTyPm74xnvd6GdQUShLQg== +"@abp/clipboard@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.0.0-rc.2.tgz#6f9eb3da44e62aee8bb7cd38ef5d9e105aff6f94" + integrity sha512-ytYIh5R8V6LbjdofeaRI14V7fO1A066SVn8Uc5G2aTq6WpeepzpwfJjDA7i/3sNO14FhnCLI2a5/IMP0zzxNCw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" clipboard "^2.0.8" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/owl.carousel@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-7.4.2.tgz#6dca81976c99679fd48b21777e4f7e6ac0233714" - integrity sha512-3bReHl/eg722cIWGXHYy3Z9TEolYKbHhhayN4ALyy9kE0scMy5n5CPto4Nwx1po51mL50D8Ws/lhtlGfcmZ0zw== +"@abp/owl.carousel@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-8.0.0-rc.2.tgz#93597c773bd4f170fd2c894e8cf09840729961b4" + integrity sha512-SOn97MC45c/hncBJt3gFyGGbaVUff1hCHjhOPthKi9Hznqrbz/FMRad//ft3ydw0OD4k8NXcBVGhN0mT55xOww== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" owl.carousel "^2.3.4" -"@abp/prismjs@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.2.tgz#41c9c847c8b6f89a7c126e346a020c494ddb74e9" - integrity sha512-ap9bifcEzIXaM10reSEhOrdpJS+ZvNXk7R+Nl/malvJjxeUlln/bRVROtidFp9RP1eFYecDywQE86gfdSmBtTg== +"@abp/prismjs@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.0.0-rc.2.tgz#db3dc72cfd4341ce879a7a2622f21424318ea90e" + integrity sha512-QYo/dCGkmzeAoj+L02WD5n5GVniqqzEZav6I6hFOJpP8pz9xfAqt6gDFlcXKqlGc4NaswfCxMtt0nfFATOJgwQ== dependencies: - "@abp/clipboard" "~7.4.2" - "@abp/core" "~7.4.2" + "@abp/clipboard" "~8.0.0-rc.2" + "@abp/core" "~8.0.0-rc.2" prismjs "^1.26.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/tui-editor@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.2.tgz#9fdbc681ad6f1a1934336b09677dd15561f948e2" - integrity sha512-MTF/BC6/clPccc13FbqgMuaIluBJ3Qs5sPov8z7/f8nns49/nTsli0MHG8oHA59+pYg8T9xWEWleZYxJ8FxmDg== +"@abp/tui-editor@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-8.0.0-rc.2.tgz#ea30d507877bdeab5762c905c8ec8fae87ea57fb" + integrity sha512-QEgbx/N95Kp0uqOSJA3Yj8vGmBQyMeuOUWPxxkFN8Pu7hu/PEaSndX1izNuhIOSn7zFkuGhe6/aUgC+LcVP3jw== dependencies: - "@abp/jquery" "~7.4.2" - "@abp/prismjs" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" + "@abp/prismjs" "~8.0.0-rc.2" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.json b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.json rename to modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.json b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.json rename to modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.json b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.json rename to modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.json b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.json rename to modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.json b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.json rename to modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo.Blogging.Application.Contracts.Shared.abppkg.json b/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo.Blogging.Application.Contracts.Shared.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo.Blogging.Application.Contracts.Shared.abppkg.json rename to modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo.Blogging.Application.Contracts.Shared.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.json b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.json rename to modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.json b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.json rename to modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.json rename to modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.json b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.json rename to modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.json b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.json rename to modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg diff --git a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.json b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.json rename to modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.json b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.json rename to modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj index 2abe2fe67f..679c55f061 100644 --- a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj +++ b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.json b/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.json rename to modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.json b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg similarity index 100% rename from modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.json rename to modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg diff --git a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.abppkg.json b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.abppkg similarity index 100% rename from modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.abppkg.json rename to modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.abppkg diff --git a/modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.abppkg.json b/modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.abppkg similarity index 100% rename from modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.abppkg.json rename to modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.abppkg diff --git a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.abppkg.json b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.abppkg.json rename to modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.abppkg diff --git a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.abppkg.json b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.abppkg similarity index 100% rename from modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.abppkg.json rename to modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.abppkg diff --git a/modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.abppkg.json b/modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.abppkg similarity index 100% rename from modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.abppkg.json rename to modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.abppkg diff --git a/modules/client-simulation/Volo.ClientSimulation.abpmdl.json b/modules/client-simulation/Volo.ClientSimulation.abpmdl similarity index 89% rename from modules/client-simulation/Volo.ClientSimulation.abpmdl.json rename to modules/client-simulation/Volo.ClientSimulation.abpmdl index 23072993cb..88eb9902b9 100644 --- a/modules/client-simulation/Volo.ClientSimulation.abpmdl.json +++ b/modules/client-simulation/Volo.ClientSimulation.abpmdl @@ -7,15 +7,15 @@ }, "packages": { "Volo.ClientSimulation": { - "path": "src/Volo.ClientSimulation/Volo.ClientSimulation.abppkg.json", + "path": "src/Volo.ClientSimulation/Volo.ClientSimulation.abppkg", "folder": "src" }, "Volo.ClientSimulation.Demo": { - "path": "demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.abppkg.json", + "path": "demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.abppkg", "folder": "demo" }, "Volo.ClientSimulation.Web": { - "path": "src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.abppkg.json", + "path": "src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.abppkg", "folder": "src" } } diff --git a/modules/client-simulation/Volo.ClientSimulation.abpsln.json b/modules/client-simulation/Volo.ClientSimulation.abpsln similarity index 53% rename from modules/client-simulation/Volo.ClientSimulation.abpsln.json rename to modules/client-simulation/Volo.ClientSimulation.abpsln index b1db63eea0..7da6815e1f 100644 --- a/modules/client-simulation/Volo.ClientSimulation.abpsln.json +++ b/modules/client-simulation/Volo.ClientSimulation.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.ClientSimulation": { - "path": "Volo.ClientSimulation.abpmdl.json" + "path": "Volo.ClientSimulation.abpmdl" } } } \ No newline at end of file diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.abppkg.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.abppkg similarity index 100% rename from modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.abppkg.json rename to modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.abppkg diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 2b789782c1..434b6e58cc 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": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index 94cc459e47..4f4541ba83 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.abppkg.json b/modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.abppkg similarity index 100% rename from modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.abppkg.json rename to modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.abppkg diff --git a/modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.abppkg.json b/modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.abppkg similarity index 100% rename from modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.abppkg.json rename to modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.abppkg diff --git a/modules/cms-kit/Volo.CmsKit.abpmdl.json b/modules/cms-kit/Volo.CmsKit.abpmdl similarity index 81% rename from modules/cms-kit/Volo.CmsKit.abpmdl.json rename to modules/cms-kit/Volo.CmsKit.abpmdl index 69c407d6dd..d6437bc497 100644 --- a/modules/cms-kit/Volo.CmsKit.abpmdl.json +++ b/modules/cms-kit/Volo.CmsKit.abpmdl @@ -8,143 +8,143 @@ }, "packages": { "Volo.CmsKit.Web.Unified": { - "path": "host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg.json", + "path": "host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg", "folder": "host" }, "Volo.CmsKit.Web.Host": { - "path": "host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.json", + "path": "host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg", "folder": "host" }, "Volo.CmsKit.HttpApi.Host": { - "path": "host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.json", + "path": "host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg", "folder": "host" }, "Volo.CmsKit.IdentityServer": { - "path": "host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg.json", + "path": "host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg", "folder": "host" }, "Volo.CmsKit.Host.Shared": { - "path": "host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg.json", + "path": "host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg", "folder": "host" }, "Volo.CmsKit.Domain.Shared": { - "path": "src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.json", + "path": "src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg", "folder": "src" }, "Volo.CmsKit.Domain": { - "path": "src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.json", + "path": "src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg", "folder": "src" }, "Volo.CmsKit.Application.Contracts": { - "path": "src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.json", + "path": "src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg", "folder": "src" }, "Volo.CmsKit.Application": { - "path": "src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.json", + "path": "src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg", "folder": "src" }, "Volo.CmsKit.EntityFrameworkCore": { - "path": "src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.CmsKit.MongoDB": { - "path": "src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.json", + "path": "src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg", "folder": "src" }, "Volo.CmsKit.HttpApi": { - "path": "src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.json", + "path": "src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg", "folder": "src" }, "Volo.CmsKit.HttpApi.Client": { - "path": "src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.json", + "path": "src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg", "folder": "src" }, "Volo.CmsKit.TestBase": { - "path": "test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.abppkg.json", + "path": "test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.abppkg", "folder": "test" }, "Volo.CmsKit.EntityFrameworkCore.Tests": { - "path": "test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.CmsKit.MongoDB.Tests": { - "path": "test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.abppkg.json", + "path": "test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.CmsKit.Domain.Tests": { - "path": "test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.abppkg.json", + "path": "test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.abppkg", "folder": "test" }, "Volo.CmsKit.Application.Tests": { - "path": "test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.abppkg.json", + "path": "test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.abppkg", "folder": "test" }, "Volo.CmsKit.Web": { - "path": "src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.json", + "path": "src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg", "folder": "src" }, "Volo.CmsKit.HttpApi.Client.ConsoleTestApp": { - "path": "test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.abppkg.json", + "path": "test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.abppkg", "folder": "test" }, "Volo.CmsKit.Admin.Application": { - "path": "src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.json", + "path": "src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg", "folder": "src" }, "Volo.CmsKit.Admin.Application.Contracts": { - "path": "src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg.json", + "path": "src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg", "folder": "src" }, "Volo.CmsKit.Admin.HttpApi": { - "path": "src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.json", + "path": "src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg", "folder": "src" }, "Volo.CmsKit.Admin.HttpApi.Client": { - "path": "src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.json", + "path": "src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg", "folder": "src" }, "Volo.CmsKit.Admin.Web": { - "path": "src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.json", + "path": "src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg", "folder": "src" }, "Volo.CmsKit.Public.Application": { - "path": "src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.json", + "path": "src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg", "folder": "src" }, "Volo.CmsKit.Public.Application.Contracts": { - "path": "src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.json", + "path": "src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg", "folder": "src" }, "Volo.CmsKit.Public.HttpApi": { - "path": "src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.json", + "path": "src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg", "folder": "src" }, "Volo.CmsKit.Public.HttpApi.Client": { - "path": "src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.json", + "path": "src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg", "folder": "src" }, "Volo.CmsKit.Public.Web": { - "path": "src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.json", + "path": "src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg", "folder": "src" }, "Volo.CmsKit.Common.Web": { - "path": "src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.json", + "path": "src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg", "folder": "src" }, "Volo.CmsKit.Common.Application.Contracts": { - "path": "src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg.json", + "path": "src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg", "folder": "src" }, "Volo.CmsKit.Common.Application": { - "path": "src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.json", + "path": "src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg", "folder": "src" }, "Volo.CmsKit.Common.HttpApi": { - "path": "src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.json", + "path": "src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg", "folder": "src" }, "Volo.CmsKit.Common.HttpApi.Client": { - "path": "src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.json", + "path": "src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg", "folder": "src" } } diff --git a/modules/cms-kit/Volo.CmsKit.abpsln.json b/modules/cms-kit/Volo.CmsKit.abpsln similarity index 53% rename from modules/cms-kit/Volo.CmsKit.abpsln.json rename to modules/cms-kit/Volo.CmsKit.abpsln index 1768ec8faf..3448e82475 100644 --- a/modules/cms-kit/Volo.CmsKit.abpsln.json +++ b/modules/cms-kit/Volo.CmsKit.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.CmsKit": { - "path": "Volo.CmsKit.abpmdl.json" + "path": "Volo.CmsKit.abpmdl" } } } \ No newline at end of file diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index ede7c32b96..f287b8bb09 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.basic": "~7.4.2", + "@abp/ng.account": "~8.0.0-rc.2", + "@abp/ng.identity": "~8.0.0-rc.2", + "@abp/ng.setting-management": "~8.0.0-rc.2", + "@abp/ng.tenant-management": "~8.0.0-rc.2", + "@abp/ng.theme.basic": "~8.0.0-rc.2", "@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 775099d5d3..f736c5954d 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": ">=7.4.2", - "@abp/ng.theme.shared": ">=7.4.2" + "@abp/ng.core": ">=8.0.0-rc.2", + "@abp/ng.theme.shared": ">=8.0.0-rc.2" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg.json b/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg similarity index 100% rename from modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg.json rename to modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.json b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg similarity index 100% rename from modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.json rename to modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg similarity index 100% rename from modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg.json rename to modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index e3371c654e..8fe97ab978 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": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 94cc459e47..4f4541ba83 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg similarity index 100% rename from modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.json rename to modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg 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 ef4a2dea54..b0daf10eee 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": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } 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 94cc459e47..4f4541ba83 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg similarity index 100% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg.json rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index 1cc2e235b9..06a86a179a 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2", - "@abp/cms-kit": "7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2", + "@abp/cms-kit": "8.0.0-rc.2" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index b9803e35cf..9baed7a421 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,257 +43,257 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.2.tgz#e9c3361edb3aa22bfb5667f99605a26752843e91" - integrity sha512-KQRgMfvvtMS9StvHk0k15RB3UY6Z/5IN1CqjC/WSlHbn9SXNorEzkJ0gi1xoy/Hs0DTyPm74xnvd6GdQUShLQg== +"@abp/clipboard@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.0.0-rc.2.tgz#6f9eb3da44e62aee8bb7cd38ef5d9e105aff6f94" + integrity sha512-ytYIh5R8V6LbjdofeaRI14V7fO1A066SVn8Uc5G2aTq6WpeepzpwfJjDA7i/3sNO14FhnCLI2a5/IMP0zzxNCw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" clipboard "^2.0.8" -"@abp/cms-kit.admin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-7.4.2.tgz#71b3c1b9787977f65a241bebac12bbe02d81bde2" - integrity sha512-BZBy1qPY3pKsjT+OaXsJmFuhypAukj5/7HqCaQ3pYltqBkEYWjc+jq09hdz+x7RikzfIhrEkJqbQTY1JWSpcvw== +"@abp/cms-kit.admin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-8.0.0-rc.2.tgz#f13534676eebeb7ff20fb22a03a5a1fdb822ae99" + integrity sha512-YFBGAwPAa73qUJvdtT+KncvTrY1tTcKwy0S6BTDhq6sGKMn8i76cV5WqnGNKcNrV9JxdxJNxCLf5/eCbGgfz/g== dependencies: - "@abp/codemirror" "~7.4.2" - "@abp/jstree" "~7.4.2" - "@abp/slugify" "~7.4.2" - "@abp/tui-editor" "~7.4.2" - "@abp/uppy" "~7.4.2" + "@abp/codemirror" "~8.0.0-rc.2" + "@abp/jstree" "~8.0.0-rc.2" + "@abp/slugify" "~8.0.0-rc.2" + "@abp/tui-editor" "~8.0.0-rc.2" + "@abp/uppy" "~8.0.0-rc.2" -"@abp/cms-kit.public@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-7.4.2.tgz#1c4b7f77332cb1375e9cd2d3238044a96cfaa0d6" - integrity sha512-/ZzWuNWRe5D8M0098sZIRGdkXfQgG0uRUDOlzBR7EEl2j0lACR3q6R/1x0M8+IC4LFly1LOVjs2o2X+maCxaKQ== +"@abp/cms-kit.public@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-8.0.0-rc.2.tgz#3f9a6b37201e35b95e09d616bcad75702e22cb49" + integrity sha512-+r8BHj7HY6HwyViS53Fs6iXPM1IMjDiWwFwXZXApFQti6jwG+3zOArY3cnC4SI/TJajHtZ3fpbP3/5CyQ9z+HA== dependencies: - "@abp/highlight.js" "~7.4.2" - "@abp/star-rating-svg" "~7.4.2" + "@abp/highlight.js" "~8.0.0-rc.2" + "@abp/star-rating-svg" "~8.0.0-rc.2" -"@abp/cms-kit@7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-7.4.2.tgz#75886b7fc3982981ec25e0d65d3b1c88a6ae1fdf" - integrity sha512-w9gX0vF0YuANpSQGvKWXEigOr2G2wJWbVsmqQuskD60prV9oJ5pdl4enoKgYMIHxVs14Xg/a2pAaxEzMHHKGkw== +"@abp/cms-kit@8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-8.0.0-rc.2.tgz#65b965fbb64262603efa9f55d37069acee8e165e" + integrity sha512-ZERfufcYmPER2igIzZlC2fN/LCYf1X/MWmtO5rC5Aa0GfJPJFI4kMxGHoNnzmDGLojfpUbXDz6M5gNHIkSQqIw== dependencies: - "@abp/cms-kit.admin" "~7.4.2" - "@abp/cms-kit.public" "~7.4.2" + "@abp/cms-kit.admin" "~8.0.0-rc.2" + "@abp/cms-kit.public" "~8.0.0-rc.2" -"@abp/codemirror@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-7.4.2.tgz#a0bef7cfedd8ee3db6636a8ad9e3b4be31802b2b" - integrity sha512-woX0oVS18TZiH3+DU7/dIxHuIcZHZpW8iyHWVx5fyqg6RW49ie6Mv5Wo9q+qF7lneS7GDhSF09Zc3hdeqvK/pA== +"@abp/codemirror@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-8.0.0-rc.2.tgz#abbb8532472067b8a13efbf0126adb3aba9e94de" + integrity sha512-KRnc2vaCdY3FycJSIaSqb3G8hG1OIkrGpC8rZGr64oFGPDLX1DnDoE7AxnsHyuhu6on9nRTmL1chuW4XR9T+Qg== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" codemirror "^5.65.1" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-7.4.2.tgz#cf5cd146511e10a347d410591026de50178dda4b" - integrity sha512-dk1/WXLJl9wvKBFPi0o1lKP03m47qGSYrEG3tOnQyl5YCbB7p2xdFZlFwbcQwr1kkNzypJfkCZtULEgG1RAXyw== +"@abp/highlight.js@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-8.0.0-rc.2.tgz#948cad2b1bf1ec2a444e6ec8777e291531466b6b" + integrity sha512-hAr+V6udUnFGTdHaDCCJym7RemAA9LUCKiH0H0hXPJ0ESYRMiN29MPtfvAC+iYnSyuVLQrVllm4r7nB3qur0Og== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/jstree@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-7.4.2.tgz#4ea359e7ce743a1fd1ecb5aed5646bef549c8064" - integrity sha512-TWfB/fZEFr9dsdvka/f9zo41Pg9ocjfGe29xiBIzDOYeO7RzymTu69QZ0GDn7t26mwv6cal6aGDjGd8U49DPwQ== +"@abp/jstree@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-8.0.0-rc.2.tgz#6e976a99d2f31d8eac43f4e5bd0151766724b1f7" + integrity sha512-JK7g0KB2fqGTXV+wdHk5hY+qxFVz21f1e0kl/kWX+66HFgIXxWTh5aY3yeEniy6Ac67IssuyJYsUN04+OB+E8g== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jstree "^3.3.12" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.2.tgz#41c9c847c8b6f89a7c126e346a020c494ddb74e9" - integrity sha512-ap9bifcEzIXaM10reSEhOrdpJS+ZvNXk7R+Nl/malvJjxeUlln/bRVROtidFp9RP1eFYecDywQE86gfdSmBtTg== +"@abp/prismjs@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.0.0-rc.2.tgz#db3dc72cfd4341ce879a7a2622f21424318ea90e" + integrity sha512-QYo/dCGkmzeAoj+L02WD5n5GVniqqzEZav6I6hFOJpP8pz9xfAqt6gDFlcXKqlGc4NaswfCxMtt0nfFATOJgwQ== dependencies: - "@abp/clipboard" "~7.4.2" - "@abp/core" "~7.4.2" + "@abp/clipboard" "~8.0.0-rc.2" + "@abp/core" "~8.0.0-rc.2" prismjs "^1.26.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/slugify@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-7.4.2.tgz#41235e18bb02dccae6e70b1647f80e66f298795f" - integrity sha512-hjZ1O42JfA3iTWzwy1j5V08Ev4iFq3DaFWqz8UZkdXUFa+ZoYNPLSfimRUTSuMRUM54pywvB9jOIFrj1/nw/Ow== +"@abp/slugify@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-8.0.0-rc.2.tgz#5e87e433b36c8766d55e17e733bf62223fa65a37" + integrity sha512-N6sHmQo73IbksfbGs6gJMVT5xAxoTE4h0xJ96Ryv8nMmoR8doTEuM7HE9GNyFKU7yB1r/rN8NCm3dcfjsChRZA== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-7.4.2.tgz#95c1c7ca79beb0ba891164805d6d17dadd8b8e74" - integrity sha512-xmbew+jJXKMtRQcP1XxWki1Ho08AOFy6/vrrtlzdx/whH8kc10BzjHmWIJHZm1APskstCFV7jO07uvZKbo2wJg== +"@abp/star-rating-svg@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-8.0.0-rc.2.tgz#27b6509f5ae61b70367bddad9731747d5a95409b" + integrity sha512-u5rb97RoaxLTOamYN7fSST40OrvUtjfUX9Z8GATP/KPb7/w12q5AAeFif75b4eQ/XT28rrJpAmCubQvkz94Afg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/tui-editor@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.2.tgz#9fdbc681ad6f1a1934336b09677dd15561f948e2" - integrity sha512-MTF/BC6/clPccc13FbqgMuaIluBJ3Qs5sPov8z7/f8nns49/nTsli0MHG8oHA59+pYg8T9xWEWleZYxJ8FxmDg== +"@abp/tui-editor@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-8.0.0-rc.2.tgz#ea30d507877bdeab5762c905c8ec8fae87ea57fb" + integrity sha512-QEgbx/N95Kp0uqOSJA3Yj8vGmBQyMeuOUWPxxkFN8Pu7hu/PEaSndX1izNuhIOSn7zFkuGhe6/aUgC+LcVP3jw== dependencies: - "@abp/jquery" "~7.4.2" - "@abp/prismjs" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" + "@abp/prismjs" "~8.0.0-rc.2" -"@abp/uppy@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-7.4.2.tgz#b62045550edfd5fae928d0bb0856fa2cff7cdbdb" - integrity sha512-uJ4f8JCk82swcKsPSDx3KC0bY1i8HhVUNqdPlQwNNDi3VMKzNLHOrfuty+tbXh/9VbKLXOLXOt8wutlK8dA4CA== +"@abp/uppy@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-8.0.0-rc.2.tgz#a885c6f8757abe04910fb5d0eeb4dca5ee80dbf2" + integrity sha512-DD3FxBQh6rAym1cZ9LS8CtrLXGeKFOHKwq24/dh93mzRPaJKbul31+blLSdVKwA/ZtxWf8uKEc78gI4gzsG9MA== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" uppy "^1.16.1" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj index abfbd3b87e..a4cc845142 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.json b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.json rename to modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.abppkg.json b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.abppkg similarity index 100% rename from modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.abppkg.json rename to modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.abppkg diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.abppkg.json b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.abppkg similarity index 100% rename from modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.abppkg.json rename to modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.abppkg diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.abppkg.json b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.abppkg.json rename to modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.abppkg diff --git a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.abppkg.json b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.abppkg similarity index 100% rename from modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.abppkg.json rename to modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.abppkg diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.abppkg.json b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.abppkg similarity index 100% rename from modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.abppkg.json rename to modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.abppkg diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.abppkg.json b/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.abppkg similarity index 100% rename from modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.abppkg.json rename to modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.abppkg diff --git a/modules/docs/Volo.Docs.abpmdl.json b/modules/docs/Volo.Docs.abpmdl similarity index 76% rename from modules/docs/Volo.Docs.abpmdl.json rename to modules/docs/Volo.Docs.abpmdl index 19476c5a80..17b5d6fab9 100644 --- a/modules/docs/Volo.Docs.abpmdl.json +++ b/modules/docs/Volo.Docs.abpmdl @@ -8,95 +8,95 @@ }, "packages": { "VoloDocs.Web": { - "path": "app/VoloDocs.Web/VoloDocs.Web.abppkg.json", + "path": "app/VoloDocs.Web/VoloDocs.Web.abppkg", "folder": "app" }, "VoloDocs.EntityFrameworkCore": { - "path": "app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.json", + "path": "app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg", "folder": "app" }, "VoloDocs.Migrator": { - "path": "app/VoloDocs.Migrator/VoloDocs.Migrator.abppkg.json", + "path": "app/VoloDocs.Migrator/VoloDocs.Migrator.abppkg", "folder": "app" }, "Volo.Docs.Web": { - "path": "src/Volo.Docs.Web/Volo.Docs.Web.abppkg.json", + "path": "src/Volo.Docs.Web/Volo.Docs.Web.abppkg", "folder": "src" }, "Volo.Docs.Application": { - "path": "src/Volo.Docs.Application/Volo.Docs.Application.abppkg.json", + "path": "src/Volo.Docs.Application/Volo.Docs.Application.abppkg", "folder": "src" }, "Volo.Docs.Domain": { - "path": "src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.json", + "path": "src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg", "folder": "src" }, "Volo.Docs.Domain.Shared": { - "path": "src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.json", + "path": "src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg", "folder": "src" }, "Volo.Docs.Application.Contracts": { - "path": "src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.json", + "path": "src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg", "folder": "src" }, "Volo.Docs.EntityFrameworkCore": { - "path": "src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Docs.HttpApi": { - "path": "src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.json", + "path": "src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg", "folder": "src" }, "Volo.Docs.HttpApi.Client": { - "path": "src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.json", + "path": "src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Docs.Admin.Application.Contracts": { - "path": "src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.abppkg.json", + "path": "src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.abppkg", "folder": "src" }, "Volo.Docs.Admin.Application": { - "path": "src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.json", + "path": "src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg", "folder": "src" }, "Volo.Docs.Admin.HttpApi": { - "path": "src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.json", + "path": "src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg", "folder": "src" }, "Volo.Docs.Admin.HttpApi.Client": { - "path": "src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.json", + "path": "src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Docs.Admin.Web": { - "path": "src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.json", + "path": "src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg", "folder": "src" }, "Volo.Docs.Application.Tests": { - "path": "test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.abppkg.json", + "path": "test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.abppkg", "folder": "test" }, "Volo.Docs.Domain.Tests": { - "path": "test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.abppkg.json", + "path": "test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.abppkg", "folder": "test" }, "Volo.Docs.EntityFrameworkCore.Tests": { - "path": "test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Docs.TestBase": { - "path": "test/Volo.Docs.TestBase/Volo.Docs.TestBase.abppkg.json", + "path": "test/Volo.Docs.TestBase/Volo.Docs.TestBase.abppkg", "folder": "test" }, "Volo.Docs.Admin.Application.Tests": { - "path": "test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.abppkg.json", + "path": "test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.abppkg", "folder": "test" }, "Volo.Docs.MongoDB": { - "path": "src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.json", + "path": "src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg", "folder": "src" }, "Volo.Docs.MongoDB.Tests": { - "path": "test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.abppkg", "folder": "test" } } diff --git a/modules/docs/Volo.Docs.abpsln.json b/modules/docs/Volo.Docs.abpsln similarity index 54% rename from modules/docs/Volo.Docs.abpsln.json rename to modules/docs/Volo.Docs.abpsln index 999096528c..688fe0befa 100644 --- a/modules/docs/Volo.Docs.abpsln.json +++ b/modules/docs/Volo.Docs.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Docs": { - "path": "Volo.Docs.abpmdl.json" + "path": "Volo.Docs.abpmdl" } } } \ No newline at end of file diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.json b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg similarity index 100% rename from modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.json rename to modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg diff --git a/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.abppkg.json b/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.abppkg similarity index 100% rename from modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.abppkg.json rename to modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.abppkg diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.abppkg.json b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.abppkg similarity index 100% rename from modules/docs/app/VoloDocs.Web/VoloDocs.Web.abppkg.json rename to modules/docs/app/VoloDocs.Web/VoloDocs.Web.abppkg diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index daa085e8a0..9ae8e5cf67 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2", - "@abp/docs": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2", + "@abp/docs": "~8.0.0-rc.2" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index f37e3f7965..548b9f74f9 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,47 +2,47 @@ # yarn lockfile v1 -"@abp/anchor-js@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-7.4.2.tgz#818bb6bc0fd5fead3ccbcfbb83bd18f196e84ab2" - integrity sha512-rMBLQoUTgzyOSIZrTcPG8KhWeSp9nQEf49YaHPPY5ey8TZIkAqSWduaf4dAOz3VqVM32veDXM1xwB6TiWClQUg== +"@abp/anchor-js@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-8.0.0-rc.2.tgz#f6a8eac8df0af55a9fcb60e7bf0d3fa5e8ff4670" + integrity sha512-+NUdbXXDGAF9+veOzRk8vauICbRGoL/MAWfwUy4la9VZzVP23BQMIscR2p7uwR+0n9Pdjn74X0CcwXHe/ANZYQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -51,194 +51,194 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.2.tgz#e9c3361edb3aa22bfb5667f99605a26752843e91" - integrity sha512-KQRgMfvvtMS9StvHk0k15RB3UY6Z/5IN1CqjC/WSlHbn9SXNorEzkJ0gi1xoy/Hs0DTyPm74xnvd6GdQUShLQg== +"@abp/clipboard@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.0.0-rc.2.tgz#6f9eb3da44e62aee8bb7cd38ef5d9e105aff6f94" + integrity sha512-ytYIh5R8V6LbjdofeaRI14V7fO1A066SVn8Uc5G2aTq6WpeepzpwfJjDA7i/3sNO14FhnCLI2a5/IMP0zzxNCw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" clipboard "^2.0.8" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/docs@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-7.4.2.tgz#0e7ff46faf2700e431d12cfeb2f0390043b01a38" - integrity sha512-LSI46EEkn+aGhVGz3T0yEMeVJCa032EcrhxSjZwI6ZAE0gjq/zi1vV4vKkWSmP1pboucFL0tyOBmbDCbTn5rVw== +"@abp/docs@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-8.0.0-rc.2.tgz#6e8a7579a84328d7e8f116093e897f360fd06f90" + integrity sha512-HtDdH1x4obCMdX2Z9P2iI+1lWk7rNcmCVbnCXKzO9FtHLccnBdEzRfEAb4bQ3nnReXg7el1zpRe3+WdM8+c6gw== dependencies: - "@abp/anchor-js" "~7.4.2" - "@abp/clipboard" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/popper.js" "~7.4.2" - "@abp/prismjs" "~7.4.2" + "@abp/anchor-js" "~8.0.0-rc.2" + "@abp/clipboard" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/popper.js" "~8.0.0-rc.2" + "@abp/prismjs" "~8.0.0-rc.2" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/popper.js@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-7.4.2.tgz#abc4e8af05e604397f726d7e165e45e8ce452db6" - integrity sha512-k0TTmaF/A3dzvmT0keJmS6hafwGsYfaGw0hETPEoLGpr+3JCLc7Qni6AFabmFJTcbOqkSUHenMvXxYuGPu3yAw== +"@abp/popper.js@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-8.0.0-rc.2.tgz#52935f54ef45e015e6ba9d8309ad7b4a69958f54" + integrity sha512-vEnFX8EMpiGz7FZhsJa57lAqWfYAnKZA9t60LCmNPie1JLDEpNrhhRI/d3EUCQYcdUXdnBhbqiBh9K2W0rFEpA== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.2.tgz#41c9c847c8b6f89a7c126e346a020c494ddb74e9" - integrity sha512-ap9bifcEzIXaM10reSEhOrdpJS+ZvNXk7R+Nl/malvJjxeUlln/bRVROtidFp9RP1eFYecDywQE86gfdSmBtTg== +"@abp/prismjs@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.0.0-rc.2.tgz#db3dc72cfd4341ce879a7a2622f21424318ea90e" + integrity sha512-QYo/dCGkmzeAoj+L02WD5n5GVniqqzEZav6I6hFOJpP8pz9xfAqt6gDFlcXKqlGc4NaswfCxMtt0nfFATOJgwQ== dependencies: - "@abp/clipboard" "~7.4.2" - "@abp/core" "~7.4.2" + "@abp/clipboard" "~8.0.0-rc.2" + "@abp/core" "~8.0.0-rc.2" prismjs "^1.26.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.abppkg.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.abppkg.json rename to modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.abppkg diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.json b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.json rename to modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.json b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.json rename to modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.json b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.json rename to modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.json b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.json rename to modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.json b/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.json rename to modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg diff --git a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.json b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.json rename to modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.json b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.json rename to modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.json b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.json rename to modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.json b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.json rename to modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.json b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.json rename to modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.json b/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.json rename to modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg diff --git a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj index ef466ba0d0..8af37e1793 100644 --- a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj +++ b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.json b/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.json rename to modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.json b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg similarity index 100% rename from modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.json rename to modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.abppkg.json b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.abppkg similarity index 100% rename from modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.abppkg.json rename to modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.abppkg diff --git a/modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.abppkg.json b/modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.abppkg similarity index 100% rename from modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.abppkg.json rename to modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.abppkg diff --git a/modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.abppkg.json b/modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.abppkg similarity index 100% rename from modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.abppkg.json rename to modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.abppkg diff --git a/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.abppkg.json b/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.abppkg.json rename to modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.abppkg diff --git a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.abppkg.json b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.abppkg similarity index 100% rename from modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.abppkg.json rename to modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.abppkg diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.abppkg.json b/modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.abppkg similarity index 100% rename from modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.abppkg.json rename to modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.abppkg diff --git a/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json b/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl similarity index 76% rename from modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json rename to modules/feature-management/Volo.Abp.FeatureManagement.abpmdl index 057390dae8..0ababcb4f1 100644 --- a/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json +++ b/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl @@ -7,71 +7,71 @@ }, "packages": { "Volo.Abp.FeatureManagement.Web": { - "path": "src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.Blazor": { - "path": "src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.Blazor.Server": { - "path": "src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.Blazor.WebAssembly": { - "path": "src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.HttpApi": { - "path": "src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.HttpApi.Client": { - "path": "src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.Application": { - "path": "src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.Domain": { - "path": "src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.Domain.Shared": { - "path": "src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.Application.Contracts": { - "path": "src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.EntityFrameworkCore": { - "path": "src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.MongoDB": { - "path": "src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.json", + "path": "src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.FeatureManagement.TestBase": { - "path": "test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.abppkg.json", + "path": "test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.abppkg", "folder": "test" }, "Volo.Abp.FeatureManagement.Domain.Tests": { - "path": "test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.abppkg", "folder": "test" }, "Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.FeatureManagement.MongoDB.Tests": { - "path": "test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.FeatureManagement.Application.Tests": { - "path": "test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.abppkg.json", + "path": "test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.abppkg", "folder": "test" } } diff --git a/modules/feature-management/Volo.Abp.FeatureManagement.abpsln.json b/modules/feature-management/Volo.Abp.FeatureManagement.abpsln similarity index 52% rename from modules/feature-management/Volo.Abp.FeatureManagement.abpsln.json rename to modules/feature-management/Volo.Abp.FeatureManagement.abpsln index 2da30a89cf..316a5bfea7 100644 --- a/modules/feature-management/Volo.Abp.FeatureManagement.abpsln.json +++ b/modules/feature-management/Volo.Abp.FeatureManagement.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.FeatureManagement": { - "path": "Volo.Abp.FeatureManagement.abpmdl.json" + "path": "Volo.Abp.FeatureManagement.abpmdl" } } } \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj index 2a8f2f8ebc..42ca9d48d3 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.json rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.abppkg.json b/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.abppkg similarity index 100% rename from modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.abppkg.json rename to modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.abppkg diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.abppkg.json b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.abppkg similarity index 100% rename from modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.abppkg.json rename to modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.abppkg diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.abppkg.json b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.abppkg.json rename to modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.abppkg diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.abppkg.json b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.abppkg similarity index 100% rename from modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.abppkg.json rename to modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.abppkg diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.abppkg.json b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.abppkg similarity index 100% rename from modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.abppkg.json rename to modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.abppkg diff --git a/modules/identity/Volo.Abp.Identity.abpmdl.json b/modules/identity/Volo.Abp.Identity.abpmdl similarity index 80% rename from modules/identity/Volo.Abp.Identity.abpmdl.json rename to modules/identity/Volo.Abp.Identity.abpmdl index 0ad432d707..67bf0f08fc 100644 --- a/modules/identity/Volo.Abp.Identity.abpmdl.json +++ b/modules/identity/Volo.Abp.Identity.abpmdl @@ -7,83 +7,83 @@ }, "packages": { "Volo.Abp.Identity.Web": { - "path": "src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.json", + "path": "src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg", "folder": "src" }, "Volo.Abp.Identity.HttpApi": { - "path": "src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.json", + "path": "src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg", "folder": "src" }, "Volo.Abp.Identity.HttpApi.Client": { - "path": "src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.json", + "path": "src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Abp.Identity.Blazor": { - "path": "src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.abppkg.json", + "path": "src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.abppkg", "folder": "src" }, "Volo.Abp.Identity.Blazor.Server": { - "path": "src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.abppkg.json", + "path": "src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.abppkg", "folder": "src" }, "Volo.Abp.Identity.Blazor.WebAssembly": { - "path": "src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.Identity.Domain": { - "path": "src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.json", + "path": "src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg", "folder": "src" }, "Volo.Abp.Identity.Application": { - "path": "src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.json", + "path": "src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg", "folder": "src" }, "Volo.Abp.Identity.Application.Contracts": { - "path": "src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.abppkg.json", + "path": "src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.abppkg", "folder": "src" }, "Volo.Abp.Identity.Domain.Shared": { - "path": "src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.Identity.EntityFrameworkCore": { - "path": "src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.Identity.Application.Tests": { - "path": "test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.abppkg.json", + "path": "test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.abppkg", "folder": "test" }, "Volo.Abp.Identity.MongoDB": { - "path": "src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.json", + "path": "src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.Identity.MongoDB.Tests": { - "path": "test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.Identity.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.Identity.TestBase": { - "path": "test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.abppkg.json", + "path": "test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.abppkg", "folder": "test" }, "Volo.Abp.Identity.Domain.Tests": { - "path": "test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.abppkg", "folder": "test" }, "Volo.Abp.Identity.AspNetCore": { - "path": "src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.abppkg.json", + "path": "src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Domain.Identity": { - "path": "src/Volo.Abp.PermissionManagement.Domain.Identity/Volo.Abp.PermissionManagement.Domain.Identity.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Domain.Identity/Volo.Abp.PermissionManagement.Domain.Identity.abppkg", "folder": "src" }, "Volo.Abp.Identity.AspNetCore.Tests": { - "path": "test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.abppkg.json", + "path": "test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.abppkg", "folder": "test" } } diff --git a/modules/identity/Volo.Abp.Identity.abpsln.json b/modules/identity/Volo.Abp.Identity.abpsln similarity index 53% rename from modules/identity/Volo.Abp.Identity.abpsln.json rename to modules/identity/Volo.Abp.Identity.abpsln index 68660cb264..3e93606014 100644 --- a/modules/identity/Volo.Abp.Identity.abpsln.json +++ b/modules/identity/Volo.Abp.Identity.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.Identity": { - "path": "Volo.Abp.Identity.abpmdl.json" + "path": "Volo.Abp.Identity.abpmdl" } } } \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.abppkg.json b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs index 354e7e4586..49f353153b 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs @@ -25,6 +25,14 @@ public class AbpIdentityDomainModule : AbpModule { private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(options => + { + options.IsRemoteRefreshEnabled = false; + }); + } + public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAutoMapperObjectMapper(); diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs index 1a5281e44c..b8d5679aff 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs @@ -50,6 +50,11 @@ public interface IIdentityUserRepository : IBasicRepository CancellationToken cancellationToken = default ); + Task> GetUserIdListByRoleIdAsync( + Guid roleId, + CancellationToken cancellationToken = default + ); + Task> GetListAsync( string sorting = null, int maxResultCount = int.MaxValue, diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs index 511b571fee..4d37887570 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs @@ -41,6 +41,12 @@ public interface IOrganizationUnitRepository : IBasicRepository> GetListByRoleIdAsync( + Guid roleId, + bool includeDetails = false, + CancellationToken cancellationToken = default + ); + Task> GetRolesAsync( OrganizationUnit organizationUnit, string sorting = null, @@ -90,6 +96,11 @@ public interface IOrganizationUnitRepository : IBasicRepository> GetMemberIdsAsync( + Guid id, + CancellationToken cancellationToken = default + ); + Task GetMembersCountAsync( OrganizationUnit organizationUnit, string filter = null, diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor.cs index 7d56a3b184..94a55b205e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Security.Principal; @@ -34,6 +35,11 @@ public class IdentityDynamicClaimsPrincipalContributor : AbpDynamicClaimsPrincip return; } + if (dynamicClaims.Claims.IsNullOrEmpty()) + { + return; + } + await AddDynamicClaimsAsync(context, identity, dynamicClaims.Claims); } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributorCache.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributorCache.cs index b0ab885e03..6051914adc 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributorCache.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributorCache.cs @@ -18,7 +18,7 @@ public class IdentityDynamicClaimsPrincipalContributorCache : ITransientDependen { public ILogger Logger { get; set; } - protected IDistributedCache Cache { get; } + protected IDistributedCache DynamicClaimCache { get; } protected ICurrentTenant CurrentTenant { get; } protected IdentityUserManager UserManager { get; } protected IUserClaimsPrincipalFactory UserClaimsPrincipalFactory { get; } @@ -26,14 +26,14 @@ public class IdentityDynamicClaimsPrincipalContributorCache : ITransientDependen protected IOptions CacheOptions { get; } public IdentityDynamicClaimsPrincipalContributorCache( - IDistributedCache cache, + IDistributedCache dynamicClaimCache, ICurrentTenant currentTenant, IdentityUserManager userManager, IUserClaimsPrincipalFactory userClaimsPrincipalFactory, IOptions abpClaimsPrincipalFactoryOptions, IOptions cacheOptions) { - Cache = cache; + DynamicClaimCache = dynamicClaimCache; CurrentTenant = currentTenant; UserManager = userManager; UserClaimsPrincipalFactory = userClaimsPrincipalFactory; @@ -47,7 +47,18 @@ public class IdentityDynamicClaimsPrincipalContributorCache : ITransientDependen { Logger.LogDebug($"Get dynamic claims cache for user: {userId}"); - return await Cache.GetOrAddAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId), async () => + if (AbpClaimsPrincipalFactoryOptions.Value.DynamicClaims.IsNullOrEmpty()) + { + var emptyCacheItem = new AbpDynamicClaimCacheItem(); + await DynamicClaimCache.SetAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId), emptyCacheItem, new DistributedCacheEntryOptions + { + AbsoluteExpirationRelativeToNow = CacheOptions.Value.CacheAbsoluteExpiration + }); + + return emptyCacheItem; + } + + return await DynamicClaimCache.GetOrAddAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId), async () => { using (CurrentTenant.Change(tenantId)) { @@ -80,7 +91,7 @@ public class IdentityDynamicClaimsPrincipalContributorCache : ITransientDependen public virtual async Task ClearAsync(Guid userId, Guid? tenantId = null) { - Logger.LogDebug($"Clearing dynamic claims cache for user: {userId}"); - await Cache.RemoveAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId)); + Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); + await DynamicClaimCache.RemoveAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId)); } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs index e6f8919c17..38de74e800 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs @@ -6,9 +6,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; +using Volo.Abp.Caching; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Services; using Volo.Abp.Identity.Localization; +using Volo.Abp.Security.Claims; using Volo.Abp.Threading; namespace Volo.Abp.Identity; @@ -19,6 +21,10 @@ public class IdentityRoleManager : RoleManager, IDomainService protected IStringLocalizer Localizer { get; } protected ICancellationTokenProvider CancellationTokenProvider { get; } + protected IIdentityUserRepository UserRepository { get; } + protected IOrganizationUnitRepository OrganizationUnitRepository { get; } + protected OrganizationUnitManager OrganizationUnitManager { get; } + protected IDistributedCache DynamicClaimCache { get; } public IdentityRoleManager( IdentityRoleStore store, @@ -27,7 +33,11 @@ public class IdentityRoleManager : RoleManager, IDomainService IdentityErrorDescriber errors, ILogger logger, IStringLocalizer localizer, - ICancellationTokenProvider cancellationTokenProvider) + ICancellationTokenProvider cancellationTokenProvider, + IIdentityUserRepository userRepository, + IOrganizationUnitRepository organizationUnitRepository, + OrganizationUnitManager organizationUnitManager, + IDistributedCache dynamicClaimCache) : base( store, roleValidators, @@ -37,6 +47,10 @@ public class IdentityRoleManager : RoleManager, IDomainService { Localizer = localizer; CancellationTokenProvider = cancellationTokenProvider; + UserRepository = userRepository; + OrganizationUnitRepository = organizationUnitRepository; + OrganizationUnitManager = organizationUnitManager; + DynamicClaimCache = dynamicClaimCache; } public virtual async Task GetByIdAsync(Guid id) @@ -57,7 +71,15 @@ public class IdentityRoleManager : RoleManager, IDomainService throw new BusinessException(IdentityErrorCodes.StaticRoleRenaming); } - return await base.SetRoleNameAsync(role, name); + var userIdList = await UserRepository.GetUserIdListByRoleIdAsync(role.Id, cancellationToken: CancellationToken); + var result = await base.SetRoleNameAsync(role, name); + if (result.Succeeded) + { + Logger.LogDebug($"Remove dynamic claims cache for users of role: {role.Id}"); + await DynamicClaimCache.RemoveManyAsync(userIdList.Select(userId => AbpDynamicClaimCacheItem.CalculateCacheKey(userId, role.TenantId)), token: CancellationToken); + } + + return result; } public async override Task DeleteAsync(IdentityRole role) @@ -67,6 +89,19 @@ public class IdentityRoleManager : RoleManager, IDomainService throw new BusinessException(IdentityErrorCodes.StaticRoleDeletion); } - return await base.DeleteAsync(role); + var userIdList = await UserRepository.GetUserIdListByRoleIdAsync(role.Id, cancellationToken: CancellationToken); + var orgList = await OrganizationUnitRepository.GetListByRoleIdAsync(role.Id, includeDetails: false, cancellationToken: CancellationToken); + var result = await base.DeleteAsync(role); + if (result.Succeeded) + { + Logger.LogDebug($"Remove dynamic claims cache for users of role: {role.Id}"); + await DynamicClaimCache.RemoveManyAsync(userIdList.Select(userId => AbpDynamicClaimCacheItem.CalculateCacheKey(userId, role.TenantId)), token: CancellationToken); + foreach (var organizationUnit in orgList) + { + await OrganizationUnitManager.RemoveDynamicClaimCacheAsync(organizationUnit); + } + } + + return result; } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs index 57b97bfcd7..185e31a1f4 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs @@ -7,12 +7,14 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using Volo.Abp.Caching; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Services; using Volo.Abp.EventBus.Distributed; using Volo.Abp.EventBus.Local; using Volo.Abp.Identity.Settings; +using Volo.Abp.Security.Claims; using Volo.Abp.Settings; using Volo.Abp.Threading; using Volo.Abp.Uow; @@ -28,6 +30,7 @@ public class IdentityUserManager : UserManager, IDomainService protected ICancellationTokenProvider CancellationTokenProvider { get; } protected IDistributedEventBus DistributedEventBus { get; } protected IIdentityLinkUserRepository IdentityLinkUserRepository { get; } + protected IDistributedCache DynamicClaimCache { get; } protected override CancellationToken CancellationToken => CancellationTokenProvider.Token; public IdentityUserManager( @@ -46,7 +49,8 @@ public class IdentityUserManager : UserManager, IDomainService IOrganizationUnitRepository organizationUnitRepository, ISettingProvider settingProvider, IDistributedEventBus distributedEventBus, - IIdentityLinkUserRepository identityLinkUserRepository) + IIdentityLinkUserRepository identityLinkUserRepository, + IDistributedCache dynamicClaimCache) : base( store, optionsAccessor, @@ -64,6 +68,7 @@ public class IdentityUserManager : UserManager, IDomainService RoleRepository = roleRepository; UserRepository = userRepository; IdentityLinkUserRepository = identityLinkUserRepository; + DynamicClaimCache = dynamicClaimCache; CancellationTokenProvider = cancellationTokenProvider; } @@ -160,6 +165,8 @@ public class IdentityUserManager : UserManager, IDomainService user.AddOrganizationUnit(ou.Id); await UserRepository.UpdateAsync(user, cancellationToken: CancellationToken); + + await DynamicClaimCache.RemoveAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(user.Id, user.TenantId), token: CancellationToken); } public virtual async Task RemoveFromOrganizationUnitAsync(Guid userId, Guid ouId) @@ -167,6 +174,8 @@ public class IdentityUserManager : UserManager, IDomainService var user = await UserRepository.GetAsync(userId, cancellationToken: CancellationToken); user.RemoveOrganizationUnit(ouId); await UserRepository.UpdateAsync(user, cancellationToken: CancellationToken); + + await DynamicClaimCache.RemoveAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(user.Id, user.TenantId), token: CancellationToken); } public virtual async Task RemoveFromOrganizationUnitAsync(IdentityUser user, OrganizationUnit ou) @@ -350,4 +359,42 @@ public class IdentityUserManager : UserManager, IDomainService return result; } + + public virtual async Task UpdateRoleAsync(Guid sourceRoleId, Guid? targetRoleId) + { + var sourceRole = await RoleRepository.GetAsync(sourceRoleId, cancellationToken: CancellationToken); + + Logger.LogDebug($"Remove dynamic claims cache for users of role: {sourceRoleId}"); + var userIdList = await UserRepository.GetUserIdListByRoleIdAsync(sourceRoleId, cancellationToken: CancellationToken); + await DynamicClaimCache.RemoveManyAsync(userIdList.Select(userId => AbpDynamicClaimCacheItem.CalculateCacheKey(userId, sourceRole.TenantId)), token: CancellationToken); + + var targetRole = targetRoleId.HasValue ? await RoleRepository.GetAsync(targetRoleId.Value, cancellationToken: CancellationToken) : null; + if (targetRole != null) + { + Logger.LogDebug($"Remove dynamic claims cache for users of role: {targetRoleId}"); + userIdList = await UserRepository.GetUserIdListByRoleIdAsync(targetRoleId.Value, cancellationToken: CancellationToken); + await DynamicClaimCache.RemoveManyAsync(userIdList.Select(userId => AbpDynamicClaimCacheItem.CalculateCacheKey(userId, targetRole.TenantId)), token: CancellationToken); + } + + await UserRepository.UpdateRoleAsync(sourceRoleId, targetRoleId, CancellationToken); + } + + public virtual async Task UpdateOrganizationAsync(Guid sourceOrganizationId, Guid? targetOrganizationId) + { + var sourceOrganization = await OrganizationUnitRepository.GetAsync(sourceOrganizationId, cancellationToken: CancellationToken); + + Logger.LogDebug($"Remove dynamic claims cache for users of organization: {sourceOrganizationId}"); + var userIdList = await OrganizationUnitRepository.GetMemberIdsAsync(sourceOrganizationId, cancellationToken: CancellationToken); + await DynamicClaimCache.RemoveManyAsync(userIdList.Select(userId => AbpDynamicClaimCacheItem.CalculateCacheKey(userId, sourceOrganization.TenantId)), token: CancellationToken); + + var targetOrganization = targetOrganizationId.HasValue ? await OrganizationUnitRepository.GetAsync(targetOrganizationId.Value, cancellationToken: CancellationToken) : null; + if (targetOrganization != null) + { + Logger.LogDebug($"Remove dynamic claims cache for users of organization: {targetOrganizationId}"); + userIdList = await OrganizationUnitRepository.GetMemberIdsAsync(targetOrganizationId.Value, cancellationToken: CancellationToken); + await DynamicClaimCache.RemoveManyAsync(userIdList.Select(userId => AbpDynamicClaimCacheItem.CalculateCacheKey(userId, targetOrganization.TenantId)), token: CancellationToken); + } + + await UserRepository.UpdateOrganizationAsync(sourceOrganizationId, targetOrganizationId, CancellationToken); + } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/OrganizationUnitManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/OrganizationUnitManager.cs index 1beb15f0b1..c4a8733787 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/OrganizationUnitManager.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/OrganizationUnitManager.cs @@ -3,8 +3,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Volo.Abp.Caching; using Volo.Abp.Domain.Services; using Volo.Abp.Identity.Localization; +using Volo.Abp.Security.Claims; using Volo.Abp.Threading; using Volo.Abp.Uow; @@ -18,17 +21,20 @@ public class OrganizationUnitManager : DomainService protected IOrganizationUnitRepository OrganizationUnitRepository { get; } protected IStringLocalizer Localizer { get; } protected IIdentityRoleRepository IdentityRoleRepository { get; } + protected IDistributedCache DynamicClaimCache { get; } protected ICancellationTokenProvider CancellationTokenProvider { get; } public OrganizationUnitManager( IOrganizationUnitRepository organizationUnitRepository, IStringLocalizer localizer, IIdentityRoleRepository identityRoleRepository, + IDistributedCache dynamicClaimCache, ICancellationTokenProvider cancellationTokenProvider) { OrganizationUnitRepository = organizationUnitRepository; Localizer = localizer; IdentityRoleRepository = identityRoleRepository; + DynamicClaimCache = dynamicClaimCache; CancellationTokenProvider = cancellationTokenProvider; } @@ -44,6 +50,7 @@ public class OrganizationUnitManager : DomainService { await ValidateOrganizationUnitAsync(organizationUnit); await OrganizationUnitRepository.UpdateAsync(organizationUnit); + await RemoveDynamicClaimCacheAsync(organizationUnit); } public virtual async Task GetNextChildCodeAsync(Guid? parentId) @@ -77,6 +84,7 @@ public class OrganizationUnitManager : DomainService foreach (var child in children) { + await RemoveDynamicClaimCacheAsync(child); await OrganizationUnitRepository.RemoveAllMembersAsync(child); await OrganizationUnitRepository.RemoveAllRolesAsync(child); await OrganizationUnitRepository.DeleteAsync(child); @@ -84,6 +92,7 @@ public class OrganizationUnitManager : DomainService var organizationUnit = await OrganizationUnitRepository.GetAsync(id); + await RemoveDynamicClaimCacheAsync(organizationUnit); await OrganizationUnitRepository.RemoveAllMembersAsync(organizationUnit); await OrganizationUnitRepository.RemoveAllRolesAsync(organizationUnit); await OrganizationUnitRepository.DeleteAsync(id); @@ -169,16 +178,17 @@ public class OrganizationUnitManager : DomainService ); } - public virtual Task AddRoleToOrganizationUnitAsync(IdentityRole role, OrganizationUnit ou) + public virtual async Task AddRoleToOrganizationUnitAsync(IdentityRole role, OrganizationUnit ou) { var currentRoles = ou.Roles; if (currentRoles.Any(r => r.OrganizationUnitId == ou.Id && r.RoleId == role.Id)) { - return Task.FromResult(0); + return; } ou.AddRole(role.Id); - return OrganizationUnitRepository.UpdateAsync(ou); + await OrganizationUnitRepository.UpdateAsync(ou); + await RemoveDynamicClaimCacheAsync(ou); } public virtual async Task RemoveRoleFromOrganizationUnitAsync(Guid roleId, Guid ouId) @@ -189,9 +199,17 @@ public class OrganizationUnitManager : DomainService ); } - public virtual Task RemoveRoleFromOrganizationUnitAsync(IdentityRole role, OrganizationUnit organizationUnit) + public virtual async Task RemoveRoleFromOrganizationUnitAsync(IdentityRole role, OrganizationUnit organizationUnit) { organizationUnit.RemoveRole(role.Id); - return OrganizationUnitRepository.UpdateAsync(organizationUnit); + await OrganizationUnitRepository.UpdateAsync(organizationUnit); + await RemoveDynamicClaimCacheAsync(organizationUnit); + } + + public virtual async Task RemoveDynamicClaimCacheAsync(OrganizationUnit organizationUnit) + { + Logger.LogDebug($"Remove dynamic claims cache for users of organization: {organizationUnit.Id}"); + var userIds = await OrganizationUnitRepository.GetMemberIdsAsync(organizationUnit.Id); + await DynamicClaimCache.RemoveManyAsync(userIds.Select(userId => AbpDynamicClaimCacheItem.CalculateCacheKey(userId, organizationUnit.TenantId))); } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserEntityUpdatedOrDeletedEventHandler.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserEntityUpdatedOrDeletedEventHandler.cs new file mode 100644 index 0000000000..a140d22f66 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserEntityUpdatedOrDeletedEventHandler.cs @@ -0,0 +1,47 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Caching; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Entities.Events; +using Volo.Abp.EventBus; +using Volo.Abp.Security.Claims; +using Volo.Abp.Uow; + +namespace Volo.Abp.Identity; + +public class UserEntityUpdatedOrDeletedEventHandler : + ILocalEventHandler>, + ILocalEventHandler>, + ITransientDependency +{ + public ILogger Logger { get; set; } + + private readonly IDistributedCache _dynamicClaimCache; + + public UserEntityUpdatedOrDeletedEventHandler(IDistributedCache dynamicClaimCache) + { + Logger = NullLogger.Instance; + + _dynamicClaimCache = dynamicClaimCache; + } + + [UnitOfWork] + public virtual async Task HandleEventAsync(EntityUpdatedEventData eventData) + { + await RemoveDynamicClaimCacheAsync(eventData.Entity.Id, eventData.Entity.TenantId); + } + + [UnitOfWork] + public virtual async Task HandleEventAsync(EntityDeletedEventData eventData) + { + await RemoveDynamicClaimCacheAsync(eventData.Entity.Id, eventData.Entity.TenantId); + } + + protected virtual async Task RemoveDynamicClaimCacheAsync(Guid userId, Guid? tenantId) + { + Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); + await _dynamicClaimCache.RemoveAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId)); + } +} diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserUpdatedEventHandler.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserUpdatedEventHandler.cs deleted file mode 100644 index 9ac8ad4746..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserUpdatedEventHandler.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Entities.Events; -using Volo.Abp.EventBus; -using Volo.Abp.Uow; - -namespace Volo.Abp.Identity; - -public class UserEntityUpdatedEventHandler : - ILocalEventHandler>, - ILocalEventHandler>, - ITransientDependency -{ - private readonly IdentityDynamicClaimsPrincipalContributorCache _cache; - - public UserEntityUpdatedEventHandler(IdentityDynamicClaimsPrincipalContributorCache cache) - { - _cache = cache; - } - - [UnitOfWork] - public virtual async Task HandleEventAsync(EntityUpdatedEventData eventData) - { - await ClearAsync(eventData.Entity.Id, eventData.Entity.TenantId); - } - - [UnitOfWork] - public virtual async Task HandleEventAsync(EntityDeletedEventData eventData) - { - await ClearAsync(eventData.Entity.Id, eventData.Entity.TenantId); - } - - protected virtual async Task ClearAsync(Guid userId, Guid? tenantId) - { - await _cache.ClearAsync(userId, tenantId); - } -} diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.json b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs index 6f3eb540f2..75ff06afe9 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs @@ -61,7 +61,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository() + var userRoles = await (from userRole in dbContext.Set() join role in dbContext.Roles on userRole.RoleId equals role.Id where userIds.Contains(userRole.UserId) group new @@ -73,7 +73,24 @@ public class EfCoreIdentityUserRepository : EfCoreRepository x.Name).ToArray() - }).ToListAsync(GetCancellationToken(cancellationToken)); + }).ToListAsync(cancellationToken: cancellationToken); + + var orgUnitRoles = await (from userOu in dbContext.Set() + join roleOu in dbContext.Set() on userOu.OrganizationUnitId equals roleOu.OrganizationUnitId + join role in dbContext.Roles on roleOu.RoleId equals role.Id + where userIds.Contains(userOu.UserId) + group new + { + userOu.UserId, + role.Name + } by userOu.UserId + into gp + select new IdentityUserIdWithRoleNames + { + Id = gp.Key, RoleNames = gp.Select(x => x.Name).ToArray() + }).ToListAsync(cancellationToken: cancellationToken); + + return userRoles.Concat(orgUnitRoles).GroupBy(x => x.Id).Select(x => new IdentityUserIdWithRoleNames {Id = x.Key, RoleNames = x.SelectMany(y => y.RoleNames).Distinct().ToArray()}).ToList(); } public virtual async Task> GetRoleNamesInOrganizationUnitAsync( @@ -151,6 +168,12 @@ public class EfCoreIdentityUserRepository : EfCoreRepository> GetUserIdListByRoleIdAsync(Guid roleId, CancellationToken cancellationToken = default) + { + return await (await GetDbContextAsync()).Set().Where(x => x.RoleId == roleId) + .Select(x => x.UserId).ToListAsync(GetCancellationToken(cancellationToken)); + } + public virtual async Task> GetListAsync( string sorting = null, int maxResultCount = int.MaxValue, diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs index 54ceaa92b6..9086716124 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs @@ -69,6 +69,21 @@ public class EfCoreOrganizationUnitRepository .ToListAsync(GetCancellationToken(cancellationToken)); } + public virtual async Task> GetListByRoleIdAsync( + Guid roleId, + bool includeDetails = false, + CancellationToken cancellationToken = default) + { + var dbContext = await GetDbContextAsync(); + + var query = from organizationRole in dbContext.Set() + join organizationUnit in dbContext.OrganizationUnits.IncludeDetails(includeDetails) on organizationRole.OrganizationUnitId equals organizationUnit.Id + where organizationRole.RoleId == roleId + select organizationUnit; + + return await query.ToListAsync(GetCancellationToken(cancellationToken)); + } + public virtual async Task GetAsync( string displayName, bool includeDetails = true, @@ -192,6 +207,16 @@ public class EfCoreOrganizationUnitRepository .ToListAsync(GetCancellationToken(cancellationToken)); } + public virtual async Task> GetMemberIdsAsync(Guid id, CancellationToken cancellationToken = default) + { + var dbContext = await GetDbContextAsync(); + + return await (from userOu in dbContext.Set() + join user in dbContext.Users on userOu.UserId equals user.Id + where userOu.OrganizationUnitId == id + select user.Id).ToListAsync(cancellationToken); + } + public virtual async Task GetMembersCountAsync( OrganizationUnit organizationUnit, string filter = null, diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.json b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.json b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj index 2c0ccdf41d..870786b900 100644 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.json b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs index 255e492c05..f93586ed79 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs @@ -131,7 +131,17 @@ public class MongoIdentityUserRepository : MongoDbRepository u.Roles.Any(r => r.RoleId == role.Id)) .ToListAsync(cancellationToken); } - + + public virtual async Task> GetUserIdListByRoleIdAsync(Guid roleId, CancellationToken cancellationToken = default) + { + cancellationToken = GetCancellationToken(cancellationToken); + + return await (await GetMongoQueryableAsync(cancellationToken)) + .Where(u => u.Roles.Any(r => r.RoleId == roleId)) + .Select(x => x.Id) + .ToListAsync(cancellationToken); + } + public virtual async Task> GetListAsync( string sorting = null, int maxResultCount = int.MaxValue, @@ -270,7 +280,7 @@ public class MongoIdentityUserRepository : MongoDbRepository>(minModifitionTime != null, p => p.LastModificationTime >= minModifitionTime) .LongCountAsync(GetCancellationToken(cancellationToken)); } - + public virtual async Task> GetUsersInOrganizationUnitAsync( Guid organizationUnitId, CancellationToken cancellationToken = default) @@ -301,7 +311,7 @@ public class MongoIdentityUserRepository : MongoDbRepository ou.Code.StartsWith(code)) .Select(ou => ou.Id) .ToListAsync(cancellationToken); - + return await (await GetMongoQueryableAsync(cancellationToken)) .Where(u => u.OrganizationUnits.Any(uou => organizationUnitIds.Contains(uou.OrganizationUnitId))) .ToListAsync(cancellationToken); @@ -364,29 +374,50 @@ public class MongoIdentityUserRepository : MongoDbRepository> GetRoleNamesAsync( - IEnumerable userIds, + IEnumerable userIds, CancellationToken cancellationToken = default) { - cancellationToken = GetCancellationToken(cancellationToken); + var users = await GetListByIdsAsync(userIds, cancellationToken: cancellationToken); + + var userAndRoleIds = users.SelectMany(u => u.Roles) + .Select(userRole => new { userRole.UserId, userRole.RoleId }) + .GroupBy(x => x.UserId).ToDictionary(x => x.Key, x => x.Select(r => r.RoleId).ToList()); + var userAndOrganizationUnitIds = users.SelectMany(u => u.OrganizationUnits) + .Select(userOrganizationUnit => new { userOrganizationUnit.UserId, userOrganizationUnit.OrganizationUnitId }) + .GroupBy(x => x.UserId).ToDictionary(x => x.Key, x => x.Select(r => r.OrganizationUnitId).ToList()); - var userAndRoleIds = (await GetMongoQueryableAsync(cancellationToken)) - .Where(u => userIds.Contains(u.Id)) - .SelectMany(u => u.Roles) - .Select(userRole => new + var organizationUnitIds = userAndOrganizationUnitIds.SelectMany(x => x.Value); + var roleIds = userAndRoleIds.SelectMany(x => x.Value); + + var organizationUnitAndRoleIds = await (await GetMongoQueryableAsync(cancellationToken)).Where(ou => organizationUnitIds.Contains(ou.Id)) + .Select(userOrganizationUnit => new { - userRole.UserId, - userRole.RoleId - }).GroupBy(x => x.UserId).ToDictionary(x => x.Key, x => x.Select(r => r.RoleId).ToList()); + userOrganizationUnit.Id, + userOrganizationUnit.Roles + }).ToListAsync(cancellationToken: cancellationToken); + var allOrganizationUnitRoleIds = organizationUnitAndRoleIds.SelectMany(x => x.Roles.Select(r => r.RoleId)).ToList(); + var allRoleIds = roleIds.Union(allOrganizationUnitRoleIds); + + var roles = await (await GetMongoQueryableAsync(cancellationToken)).Where(r => allRoleIds.Contains(r.Id)).Select(r => new{ r.Id, r.Name }).ToListAsync(cancellationToken); + var userRoles = userAndRoleIds.ToDictionary(x => x.Key, x => roles.Where(r => x.Value.Contains(r.Id)).Select(r => r.Name).ToArray()); + + var result = userRoles.Select(x => new IdentityUserIdWithRoleNames { Id = x.Key, RoleNames = x.Value }).ToList(); - var roleIds = userAndRoleIds.SelectMany(x => x.Value); - var roles = await (await GetMongoQueryableAsync(cancellationToken)).Where(r => roleIds.Contains(r.Id)).Select(r => new + foreach (var userAndOrganizationUnitId in userAndOrganizationUnitIds) { - r.Id, - r.Name - }).ToListAsync(cancellationToken); - - var result = userAndRoleIds.ToDictionary(x => x.Key, x => roles.Where(r => x.Value.Contains(r.Id)).Select(r => r.Name).ToArray()); - - return result.Select(x => new IdentityUserIdWithRoleNames() { Id = x.Key, RoleNames = x.Value }).ToList(); + var user = result.FirstOrDefault(x => x.Id == userAndOrganizationUnitId.Key); + var organizationUnitRoleIds = organizationUnitAndRoleIds.Where(x => userAndOrganizationUnitId.Value.Contains(x.Id)).SelectMany(x => x.Roles.Select(r => r.RoleId)).ToList(); + var roleNames = roles.Where(x => organizationUnitRoleIds.Contains(x.Id)).Select(r => r.Name).ToArray(); + if (user != null && roleNames.Any()) + { + user.RoleNames = user.RoleNames.Union(roleNames).ToArray(); + } + else if(roleNames.Any()) + { + result.Add(new IdentityUserIdWithRoleNames { Id = userAndOrganizationUnitId.Key, RoleNames = roleNames}); + } + } + + return result; } } diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs index 3ebbc6f550..f085b2eedc 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs @@ -53,6 +53,16 @@ public class MongoOrganizationUnitRepository .ToListAsync(GetCancellationToken(cancellationToken)); } + public virtual async Task> GetListByRoleIdAsync( + Guid roleId, + bool includeDetails = false, + CancellationToken cancellationToken = default) + { + return await (await GetMongoQueryableAsync(cancellationToken)) + .Where(x => x.Roles.Any(r => r.RoleId == roleId)) + .ToListAsync(GetCancellationToken(cancellationToken)); + } + public virtual async Task> GetListAsync( string sorting = null, int maxResultCount = int.MaxValue, @@ -181,6 +191,14 @@ public class MongoOrganizationUnitRepository .ToListAsync(cancellationToken); } + public virtual async Task> GetMemberIdsAsync(Guid id, CancellationToken cancellationToken = default) + { + cancellationToken = GetCancellationToken(cancellationToken); + return await (await GetMongoQueryableAsync(cancellationToken)) + .Where(u => u.OrganizationUnits.Any(uou => uou.OrganizationUnitId == id)).Select(x => x.Id) + .ToListAsync(cancellationToken); + } + public virtual async Task GetMembersCountAsync( OrganizationUnit organizationUnit, string filter = null, diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.json b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.json rename to modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg diff --git a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo.Abp.PermissionManagement.Domain.Identity.abppkg.json b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo.Abp.PermissionManagement.Domain.Identity.abppkg similarity index 100% rename from modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo.Abp.PermissionManagement.Domain.Identity.abppkg.json rename to modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo.Abp.PermissionManagement.Domain.Identity.abppkg diff --git a/modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.abppkg.json b/modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.abppkg similarity index 100% rename from modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.abppkg.json rename to modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.abppkg diff --git a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.abppkg.json b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.abppkg similarity index 100% rename from modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.abppkg.json rename to modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.abppkg diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.abppkg.json b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.abppkg similarity index 100% rename from modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.abppkg.json rename to modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.abppkg diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor_Tests.cs index 9ac0a2d36b..f2e6f6b4b6 100644 --- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributor_Tests.cs @@ -1,3 +1,4 @@ +using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Shouldly; @@ -9,6 +10,10 @@ namespace Volo.Abp.Identity; public class IdentityDynamicClaimsPrincipalContributor_Tests : AbpIdentityDomainTestBase { private readonly IdentityUserManager _identityUserManager; + private readonly IIdentityRoleRepository _identityRoleRepository; + private readonly IdentityRoleManager _identityRoleManager; + private readonly IOrganizationUnitRepository _organizationUnitRepository; + private readonly OrganizationUnitManager _organizationUnitManager; private readonly IAbpClaimsPrincipalFactory _abpClaimsPrincipalFactory; private readonly AbpUserClaimsPrincipalFactory _abpUserClaimsPrincipalFactory; private readonly IdentityTestData _testData; @@ -16,13 +21,17 @@ public class IdentityDynamicClaimsPrincipalContributor_Tests : AbpIdentityDomain public IdentityDynamicClaimsPrincipalContributor_Tests() { _identityUserManager = GetRequiredService(); + _identityRoleRepository = GetRequiredService(); + _identityRoleManager = GetRequiredService(); + _organizationUnitRepository = GetRequiredService(); + _organizationUnitManager = GetRequiredService(); _abpClaimsPrincipalFactory = GetRequiredService(); _abpUserClaimsPrincipalFactory = GetRequiredService(); _testData = GetRequiredService(); } [Fact] - public async Task Should_Get_Correct_Claims_After_User_Updating() + public async Task Should_Get_Correct_Claims_After_User_Updated() { IdentityUser user = null; ClaimsPrincipal claimsPrincipal = null; @@ -38,12 +47,18 @@ public class IdentityDynamicClaimsPrincipalContributor_Tests : AbpIdentityDomain claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Name && x.Value == user.UserName); claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Email && x.Value == user.Email); claimsPrincipal.Claims.ShouldContain(x => x.Type == "AspNet.Identity.SecurityStamp" && x.Value == securityStamp); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.NameIdentifier && x.Value == user.Id.ToString()); dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Name && x.Value == user.UserName); dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Email && x.Value == user.Email); dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == "AspNet.Identity.SecurityStamp" && x.Value == securityStamp);//SecurityStamp is not dynamic claim + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); await _identityUserManager.SetUserNameAsync(user, "newUserName"); await _identityUserManager.SetEmailAsync(user, "newUserEmail@abp.io"); @@ -55,5 +70,202 @@ public class IdentityDynamicClaimsPrincipalContributor_Tests : AbpIdentityDomain dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Name && x.Value =="newUserName"); dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Email && x.Value == "newUserEmail@abp.io"); dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == "AspNet.Identity.SecurityStamp" && x.Value == securityStamp);//SecurityStamp is not dynamic claim + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + } + + [Fact] + public async Task Should_Get_Correct_Claims_After_User_Role_Updated() + { + ClaimsPrincipal claimsPrincipal = null; + await UsingUowAsync(async () => + { + var user = await _identityUserManager.GetByIdAsync(_testData.UserJohnId); + user.ShouldNotBeNull(); + claimsPrincipal = await _abpUserClaimsPrincipalFactory.CreateAsync(user); + + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var roles = (await _identityRoleRepository.GetListAsync()).Where(x => user.Roles.Select(r => r.RoleId).Contains(x.Id)).ToList(); + + var role = roles.First(x => x.Name == "supporter"); + await _identityRoleManager.SetRoleNameAsync(role, "newSupporter"); + await _identityRoleRepository.UpdateAsync(role); + }); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "newSupporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + } + + [Fact] + public async Task Should_Get_Correct_Claims_After_User_Role_Deleted() + { + ClaimsPrincipal claimsPrincipal = null; + await UsingUowAsync(async () => + { + var user = await _identityUserManager.GetByIdAsync(_testData.UserJohnId); + user.ShouldNotBeNull(); + claimsPrincipal = await _abpUserClaimsPrincipalFactory.CreateAsync(user); + + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var roles = (await _identityRoleRepository.GetListAsync()).Where(x => user.Roles.Select(r => r.RoleId).Contains(x.Id)).ToList(); + + await _identityRoleManager.DeleteAsync(roles.First(x => x.Name == "supporter")); + await _identityRoleManager.DeleteAsync(roles.First(x => x.Name == "moderator")); + }); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + } + + [Fact] + public async Task Should_Get_Correct_Claims_After_User_Organization_Updated() + { + ClaimsPrincipal claimsPrincipal = null; + await UsingUowAsync(async () => + { + var user = await _identityUserManager.GetByIdAsync(_testData.UserJohnId); + user.ShouldNotBeNull(); + claimsPrincipal = await _abpUserClaimsPrincipalFactory.CreateAsync(user); + + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var ou = await _organizationUnitRepository.GetAsync("OU111", true); + ou.ShouldNotBeNull(); + ou.Roles.Count.ShouldBe(2); + ou.Roles.ShouldContain(x => x.RoleId == _testData.RoleModeratorId); + ou.Roles.ShouldContain(x => x.RoleId == _testData.RoleManagerId); + + ou.AddRole(_testData.RoleSaleId); + await _organizationUnitManager.UpdateAsync(ou); + }); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "sale"); + } + + [Fact] + public async Task Should_Get_Correct_Claims_After_User_Organization_Deleted() + { + ClaimsPrincipal claimsPrincipal = null; + await UsingUowAsync(async () => + { + var user = await _identityUserManager.GetByIdAsync(_testData.UserJohnId); + user.ShouldNotBeNull(); + claimsPrincipal = await _abpUserClaimsPrincipalFactory.CreateAsync(user); + + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + + var ou = await _organizationUnitRepository.GetAsync("OU111", true); + ou.ShouldNotBeNull(); + ou.Roles.Count.ShouldBe(2); + ou.Roles.ShouldContain(x => x.RoleId == _testData.RoleModeratorId); + ou.Roles.ShouldContain(x => x.RoleId == _testData.RoleManagerId); + var users = await _organizationUnitRepository.GetMemberIdsAsync(ou.Id); + users.ShouldContain(user.Id); + + await _organizationUnitManager.DeleteAsync(ou.Id); + }); + + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); //manager role from OU111 is deleted. + } + + [Fact] + public async Task Should_Get_Correct_Claims_After_User_Organization_Role_Or_Member_Changed() + { + ClaimsPrincipal claimsPrincipal = null; + await UsingUowAsync(async () => + { + var user = await _identityUserManager.GetByIdAsync(_testData.UserBobId); + user.ShouldNotBeNull(); + claimsPrincipal = await _abpUserClaimsPrincipalFactory.CreateAsync(user); + claimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + claimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + claimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + var ou = await _organizationUnitRepository.GetAsync("OU111", true); + ou.ShouldNotBeNull(); + ou.Roles.Count.ShouldBe(2); + ou.Roles.ShouldContain(x => x.RoleId == _testData.RoleModeratorId); + ou.Roles.ShouldContain(x => x.RoleId == _testData.RoleManagerId); + ou.AddRole(_testData.RoleSaleId); + await _identityUserManager.AddToOrganizationUnitAsync(user, ou); + await _organizationUnitManager.UpdateAsync(ou); + }); + var dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "sale"); + + await UsingUowAsync(async () => + { + var saleRole = await _identityRoleRepository.GetAsync(_testData.RoleSaleId); + await _identityRoleManager.DeleteAsync(saleRole); + }); + + dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "sale"); + + await UsingUowAsync(async () => + { + var user = await _identityUserManager.GetByIdAsync(_testData.UserBobId); + user.ShouldNotBeNull(); + var ou = await _organizationUnitRepository.GetAsync("OU111", true); + ou.ShouldNotBeNull(); + await _identityUserManager.RemoveFromOrganizationUnitAsync(user.Id, ou.Id); + }); + + dynamicClaimsPrincipal = await _abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "supporter"); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "moderator"); + dynamicClaimsPrincipal.Claims.ShouldContain(x => x.Type == ClaimTypes.Role && x.Value == "manager"); + dynamicClaimsPrincipal.Claims.ShouldNotContain(x => x.Type == ClaimTypes.Role && x.Value == "sale"); } } diff --git a/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.abppkg.json b/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.abppkg.json rename to modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.abppkg diff --git a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.abppkg.json b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.abppkg similarity index 100% rename from modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.abppkg.json rename to modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.abppkg diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.abppkg.json b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.abppkg similarity index 100% rename from modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.abppkg.json rename to modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.abppkg diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs index 7b5ffd259b..944c6928c1 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs @@ -83,8 +83,11 @@ public class AbpIdentityTestDataBuilder : ITransientDependency _supporterRole = new IdentityRole(_testData.RoleSupporterId, "supporter"); await _roleRepository.InsertAsync(_supporterRole); - _managerRole = new IdentityRole(_guidGenerator.Create(), "manager"); + _managerRole = new IdentityRole(_testData.RoleManagerId, "manager"); await _roleRepository.InsertAsync(_managerRole); + + var saleRole = new IdentityRole(_testData.RoleSaleId, "sale"); + await _roleRepository.InsertAsync(saleRole); } /* Creates OU tree as shown below: @@ -111,6 +114,12 @@ public class AbpIdentityTestDataBuilder : ITransientDependency _ou111.AddRole(_moderatorRole.Id); _ou111.AddRole(_managerRole.Id); await _organizationUnitRepository.InsertAsync(_ou111); + + var _ou222 = new OrganizationUnit(_guidGenerator.Create(), "OU222"); + _ou222.Code = OrganizationUnit.CreateCode(1, 1, 1); + _ou222.AddRole(_moderatorRole.Id); + _ou222.AddRole(_managerRole.Id); + await _organizationUnitRepository.InsertAsync(_ou222); } private async Task AddUsers() diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityRoleRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityRoleRepository_Tests.cs index c34e9ad56c..33f5eeade9 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityRoleRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityRoleRepository_Tests.cs @@ -66,16 +66,17 @@ public abstract class IdentityRoleRepository_Tests : AbpIdentity role.Claims.ShouldNotBeNull(); role.Claims.Any().ShouldBeTrue(); } - + [Fact] public async Task GetListWithUserCountAsync() { var roles = await RoleRepository.GetListWithUserCountAsync(); - roles.Count.ShouldBe(4); + roles.Count.ShouldBe(5); roles.ShouldContain(r => r.Role.Name == "admin" && r.UserCount == 2); roles.ShouldContain(r => r.Role.Name == "moderator" && r.UserCount == 1); roles.ShouldContain(r => r.Role.Name == "supporter" && r.UserCount == 2); roles.ShouldContain(r => r.Role.Name == "manager" && r.UserCount == 1); + roles.ShouldContain(r => r.Role.Name == "sale" && r.UserCount == 0); } } diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityTestData.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityTestData.cs index 4862450e35..0172dc016a 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityTestData.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityTestData.cs @@ -6,9 +6,9 @@ namespace Volo.Abp.Identity; public class IdentityTestData : ISingletonDependency { public Guid RoleModeratorId { get; } = Guid.NewGuid(); - public Guid RoleSupporterId { get; } = Guid.NewGuid(); - + public Guid RoleManagerId { get; } = Guid.NewGuid(); + public Guid RoleSaleId { get; } = Guid.NewGuid(); public Guid UserJohnId { get; } = Guid.NewGuid(); public Guid UserDavidId { get; } = Guid.NewGuid(); public Guid UserNeoId { get; } = Guid.NewGuid(); diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs index 2d2c354aae..2516e0c09b 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs @@ -14,6 +14,7 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity where TStartupModule : IAbpModule { protected IIdentityUserRepository UserRepository { get; } + protected IIdentityRoleRepository RoleRepository { get; } protected ILookupNormalizer LookupNormalizer { get; } protected IOrganizationUnitRepository OrganizationUnitRepository { get; } protected OrganizationUnitManager OrganizationUnitManager { get; } @@ -22,6 +23,7 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity protected IdentityUserRepository_Tests() { UserRepository = GetRequiredService(); + RoleRepository = GetRequiredService(); LookupNormalizer = GetRequiredService(); OrganizationUnitRepository = GetRequiredService(); OrganizationUnitManager = GetRequiredService();; @@ -53,7 +55,7 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity roles.ShouldContain("supporter"); roles.ShouldContain("manager"); } - + [Fact] public async Task GetRoleNames_By_UserIds_Async() { @@ -63,23 +65,24 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity TestData.UserNeoId, TestData.UserDavidId }); - + userRoleNames.Count.ShouldBe(3); - + var userBob = userRoleNames.First(x => x.Id == TestData.UserBobId); userBob.RoleNames.Length.ShouldBe(1); userBob.RoleNames[0].ShouldBe("manager"); - + var userJohn = userRoleNames.First(x => x.Id == TestData.UserJohnId); - userJohn.RoleNames.Length.ShouldBe(2); + userJohn.RoleNames.Length.ShouldBe(3); userJohn.RoleNames.ShouldContain("moderator"); userJohn.RoleNames.ShouldContain("supporter"); - - var userNeo = userRoleNames.First(x => x.Id == TestData.UserNeoId); - userNeo.RoleNames.Length.ShouldBe(1); - userNeo.RoleNames[0].ShouldBe("supporter"); + userJohn.RoleNames.ShouldContain("manager"); - userRoleNames.ShouldNotContain(x => x.Id == TestData.UserDavidId); + var userNeo = userRoleNames.First(x => x.Id == TestData.UserNeoId); + userNeo.RoleNames.Length.ShouldBe(3); + userNeo.RoleNames.ShouldContain("supporter"); + userJohn.RoleNames.ShouldContain("moderator"); + userJohn.RoleNames.ShouldContain("manager"); } [Fact] @@ -121,6 +124,21 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity users.ShouldContain(u => u.UserName == "neo"); } + [Fact] + public async Task GetUserIdListByRoleIdAsync() + { + var john = await UserRepository.FindByNormalizedUserNameAsync(LookupNormalizer.NormalizeName("john.nash")); + var neo = await UserRepository.FindByNormalizedUserNameAsync(LookupNormalizer.NormalizeName("neo")); + john.ShouldNotBeNull(); + neo.ShouldNotBeNull(); + + var roleId = (await RoleRepository.FindByNormalizedNameAsync(LookupNormalizer.NormalizeName("supporter"))).Id; + var users = await UserRepository.GetUserIdListByRoleIdAsync(roleId); + users.Count.ShouldBe(2); + users.ShouldContain(id => id == john.Id); + users.ShouldContain(id => id == neo.Id); + } + [Fact] public async Task GetListAsync() { diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs index 064d543269..8746c3a1fd 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs @@ -66,6 +66,23 @@ public abstract class OrganizationUnitRepository_Tests : AbpIden ous.ShouldContain(ou => ou.Id == ouIds.First()); } + [Fact] + public async Task GetListByRoleIdAsync() + { + var ous = await _organizationUnitRepository.GetListByRoleIdAsync(_testData.RoleManagerId); + ous.Count.ShouldBe(2); + ous.ShouldContain(ou => ou.DisplayName == "OU111"); + ous.ShouldContain(ou => ou.DisplayName == "OU222"); + + ous = await _organizationUnitRepository.GetListByRoleIdAsync(_testData.RoleModeratorId); + ous.Count.ShouldBe(2); + ous.ShouldContain(ou => ou.DisplayName == "OU111"); + ous.ShouldContain(ou => ou.DisplayName == "OU222"); + + ous = await _organizationUnitRepository.GetListByRoleIdAsync(_testData.RoleSaleId); + ous.Count.ShouldBe(0); + } + [Fact] public async Task AddMemberToOrganizationUnit() { @@ -232,6 +249,17 @@ public abstract class OrganizationUnitRepository_Tests : AbpIden users.Count.ShouldBe(0); } + [Fact] + public async Task GetMemberIdsAsync() + { + var ou = await _organizationUnitRepository.GetAsync("OU111"); + var users = await _organizationUnitRepository.GetMemberIdsAsync(ou.Id); + + users.Count.ShouldBe(2); + users.ShouldContain(x => x == _testData.UserJohnId); + users.ShouldContain(x => x == _testData.UserNeoId); + } + [Fact] public async Task GetMembersCountOfOrganizationUnit() { diff --git a/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json b/modules/identityserver/Volo.Abp.IdentityServer.abpmdl similarity index 79% rename from modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json rename to modules/identityserver/Volo.Abp.IdentityServer.abpmdl index cda750d441..86d445f288 100644 --- a/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json +++ b/modules/identityserver/Volo.Abp.IdentityServer.abpmdl @@ -7,39 +7,39 @@ }, "packages": { "Volo.Abp.PermissionManagement.Domain.IdentityServer": { - "path": "src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg", "folder": "src" }, "Volo.Abp.IdentityServer.Domain": { - "path": "src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.abppkg.json", + "path": "src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.abppkg", "folder": "src" }, "Volo.Abp.IdentityServer.Domain.Shared": { - "path": "src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.IdentityServer.EntityFrameworkCore": { - "path": "src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.IdentityServer.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.IdentityServer.MongoDB": { - "path": "src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.abppkg.json", + "path": "src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.IdentityServer.TestBase": { - "path": "test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.abppkg.json", + "path": "test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.abppkg", "folder": "test" }, "Volo.Abp.IdentityServer.MongoDB.Tests": { - "path": "test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.IdentityServer.Domain.Tests": { - "path": "test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.abppkg", "folder": "test" } } diff --git a/modules/identityserver/Volo.Abp.IdentityServer.abpsln.json b/modules/identityserver/Volo.Abp.IdentityServer.abpsln similarity index 53% rename from modules/identityserver/Volo.Abp.IdentityServer.abpsln.json rename to modules/identityserver/Volo.Abp.IdentityServer.abpsln index da8058be48..5029cbdbd3 100644 --- a/modules/identityserver/Volo.Abp.IdentityServer.abpsln.json +++ b/modules/identityserver/Volo.Abp.IdentityServer.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.IdentityServer": { - "path": "Volo.Abp.IdentityServer.abpmdl.json" + "path": "Volo.Abp.IdentityServer.abpmdl" } } } \ No newline at end of file diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.abppkg.json b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.abppkg similarity index 100% rename from modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.abppkg.json rename to modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.abppkg diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.abppkg.json b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.abppkg similarity index 100% rename from modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.abppkg.json rename to modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.abppkg diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.abppkg.json b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.abppkg similarity index 100% rename from modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.abppkg.json rename to modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.abppkg diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj index 80262dc6b0..9948359539 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj @@ -15,8 +15,8 @@ - - + + true content\ diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.abppkg.json b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.abppkg similarity index 100% rename from modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.abppkg.json rename to modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.abppkg diff --git a/modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg.json b/modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg similarity index 100% rename from modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg.json rename to modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.abppkg.json b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.abppkg similarity index 100% rename from modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.abppkg.json rename to modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.abppkg diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.abppkg.json b/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.abppkg.json rename to modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.abppkg diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.abppkg.json b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.abppkg similarity index 100% rename from modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.abppkg.json rename to modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.abppkg diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.abppkg.json b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.abppkg similarity index 100% rename from modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.abppkg.json rename to modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.abppkg diff --git a/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json b/modules/openiddict/Volo.Abp.OpenIddict.abpmdl similarity index 80% rename from modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json rename to modules/openiddict/Volo.Abp.OpenIddict.abpmdl index f43ad02c40..de59356b08 100644 --- a/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json +++ b/modules/openiddict/Volo.Abp.OpenIddict.abpmdl @@ -8,63 +8,63 @@ }, "packages": { "OpenIddict.Demo.Server": { - "path": "app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json", + "path": "app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg", "folder": "app" }, "OpenIddict.Demo.Client.Mvc": { - "path": "app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json", + "path": "app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg", "folder": "app" }, "OpenIddict.Demo.Client.Console": { - "path": "app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json", + "path": "app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg", "folder": "app" }, "OpenIddict.Demo.API": { - "path": "app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json", + "path": "app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg", "folder": "app" }, "OpenIddict.Demo.Client.BlazorWASM": { - "path": "app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json", + "path": "app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg", "folder": "app" }, "Volo.Abp.OpenIddict.Domain": { - "path": "src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json", + "path": "src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg", "folder": "src" }, "Volo.Abp.OpenIddict.Domain.Shared": { - "path": "src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.OpenIddict.EntityFrameworkCore": { - "path": "src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.OpenIddict.MongoDB": { - "path": "src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json", + "path": "src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.OpenIddict.TestBase": { - "path": "test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json", + "path": "test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg", "folder": "test" }, "Volo.Abp.OpenIddict.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.OpenIddict.MongoDB.Tests": { - "path": "test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.OpenIddict.Domain.Tests": { - "path": "test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg", "folder": "test" }, "Volo.Abp.OpenIddict.AspNetCore": { - "path": "src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json", + "path": "src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Domain.OpenIddict": { - "path": "src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg", "folder": "src" } } diff --git a/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json b/modules/openiddict/Volo.Abp.OpenIddict.abpsln similarity index 61% rename from modules/openiddict/Volo.Abp.OpenIddict.abpsln.json rename to modules/openiddict/Volo.Abp.OpenIddict.abpsln index 3e59583a9a..8290281322 100644 --- a/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json +++ b/modules/openiddict/Volo.Abp.OpenIddict.abpsln @@ -2,7 +2,7 @@ "template": "empty", "modules": { "Volo.Abp.OpenIddict": { - "path": "Volo.Abp.OpenIddict.abpmdl.json" + "path": "Volo.Abp.OpenIddict.abpmdl" } } } \ No newline at end of file diff --git a/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg similarity index 100% rename from modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg similarity index 100% rename from modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg similarity index 100% rename from modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg similarity index 100% rename from modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg similarity index 100% rename from modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index ef4a2dea54..b0daf10eee 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index b1894382f6..7e14fdf305 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.components": "~7.4.2", - "@abp/ng.core": "~7.4.2", - "@abp/ng.oauth": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", - "@abp/ng.theme.lepton-x": "~2.4.2", + "@abp/ng.account": "~8.0.0-rc.2", + "@abp/ng.components": "~8.0.0-rc.2", + "@abp/ng.core": "~8.0.0-rc.2", + "@abp/ng.oauth": "~8.0.0-rc.2", + "@abp/ng.identity": "~8.0.0-rc.2", + "@abp/ng.setting-management": "~8.0.0-rc.2", + "@abp/ng.tenant-management": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", + "@abp/ng.theme.lepton-x": "~3.0.0-rc.1", "@angular/animations": "^15.0.1", "@angular/common": "^15.0.1", "@angular/compiler": "^15.0.1", @@ -36,7 +36,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~7.4.2", + "@abp/ng.schematics": "~8.0.0-rc.2", "@angular-devkit/build-angular": "^15.0.1", "@angular-eslint/builder": "~15.1.0", "@angular-eslint/eslint-plugin": "~15.1.0", diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg similarity index 100% rename from modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg similarity index 100% rename from modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg similarity index 100% rename from modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg similarity index 100% rename from modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj index f0baf94ce8..88d9ceeaad 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg similarity index 100% rename from modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg diff --git a/modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json b/modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg similarity index 100% rename from modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json rename to modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg similarity index 100% rename from modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json rename to modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json rename to modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg similarity index 100% rename from modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json rename to modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg similarity index 100% rename from modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json rename to modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg diff --git a/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json b/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl similarity index 76% rename from modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json rename to modules/permission-management/Volo.Abp.PermissionManagement.abpmdl index 6e265fa935..449ac9fc25 100644 --- a/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json +++ b/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl @@ -7,71 +7,71 @@ }, "packages": { "Volo.Abp.PermissionManagement.Web": { - "path": "src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Blazor": { - "path": "src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Blazor.Server": { - "path": "src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Blazor.WebAssembly": { - "path": "src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.HttpApi": { - "path": "src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.HttpApi.Client": { - "path": "src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Application": { - "path": "src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Application.Contracts": { - "path": "src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Domain": { - "path": "src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Domain.Shared": { - "path": "src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.EntityFrameworkCore": { - "path": "src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.Domain.Tests": { - "path": "test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.abppkg", "folder": "test" }, "Volo.Abp.PermissionManagement.TestBase": { - "path": "test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.abppkg.json", + "path": "test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.abppkg", "folder": "test" }, "Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.PermissionManagement.MongoDB": { - "path": "src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.json", + "path": "src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.PermissionManagement.MongoDB.Tests": { - "path": "test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.PermissionManagement.Application.Tests": { - "path": "test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.abppkg.json", + "path": "test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.abppkg", "folder": "test" } } diff --git a/modules/permission-management/Volo.Abp.PermissionManagement.abpsln.json b/modules/permission-management/Volo.Abp.PermissionManagement.abpsln similarity index 52% rename from modules/permission-management/Volo.Abp.PermissionManagement.abpsln.json rename to modules/permission-management/Volo.Abp.PermissionManagement.abpsln index de624a3cc3..15f545b928 100644 --- a/modules/permission-management/Volo.Abp.PermissionManagement.abpsln.json +++ b/modules/permission-management/Volo.Abp.PermissionManagement.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.PermissionManagement": { - "path": "Volo.Abp.PermissionManagement.abpmdl.json" + "path": "Volo.Abp.PermissionManagement.abpmdl" } } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj index b3dd37a784..54ace45b86 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg similarity index 100% rename from modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.json rename to modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.abppkg.json b/modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.abppkg similarity index 100% rename from modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.abppkg.json rename to modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.abppkg diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.abppkg.json b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.abppkg similarity index 100% rename from modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.abppkg.json rename to modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.abppkg diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.abppkg.json b/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.abppkg.json rename to modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.abppkg diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.abppkg.json b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.abppkg similarity index 100% rename from modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.abppkg.json rename to modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.abppkg diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.abppkg.json b/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.abppkg similarity index 100% rename from modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.abppkg.json rename to modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.abppkg diff --git a/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json b/modules/setting-management/Volo.Abp.SettingManagement.abpmdl similarity index 77% rename from modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json rename to modules/setting-management/Volo.Abp.SettingManagement.abpmdl index d0412fc6e0..13c74e943f 100644 --- a/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json +++ b/modules/setting-management/Volo.Abp.SettingManagement.abpmdl @@ -8,71 +8,71 @@ }, "packages": { "Volo.Abp.SettingManagement.DemoApp": { - "path": "app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.abppkg.json", + "path": "app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.abppkg", "folder": "app" }, "Volo.Abp.SettingManagement.Web": { - "path": "src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Blazor": { - "path": "src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Blazor.Server": { - "path": "src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Blazor.WebAssembly": { - "path": "src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.HttpApi": { - "path": "src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.HttpApi.Client": { - "path": "src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Application": { - "path": "src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Application.Contracts": { - "path": "src/Volo.Abp.SettingManagement.Application.Contracts/Volo.Abp.SettingManagement.Application.Contracts.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Application.Contracts/Volo.Abp.SettingManagement.Application.Contracts.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Domain.Shared": { - "path": "src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Domain": { - "path": "src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.EntityFrameworkCore": { - "path": "src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.Tests": { - "path": "test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.abppkg.json", + "path": "test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.abppkg", "folder": "test" }, "Volo.Abp.SettingManagement.MongoDB": { - "path": "src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.json", + "path": "src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.SettingManagement.TestBase": { - "path": "test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.abppkg.json", + "path": "test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.abppkg", "folder": "test" }, "Volo.Abp.SettingManagement.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.SettingManagement.MongoDB.Tests": { - "path": "test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.abppkg", "folder": "test" } } diff --git a/modules/setting-management/Volo.Abp.SettingManagement.abpsln.json b/modules/setting-management/Volo.Abp.SettingManagement.abpsln similarity index 52% rename from modules/setting-management/Volo.Abp.SettingManagement.abpsln.json rename to modules/setting-management/Volo.Abp.SettingManagement.abpsln index 8a4c4414fc..a0aa5aafc8 100644 --- a/modules/setting-management/Volo.Abp.SettingManagement.abpsln.json +++ b/modules/setting-management/Volo.Abp.SettingManagement.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.SettingManagement": { - "path": "Volo.Abp.SettingManagement.abpmdl.json" + "path": "Volo.Abp.SettingManagement.abpmdl" } } } \ No newline at end of file diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.abppkg.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.abppkg similarity index 100% rename from modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.abppkg.json rename to modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.abppkg diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index c42dc3df05..7da2aab4a5 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index 94cc459e47..4f4541ba83 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo.Abp.SettingManagement.Application.Contracts.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo.Abp.SettingManagement.Application.Contracts.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo.Abp.SettingManagement.Application.Contracts.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo.Abp.SettingManagement.Application.Contracts.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs index f4c66e2374..202598ff8d 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs @@ -45,10 +45,15 @@ public partial class SettingManagement SelectedGroup = GetNormalizedString(SettingComponentCreationContext.Groups.First().Id); } - protected override Task OnAfterRenderAsync(bool firstRender) + protected override async Task OnAfterRenderAsync(bool firstRender) { - StateHasChanged(); - return base.OnAfterRenderAsync(firstRender); + if (firstRender) + { + await Task.Yield(); + await InvokeAsync(StateHasChanged); + } + + await base.OnAfterRenderAsync(firstRender); } protected virtual string GetNormalizedString(string value) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj index bc13c2648f..5860058975 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg similarity index 100% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.json rename to modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.abppkg.json b/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.abppkg.json rename to modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.abppkg diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.abppkg.json b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.abppkg similarity index 100% rename from modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.abppkg.json rename to modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.abppkg diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.abppkg.json b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.abppkg similarity index 100% rename from modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.abppkg.json rename to modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.abppkg diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.abppkg.json b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.abppkg similarity index 100% rename from modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.abppkg.json rename to modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.abppkg diff --git a/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json b/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl similarity index 77% rename from modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json rename to modules/tenant-management/Volo.Abp.TenantManagement.abpmdl index 2bd4dc939d..ed4b8eba05 100644 --- a/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json +++ b/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl @@ -7,71 +7,71 @@ }, "packages": { "Volo.Abp.TenantManagement.Web": { - "path": "src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Blazor": { - "path": "src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Blazor.WebAssembly": { - "path": "src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Blazor.Server": { - "path": "src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.HttpApi": { - "path": "src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.HttpApi.Client": { - "path": "src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Application": { - "path": "src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Application.Contracts": { - "path": "src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Domain": { - "path": "src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Domain.Shared": { - "path": "src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.EntityFrameworkCore": { - "path": "src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.Application.Tests": { - "path": "test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.abppkg.json", + "path": "test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.abppkg", "folder": "test" }, "Volo.Abp.TenantManagement.EntityFrameworkCore.Tests": { - "path": "test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "Volo.Abp.TenantManagement.MongoDB": { - "path": "src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.json", + "path": "src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg", "folder": "src" }, "Volo.Abp.TenantManagement.MongoDB.Tests": { - "path": "test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.abppkg.json", + "path": "test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.abppkg", "folder": "test" }, "Volo.Abp.TenantManagement.TestBase": { - "path": "test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.abppkg.json", + "path": "test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.abppkg", "folder": "test" }, "Volo.Abp.TenantManagement.Domain.Tests": { - "path": "test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.abppkg.json", + "path": "test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.abppkg", "folder": "test" } } diff --git a/modules/tenant-management/Volo.Abp.TenantManagement.abpsln.json b/modules/tenant-management/Volo.Abp.TenantManagement.abpsln similarity index 52% rename from modules/tenant-management/Volo.Abp.TenantManagement.abpsln.json rename to modules/tenant-management/Volo.Abp.TenantManagement.abpsln index d6d4cb2f63..e287e25d4c 100644 --- a/modules/tenant-management/Volo.Abp.TenantManagement.abpsln.json +++ b/modules/tenant-management/Volo.Abp.TenantManagement.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.TenantManagement": { - "path": "Volo.Abp.TenantManagement.abpmdl.json" + "path": "Volo.Abp.TenantManagement.abpmdl" } } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj index f4ca61d166..dca98603b4 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg similarity index 100% rename from modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.json rename to modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.abppkg.json b/modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.abppkg similarity index 100% rename from modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.abppkg.json rename to modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.abppkg diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.abppkg.json b/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.abppkg similarity index 100% rename from modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.abppkg.json rename to modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.abppkg diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.abppkg.json b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.abppkg.json rename to modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.abppkg diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.abppkg.json b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.abppkg similarity index 100% rename from modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.abppkg.json rename to modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.abppkg diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.abppkg.json b/modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.abppkg similarity index 100% rename from modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.abppkg.json rename to modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.abppkg diff --git a/modules/users/Volo.Abp.Users.abpmdl.json b/modules/users/Volo.Abp.Users.abpmdl similarity index 85% rename from modules/users/Volo.Abp.Users.abpmdl.json rename to modules/users/Volo.Abp.Users.abpmdl index 509859df1e..51af76ee24 100644 --- a/modules/users/Volo.Abp.Users.abpmdl.json +++ b/modules/users/Volo.Abp.Users.abpmdl @@ -6,23 +6,23 @@ }, "packages": { "Volo.Abp.Users.Domain": { - "path": "src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.json", + "path": "src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg", "folder": "src" }, "Volo.Abp.Users.Domain.Shared": { - "path": "src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.json", + "path": "src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg", "folder": "src" }, "Volo.Abp.Users.EntityFrameworkCore": { - "path": "src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.json", + "path": "src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg", "folder": "src" }, "Volo.Abp.Users.Abstractions": { - "path": "src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.abppkg.json", + "path": "src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.abppkg", "folder": "src" }, "Volo.Abp.Users.MongoDB": { - "path": "src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.json", + "path": "src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg", "folder": "src" } } diff --git a/modules/users/Volo.Abp.Users.abpsln.json b/modules/users/Volo.Abp.Users.abpsln similarity index 53% rename from modules/users/Volo.Abp.Users.abpsln.json rename to modules/users/Volo.Abp.Users.abpsln index b18063ff43..7f62b7fa1f 100644 --- a/modules/users/Volo.Abp.Users.abpsln.json +++ b/modules/users/Volo.Abp.Users.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.Users": { - "path": "Volo.Abp.Users.abpmdl.json" + "path": "Volo.Abp.Users.abpmdl" } } } \ No newline at end of file diff --git a/modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.abppkg.json b/modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.abppkg similarity index 100% rename from modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.abppkg.json rename to modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.abppkg diff --git a/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.json b/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg similarity index 100% rename from modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.json rename to modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.json b/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg similarity index 100% rename from modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.json rename to modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg diff --git a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.json b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg similarity index 100% rename from modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.json rename to modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj index 5c7940f14f..7f7d976ea6 100644 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj +++ b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.json b/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg similarity index 100% rename from modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.json rename to modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg diff --git a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl similarity index 82% rename from modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json rename to modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl index 98ac3e3c2d..3c025e6ade 100644 --- a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json +++ b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl @@ -7,11 +7,11 @@ }, "packages": { "Volo.Abp.VirtualFileExplorer.DemoApp": { - "path": "app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg.json", + "path": "app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg", "folder": "app" }, "Volo.Abp.VirtualFileExplorer.Web": { - "path": "src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.json", + "path": "src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg", "folder": "src" } } diff --git a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpsln.json b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpsln similarity index 52% rename from modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpsln.json rename to modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpsln index c163e92950..264a302af3 100644 --- a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpsln.json +++ b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpsln @@ -1,7 +1,7 @@ { "modules": { "Volo.Abp.VirtualFileExplorer": { - "path": "Volo.Abp.VirtualFileExplorer.abpmdl.json" + "path": "Volo.Abp.VirtualFileExplorer.abpmdl" } } } \ No newline at end of file diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg similarity index 100% rename from modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg.json rename to modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index 09c73635f0..27f971e503 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2", - "@abp/virtual-file-explorer": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2", + "@abp/virtual-file-explorer": "~8.0.0-rc.2" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index dc32903927..e5443395b4 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.2.tgz#326aecf0f99bd5644b4d97e9f0583b4b7b3dc9bd" - integrity sha512-ZfsOmPbKfUl4revDpmz7wowWlpdBUQqFh/MTp4gpaWEfqKkFtqn3U0Ckg7cnxkHau9ME9TSOjbe05HT71/JOow== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.2.tgz#78d51e65bcfe8f0a50e801810bcb77ae947863ee" - integrity sha512-y/fPI4vCpaEKH6VVuM93EIJ1/bi8XiXoS4KdPQWX4Wzpi1G4mzyedtV2UH2xzmWLpX3zPAttXiWOyRpovwImIg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.2" - "@abp/bootstrap" "~7.4.2" - "@abp/bootstrap-datepicker" "~7.4.2" - "@abp/bootstrap-daterangepicker" "~7.4.2" - "@abp/datatables.net-bs5" "~7.4.2" - "@abp/font-awesome" "~7.4.2" - "@abp/jquery-form" "~7.4.2" - "@abp/jquery-validation-unobtrusive" "~7.4.2" - "@abp/lodash" "~7.4.2" - "@abp/luxon" "~7.4.2" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.2" - "@abp/moment" "~7.4.2" - "@abp/select2" "~7.4.2" - "@abp/sweetalert2" "~7.4.2" - "@abp/timeago" "~7.4.2" - "@abp/toastr" "~7.4.2" - -"@abp/aspnetcore.mvc.ui@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.2.tgz#ff734f986f6cf981332701b2ba035ee19fb09898" - integrity sha512-Hd/tspsCCK22k5sJwEzDLm8+TTjcMwqyMFbfkKjc+VcUSLT5ygsfxqROUbQGT5MNAsKH2Z8EiA9M7lnXB2BuAQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.0.0-rc.2.tgz#ff10cf70d483fd12304e463ef240c113fceb2bb3" + integrity sha512-N5TbAohg5dRt24DVbFz2hQjdfhZHbwTBJtUDMRofiU6LHk16Td8esU7CxvS+nj8WhVYN8O9PdZZTI/Iva0VPoQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.0.0-rc.2.tgz#db570c960ad1b250292a0211317634fbeb762a52" + integrity sha512-yGxIAnpGIWkTkjFBgedBBXE1nRnk7tDYLeAQpGBP33iwUpkwa1n66+cjwt4x2ZzTGo96NfO3MIlLmnk9psZtpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.0.0-rc.2" + "@abp/bootstrap" "~8.0.0-rc.2" + "@abp/bootstrap-datepicker" "~8.0.0-rc.2" + "@abp/bootstrap-daterangepicker" "~8.0.0-rc.2" + "@abp/datatables.net-bs5" "~8.0.0-rc.2" + "@abp/font-awesome" "~8.0.0-rc.2" + "@abp/jquery-form" "~8.0.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~8.0.0-rc.2" + "@abp/lodash" "~8.0.0-rc.2" + "@abp/luxon" "~8.0.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~8.0.0-rc.2" + "@abp/moment" "~8.0.0-rc.2" + "@abp/select2" "~8.0.0-rc.2" + "@abp/sweetalert2" "~8.0.0-rc.2" + "@abp/timeago" "~8.0.0-rc.2" + "@abp/toastr" "~8.0.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.0.0-rc.2.tgz#57099c3064f462713940a1d40fbddfe7b14510eb" + integrity sha512-Bmkqw6VDe+B5QpcRghj1pWej+BhkWJoCfh+lEwbJqzv3akEuOhYWRSBDIrkgCyROK77HYzBqWg9+AyRhmHXEAw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,185 +43,185 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.2.tgz#5a2f23dae73115a1213178eabe2527d721db5dcf" - integrity sha512-0tYeKWUTTL+2SKhFrodI1GibrkRUingySaYwEhwpXZGBuiMNWVeRcuBeFVTTKbnIxpgaAZnmGrpwmI5H0LdX7g== +"@abp/bootstrap-datepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.0.0-rc.2.tgz#85e41ff35b7306040e0dfdaabc04c9dec280ae0f" + integrity sha512-2O1CWIA03O68kloIeIQ4YlaLqjvBo4zZxkF4Ily2OfGwfwgUpZpOCS/0yUQWpxFoLEnbat03KQj75Szcu80keg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.2.tgz#b95c17fe69da8332bdb63586179e406eef0df5ab" - integrity sha512-/9pQqh8tsBzN8jR9Dn9f3iDoMQdbmf/KMjdb/IYP6+Z41f1GPBuCa5KtYb/mSfigIb+NKE63ZZftwWiiHDSQ1w== +"@abp/bootstrap-daterangepicker@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.0.0-rc.2.tgz#9380b4e29c69fe8ecec4877c9bbe443857e2e902" + integrity sha512-caKNizOBcSBSTKyByWZVFxTjn1gJNaMGDqoqnFnKEFc/Zu+Z5wgJaU1zOwSQCI+fBdAYLt6aIRFdzL/VgJIlWg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.2.tgz#3a0f318e33057f1c3526c833b23b122d9c86fda9" - integrity sha512-QdAI7GMpvWYFXbWjk/lzvt4j7KEGYcbi3YBQp+wW21Ia0khvqvSxYSKOkHlSeYyWXQFcR0cV07DVPELOXU9IVQ== +"@abp/bootstrap@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.0.0-rc.2.tgz#9d36df7aa5b78ada6739633dabedf0c05fdedbde" + integrity sha512-OiSLAr58q8we202EjS1cJAzrVjGJBtjYJ3S3JuZqjV46udOoWI+ubQSKp+ZZHLD6e0geMfCe5G3IW+eQ1oFrkQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.2.tgz#e9c3361edb3aa22bfb5667f99605a26752843e91" - integrity sha512-KQRgMfvvtMS9StvHk0k15RB3UY6Z/5IN1CqjC/WSlHbn9SXNorEzkJ0gi1xoy/Hs0DTyPm74xnvd6GdQUShLQg== +"@abp/clipboard@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.0.0-rc.2.tgz#6f9eb3da44e62aee8bb7cd38ef5d9e105aff6f94" + integrity sha512-ytYIh5R8V6LbjdofeaRI14V7fO1A066SVn8Uc5G2aTq6WpeepzpwfJjDA7i/3sNO14FhnCLI2a5/IMP0zzxNCw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" clipboard "^2.0.8" -"@abp/core@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.2.tgz#d3ff88ef571edfa00357d1bdceb1f5c56391421e" - integrity sha512-LKZj8Brfvv+FI754LRD4cpxOE/jgRB/mmo2bb3lLRpCmrh5qS1PAA0KGEavEioT0YzQVAi1cog7m6yBl53h63A== +"@abp/core@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.0.0-rc.2.tgz#6167929da30563b3b2f1938be40648bd08db61af" + integrity sha512-uXU546776kSDYizDRB+8Ja0Hfo0LaGqR198oy5Eq8R1jVwQ0gveZUlUFQd1Q56a/IpgbiJQ/T6nizoacBQlfLA== dependencies: - "@abp/utils" "~7.4.2" + "@abp/utils" "~8.0.0-rc.2" -"@abp/datatables.net-bs5@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.2.tgz#37de0409b34ada6ae9264b1bbdbd1963866dfe16" - integrity sha512-/po/W4h95dJ7ubeK35GQWeAf6F/o4cxrIHej0mwe5WTNvY+AH2dpP8vneHAg/rwHhxPSXHPfsCZ9nQwE3pUHjg== +"@abp/datatables.net-bs5@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.0.0-rc.2.tgz#a5d36298ad7ddb59dc66917eeb10f3898d4f6e39" + integrity sha512-VtMnL0WlXVpddbhheFKUwXo+iCBh3pgtETBKTnqyE/FSiv1EoV8i2m0gKtzFA7XB5CjUSXaTQsNfDGsIio7AnQ== dependencies: - "@abp/datatables.net" "~7.4.2" + "@abp/datatables.net" "~8.0.0-rc.2" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.2.tgz#bd1a457b7063ea31eb96d809e0c20aae5913b7e2" - integrity sha512-iWKdKIegM3M029HpMG+qRTzkjsKtn8JzMcVzDqogVfBhDDGzn1E20Lop9gYw4bzKVkmGE+8hvb5hmu4h2FNLgA== +"@abp/datatables.net@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.0.0-rc.2.tgz#267dcb7a49b708af83de3dfbdeb2f42617d46708" + integrity sha512-GzuncUWYs7fnLdd510FIiFx7DaMUoK2XzsMoVEv/p6eE8uAZpFp7/e+HKx8UxSFDcvVW3GMURDLd1WIxm5ak6Q== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.2.tgz#f3d81c5a4e5f5a83921f9c4d659674391b727ecd" - integrity sha512-8fBQu6qI8ZvO+6344aoiMA1YKoEHv3g/lguyTFqzPgz1ROUeruVnZ1d3FuWYYTGSXJpAF+o+mJ5J7I66KZKfYg== +"@abp/font-awesome@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.0.0-rc.2.tgz#2c7f392d4a7971f34ef6fa2835901183b2731976" + integrity sha512-dYXTOiOqb4zg/VKhla/qC3E1I9OmPWPy6jUjW+5LcyQcAMRgTR55A8HVvmZHK8OCwJMmpAGcckydegIKK4JfaQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.2.tgz#cdd14db05ffb133ca01ec622fb2e02994f724171" - integrity sha512-JENpQk9V8gHF3QG3NsjLkzN+RQEgjm9Xd79cKHXvaYTAGMMTdFQj/Y6UqEiGpCay++cHKnUdXbLy4J15R8d8aw== +"@abp/jquery-form@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.0.0-rc.2.tgz#45e2a3d838ed8c2b3f59aa6eb6f62b2e7a5934fa" + integrity sha512-uTf9Owhv9cjxb57S/3CtlimMr4cbCIgnIdHiRSU32atxg+xOvwDq4+Vn1AghiwtVgZWAC6W3MJTBHFbPHPfiLg== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.2.tgz#5ba608171e5c5b24c237283b7ccc614e485e2279" - integrity sha512-dFMB32Kio0rTxZIVi6UXZK+fW1GpyGgT7qj/mDeuXmnetWSKEAoHm53mECeqlq0LxGwBEiiEeIsh/9I6BJOisQ== +"@abp/jquery-validation-unobtrusive@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.0.0-rc.2.tgz#c6a4e3081f1d7eadff34592b8cf0498db40170a0" + integrity sha512-g3yY0SuFX+RkPHZO6UcemXWBi1pq4mt3WHx8f2u2knfdqgLRIaPaTZIpVRN4AUSwBGs/GVzpA5hEEQKhl1cChA== dependencies: - "@abp/jquery-validation" "~7.4.2" + "@abp/jquery-validation" "~8.0.0-rc.2" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.2.tgz#875eb5a7cbac26a08fc501536986e5074c02dde1" - integrity sha512-wkTROjMgCXPCk0GQ+u3BA94cy4AWsedbFzbNjFuzIJzg0erzlj7cHBKQ9ZztknkMFVNBMz3cM+tMQtoqUfz8KQ== +"@abp/jquery-validation@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.0.0-rc.2.tgz#4282682538c450bffaba2558cbcc8ac9779736b6" + integrity sha512-e6n4SNp558IjZKQW3Td90Kzmns8NPC4dnmCfZzRC9eZfcfBHXOpNoAQIKw3uNWvGF6lQWo4S5O/Y8QhLW/88cw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.2.tgz#123fb0ad0c15e56cb1d6f355cfaa081008e00d1e" - integrity sha512-DZlQWI48tgk8JtepPviWz0Ils+kDD8xOXG6rZ2+eE0u4Cg2coqrkZzzz2t73kDNZ4s56NzO+w5Dl8BVEuPNzAQ== +"@abp/jquery@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.0.0-rc.2.tgz#e54905bbd5efa13f9a87854608f103e15757a26c" + integrity sha512-KiqRKJlygq/s8qu+ykRp5csOyDjVmVk5KxW+OJz+73hTS7NZiM1tUDYWieFHFfL8AJdzwxt4QP89y8lyfJeBLQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" jquery "~3.6.0" -"@abp/lodash@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.2.tgz#1f33f7b06c1e4ad386b126e2a25440ecfa4d987e" - integrity sha512-uOrf9r6Bsh09dWQ2gLycaCHuCrUPe3q1XaSIe/f0PKQGObaQEDzEEqsXMXpYJgCXn2CDCgQtsQZSo+PGescj1g== +"@abp/lodash@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.0.0-rc.2.tgz#1bca1821db7524e1c612cfe23319abab5d874453" + integrity sha512-EgoIBQI7IYXOND7VHzp7PXM1w8tZZz60aV+DdjhaDuvXY0pSmg7p0HKsd4UerBfiHBepRuu5JcVk/3ZJ/n2MVQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" lodash "^4.17.21" -"@abp/luxon@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.2.tgz#cf8340e781906506117f917667fc8963f3134317" - integrity sha512-2yrji0gSuF2Rayc0EA/G1bWAFEirf8ZFgH8guC9PTlb5ZmWw5hUv8DoLwY5H1iRRPJj00LSSqNg0cT65bw8grw== +"@abp/luxon@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.0.0-rc.2.tgz#336800a04fd72c42f2b9a00da864a708d0c730c6" + integrity sha512-EhiHxcSKNQLzT69GD4qTdhbzwgyqHOwiBOuw2SFYsBml+XbYzDDGbarT5UUNexOjaThHcqHEgyldtGJEDYg3Xw== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.2.tgz#6e16a5b15f8d24f3ce1d3449908210deda8a38eb" - integrity sha512-+xfnwjOVLPoSeIQZzIaSPD9sf0yIqf+umUUR2EjcdheOLqrLDYF9xLBiOnoRkj7w4zkCwQk4k3PQ1o6BYMwo+Q== +"@abp/malihu-custom-scrollbar-plugin@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.0.0-rc.2.tgz#30e7f8fb1edfa921e413f7c166fcac03c9702993" + integrity sha512-2odjr77Uc1kuK9Ffz2SOqojFrc3cfq6LYHEOjgtZquIV69x9FCHWQPDT0QmUPLOXsQ/sclQ3uq0wf9QgOH2eIQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.2.tgz#04a4dddb21147e02ebe8f008d39e25fe35c76478" - integrity sha512-VnyW6ZWSpOSVY3KIuw8tw7RZcpQo5tEDUszQQD9+uB2pBA/QXVdGT7msY50mAa2MYEsSrQ1P5Zqpvwpma7EysA== +"@abp/moment@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.0.0-rc.2.tgz#47e65d9cd7f58d2902da2df584d23d6500c9aa4e" + integrity sha512-0LM0LVWf57Z2smbcQwB4600o05rIGqIDG1BZMGpFcBFTUhiUROw3M7Yhvsh2Hxrfxl2S424f53AwAEhMMc7wXQ== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.2.tgz#41c9c847c8b6f89a7c126e346a020c494ddb74e9" - integrity sha512-ap9bifcEzIXaM10reSEhOrdpJS+ZvNXk7R+Nl/malvJjxeUlln/bRVROtidFp9RP1eFYecDywQE86gfdSmBtTg== +"@abp/prismjs@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.0.0-rc.2.tgz#db3dc72cfd4341ce879a7a2622f21424318ea90e" + integrity sha512-QYo/dCGkmzeAoj+L02WD5n5GVniqqzEZav6I6hFOJpP8pz9xfAqt6gDFlcXKqlGc4NaswfCxMtt0nfFATOJgwQ== dependencies: - "@abp/clipboard" "~7.4.2" - "@abp/core" "~7.4.2" + "@abp/clipboard" "~8.0.0-rc.2" + "@abp/core" "~8.0.0-rc.2" prismjs "^1.26.0" -"@abp/select2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.2.tgz#262cfff6d4a1a1d5010c1d81884f41ec22fc8d89" - integrity sha512-+R11EaFHg1JOHMvt9MGXP05k6LxtKUql/ywB9UoZ193N2/DKZ0dvc9mSplh4ZqgD4AhHae3frPs/f5ySPoMtJw== +"@abp/select2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.0.0-rc.2.tgz#eab2d8c788490dfb42e164535a2ec0e5341c9463" + integrity sha512-amylLPpnriexrPSIwHvYTGrGPdT+IBfEkeN5SMhEL8pwa6/6ScVlzHVxvrMGQEocNFnl8BTD/n/kUnX19uvS9A== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.2.tgz#4952f763b9fe9b26270fe85dfcf3bee440d92058" - integrity sha512-9HL6DwXIxXYbvF77bJMztVrbb+DKe7YTDGt90Q9JtJjTddUSiEPxLAUf6IRcjCCRuTdyywMIIhVptWmCQ4uQHQ== +"@abp/sweetalert2@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.0.0-rc.2.tgz#7c3ca3ffff01a43a3603f49a1986f162157e2a72" + integrity sha512-P/qW+UVUwgAGmku2FWWIMtuwG8clA28+Tc0VYl4vFQNjPK7wwTNrovNXIVKHwyl2GjRGgz7YDS0NUtVdkn7AXQ== dependencies: - "@abp/core" "~7.4.2" + "@abp/core" "~8.0.0-rc.2" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.2.tgz#2b5fd37ef6eac335dd6988162e7423ac241b3b43" - integrity sha512-GMfWVmNxyOO5NQWHe6CnKOXfiUZC/ph6/iT8+q+SWlhSQ7oVI4DyKnT9dAobq4fl5zUfQdVl3g3Gb9TP0mzZLg== +"@abp/timeago@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.0.0-rc.2.tgz#ed98d40b1fa2fa7e65bc3ad84db896e32184a112" + integrity sha512-7Kk9JGkVHo86QyaTg7Y8XB4IYXzP/IGlYDDS+eaStmzFIvXmnNURz7gs4x4tm1Z+IfUz+wJvMYfI4ymwYDLSeQ== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.2.tgz#d8a640d31f59ac61613fd0b6339559228d630bd5" - integrity sha512-g00qHTY8KTlHfrYvrrXp50xHe6KulYmxtqVchJgZnCp4F0UsEap05KPAoZWI9Yes07DjD2FrruUHdSD2OHbXRQ== +"@abp/toastr@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.0.0-rc.2.tgz#c494bb1070ef6aa80d443d11a61f93c03d82f543" + integrity sha512-1ECxLFKNLxI+oegsB2WACmeiOqksi8q8vBiQ5ISW3Z0/kCiN8mC0/c8mmUr9sQjpwACTiFW95H1vPfVbfrt0Mw== dependencies: - "@abp/jquery" "~7.4.2" + "@abp/jquery" "~8.0.0-rc.2" toastr "^2.1.4" -"@abp/utils@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.2.tgz#7bbb3fa0e9570f3ed71d40ab038c8122089133a6" - integrity sha512-bTIoOvAldL7LHtOtWWY47mQ10VL5HHYWV5nwVyCMWlMRBv9zf5VP3IZvLNxPaPbkeMzJmoQ11ds5GU3POJfxzQ== +"@abp/utils@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.0.0-rc.2.tgz#c2959e5161e4102d5757a571d16bd3a4316779fb" + integrity sha512-Ml/qXTk8//qnuAXA8addR5NFBoJp/L5mBJrEtOc6OFiPuFSsnozcE+ZZJZMACyXP996tqmmkuFrDLMaNeKe0cQ== dependencies: just-compare "^2.3.0" -"@abp/virtual-file-explorer@~7.4.2": - version "7.4.2" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-7.4.2.tgz#9a4587374a6658a7ceab6efa496f539ea9d0bd80" - integrity sha512-EXmEAVvJ6TNPF3nyN0G65qBnqjrkuPpY1W1Jtn0eRhxSpgDm3DiBv7h8YP1Qb1M0Iw78rOMvEXJezWRVS7op/w== +"@abp/virtual-file-explorer@~8.0.0-rc.2": + version "8.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-8.0.0-rc.2.tgz#bf7d10f5e107b0cfb55e8d7582fff12cc7d3bea5" + integrity sha512-NXtye7gwko4sbRs43iKN6HFplgFrk+qJegTCKjBK3EIlT/IvRSpPSv+GPhSb5iNF+49iRawKkPe/2uh5oVwgDw== dependencies: - "@abp/clipboard" "~7.4.2" - "@abp/prismjs" "~7.4.2" + "@abp/clipboard" "~8.0.0-rc.2" + "@abp/prismjs" "~8.0.0-rc.2" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj index 108980c375..b9afd7e97f 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj @@ -15,13 +15,13 @@ - - + + true content\ - - + + true content\ diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.json b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg similarity index 100% rename from modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.json rename to modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg diff --git a/npm/lerna.json b/npm/lerna.json index 7303950895..03405ceca8 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 4db45a4896..7761dbe20f 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -44,8 +44,8 @@ }, "private": true, "devDependencies": { - "@abp/ng.theme.lepton-x": "~2.4.2", - "@abp/utils": "~7.4.2", + "@abp/ng.theme.lepton-x": "~3.0.0-rc.1", + "@abp/utils": "~8.0.0-rc.2", "@angular-devkit/build-angular": "~17.0.0", "@angular-devkit/core": "~17.0.0", "@angular-devkit/schematics": "~17.0.0", @@ -66,7 +66,7 @@ "@angular/platform-browser-dynamic": "~17.0.0", "@angular/router": "~17.0.0", "@fortawesome/fontawesome-free": "^6.0.0", - "@ng-bootstrap/ng-bootstrap": "^15.0.0", + "@ng-bootstrap/ng-bootstrap": "^16.0.0-rc.0", "@ngneat/spectator": "^15.0.0", "@ngx-validate/core": "^0.2.0", "@nx/angular": "~17.1.0", @@ -106,7 +106,7 @@ "lerna": "^4.0.0", "lint-staged": "^13.0.0", "ng-packagr": "17.0.0", - "ng-zorro-antd": "^15.0.0", + "ng-zorro-antd": "^17.0.0", "nx": "~17.1.0", "perfect-scrollbar": "^1.0.0", "postcss": "^8.0.0", @@ -115,7 +115,7 @@ "postcss-url": "10.1.3", "prettier": "2.7.1", "protractor": "~7.0.0", - "rxjs": "7.8.1", + "rxjs": "~7.8.0", "should-quote": "^1.0.0", "ts-jest": "29.1.0", "ts-node": "10.9.1", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index a488a9046b..686600d61a 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.core": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0" }, diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 6ab28baec7..b7293dd212 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.account.core": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html index 74e82088a2..254b481c16 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -141,17 +141,24 @@ - +
+ + +
{{ diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 3f7d5147dc..44cceed615 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,18 +1,18 @@ { "name": "@abp/ng.components", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=7.4.2", - "@abp/ng.theme.shared": ">=7.4.2" + "@abp/ng.core": ">=8.0.0-rc.2", + "@abp/ng.theme.shared": ">=8.0.0-rc.2" }, "dependencies": { "chart.js": "^3.5.1", - "ng-zorro-antd": "^16.0.0", + "ng-zorro-antd": "^17.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index cdf1228007..fdbb73d316 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~7.4.2", + "@abp/utils": "~8.0.0-rc.2", "angular-oauth2-oidc": "^15.0.1", "just-clone": "^6.1.1", "just-compare": "^2.3.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index f7d99b5bd4..97a4cbc815 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/generators/package.json b/npm/ng-packs/packages/generators/package.json index 30feb068af..f0a0772825 100644 --- a/npm/ng-packs/packages/generators/package.json +++ b/npm/ng-packs/packages/generators/package.json @@ -1,6 +1,6 @@ { "name": "@abp/nx.generators", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "generators": "./generators.json", "type": "commonjs", diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 2935c6f9d9..970cd95aa6 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,15 +1,15 @@ { "name": "@abp/ng.identity", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~7.4.2", - "@abp/ng.permission-management": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.components": "~8.0.0-rc.2", + "@abp/ng.permission-management": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json index 5a5ea285ef..e22c9a3f15 100644 --- a/npm/ng-packs/packages/oauth/package.json +++ b/npm/ng-packs/packages/oauth/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.oauth", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~7.4.2", - "@abp/utils": "~7.4.2", + "@abp/ng.core": "~8.0.0-rc.2", + "@abp/utils": "~8.0.0-rc.2", "angular-oauth2-oidc": "^15.0.1", "just-clone": "^6.1.1", "just-compare": "^2.3.0", diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 862514882f..67a47639ce 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 65352d5ac7..c9542551f2 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "7.4.2", + "version": "8.0.0-rc.2", "author": "", "schematics": "./collection.json", "dependencies": { diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index dd41a094ff..0cf2e7f054 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.components": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index c52c71d13d..fec66ee783 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.feature-management": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 3ff8b596a7..7a06aef7fc 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", + "@abp/ng.account.core": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index ba54517fbb..6afe5f849b 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,15 +1,15 @@ { "name": "@abp/ng.theme.shared", - "version": "7.4.2", + "version": "8.0.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~7.4.2", + "@abp/ng.core": "~8.0.0-rc.2", "@fortawesome/fontawesome-free": "^5.15.4", - "@ng-bootstrap/ng-bootstrap": "^15.0.0", + "@ng-bootstrap/ng-bootstrap": "^16.0.0-rc.0", "@ngx-validate/core": "^0.2.0", "@popperjs/core": "~2.11.2", "@swimlane/ngx-datatable": "^20.0.0", diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts index 4567ef45d6..559515268c 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts @@ -3,6 +3,10 @@ import { AbstractNgModelComponent } from '@abp/ng.core'; import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'; import { CommonModule } from '@angular/common'; +/** + * @deprecated use ShowPasswordDirective directive + * https://docs.abp.io/en/abp/latest/UI/Angular/Show-Password-Directive + */ @Component({ selector: 'abp-password', standalone: true, diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 233d813d3d..48a21a7a25 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 19d8f1eaa9..567d835980 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~7.4.2" + "@abp/aspnetcore.components.server.theming": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index bb9f071af9..de8d5e28d4 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~7.4.2", - "@abp/font-awesome": "~7.4.2" + "@abp/bootstrap": "~8.0.0-rc.2", + "@abp/font-awesome": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 4dc71d8f87..90e71b580e 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 67efdcfb75..b9928c251e 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,22 +10,22 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~7.4.2", - "@abp/bootstrap": "~7.4.2", - "@abp/bootstrap-datepicker": "~7.4.2", - "@abp/bootstrap-daterangepicker": "~7.4.2", - "@abp/datatables.net-bs5": "~7.4.2", - "@abp/font-awesome": "~7.4.2", - "@abp/jquery-form": "~7.4.2", - "@abp/jquery-validation-unobtrusive": "~7.4.2", - "@abp/lodash": "~7.4.2", - "@abp/luxon": "~7.4.2", - "@abp/malihu-custom-scrollbar-plugin": "~7.4.2", - "@abp/moment": "~7.4.2", - "@abp/select2": "~7.4.2", - "@abp/sweetalert2": "~7.4.2", - "@abp/timeago": "~7.4.2", - "@abp/toastr": "~7.4.2" + "@abp/aspnetcore.mvc.ui": "~8.0.0-rc.2", + "@abp/bootstrap": "~8.0.0-rc.2", + "@abp/bootstrap-datepicker": "~8.0.0-rc.2", + "@abp/bootstrap-daterangepicker": "~8.0.0-rc.2", + "@abp/datatables.net-bs5": "~8.0.0-rc.2", + "@abp/font-awesome": "~8.0.0-rc.2", + "@abp/jquery-form": "~8.0.0-rc.2", + "@abp/jquery-validation-unobtrusive": "~8.0.0-rc.2", + "@abp/lodash": "~8.0.0-rc.2", + "@abp/luxon": "~8.0.0-rc.2", + "@abp/malihu-custom-scrollbar-plugin": "~8.0.0-rc.2", + "@abp/moment": "~8.0.0-rc.2", + "@abp/select2": "~8.0.0-rc.2", + "@abp/sweetalert2": "~8.0.0-rc.2", + "@abp/timeago": "~8.0.0-rc.2", + "@abp/toastr": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 62e9b4bd28..fef1e46432 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "7.4.2", + "version": "8.0.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 8bf858306d..4e3f3bccad 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index ecd9a007ec..20989b0e70 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.2", - "@abp/owl.carousel": "~7.4.2", - "@abp/prismjs": "~7.4.2", - "@abp/tui-editor": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.0.0-rc.2", + "@abp/owl.carousel": "~8.0.0-rc.2", + "@abp/prismjs": "~8.0.0-rc.2", + "@abp/tui-editor": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 37d034ff7e..36ac878690 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap-daterangepicker/package.json b/npm/packs/bootstrap-daterangepicker/package.json index 90d8edce2a..4d02708df2 100644 --- a/npm/packs/bootstrap-daterangepicker/package.json +++ b/npm/packs/bootstrap-daterangepicker/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/bootstrap-daterangepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 2584ec42ec..07cd10292b 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index b5de7793b2..e113df4445 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index a508cf5e67..5b3b2a9b58 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 5e829f3885..e14b6129f9 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~7.4.2", - "@abp/jstree": "~7.4.2", - "@abp/slugify": "~7.4.2", - "@abp/tui-editor": "~7.4.2", - "@abp/uppy": "~7.4.2" + "@abp/codemirror": "~8.0.0-rc.2", + "@abp/jstree": "~8.0.0-rc.2", + "@abp/slugify": "~8.0.0-rc.2", + "@abp/tui-editor": "~8.0.0-rc.2", + "@abp/uppy": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index 763fd1d49c..b3f6f6573a 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~7.4.2", - "@abp/star-rating-svg": "~7.4.2" + "@abp/highlight.js": "~8.0.0-rc.2", + "@abp/star-rating-svg": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 8280b36280..0a8098c886 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~7.4.2", - "@abp/cms-kit.public": "~7.4.2" + "@abp/cms-kit.admin": "~8.0.0-rc.2", + "@abp/cms-kit.public": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index d0987442f9..282c26031f 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 0a686f93cb..f3d15576d1 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~7.4.2" + "@abp/utils": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 7290058593..f3e2f682b1 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index cc30cb06a5..5f4ad09988 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~7.4.2", + "@abp/datatables.net": "~8.0.0-rc.2", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index ce0b475ce3..bc66752f44 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~7.4.2", + "@abp/datatables.net": "~8.0.0-rc.2", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index a5a9a4e526..2f19e3d8d7 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", + "@abp/jquery": "~8.0.0-rc.2", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index b15289eaa4..7cbbdda940 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~7.4.2", - "@abp/clipboard": "~7.4.2", - "@abp/malihu-custom-scrollbar-plugin": "~7.4.2", - "@abp/popper.js": "~7.4.2", - "@abp/prismjs": "~7.4.2" + "@abp/anchor-js": "~8.0.0-rc.2", + "@abp/clipboard": "~8.0.0-rc.2", + "@abp/malihu-custom-scrollbar-plugin": "~8.0.0-rc.2", + "@abp/popper.js": "~8.0.0-rc.2", + "@abp/prismjs": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 26615d0fbb..1504254194 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/flag-icons/package.json b/npm/packs/flag-icons/package.json index 9fe55ff11b..902f5ae4f5 100644 --- a/npm/packs/flag-icons/package.json +++ b/npm/packs/flag-icons/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/flag-icons", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 54af3c51ba..b8e71dab1f 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "@fortawesome/fontawesome-free": "^5.15.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index 0f0228e5fb..3e70e72bdd 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index a00ceacce2..a48a2098e4 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", + "@abp/jquery": "~8.0.0-rc.2", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index 585891dbcc..762e1f3521 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~7.4.2", + "@abp/jquery-validation": "~8.0.0-rc.2", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 82684903b5..f984c8cd07 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", + "@abp/jquery": "~8.0.0-rc.2", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index b6937e4892..6c4c6b09d3 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 01dce3d150..657c1e7212 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", + "@abp/jquery": "~8.0.0-rc.2", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index def4a9e5d0..e5dff1ed64 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index df9d411e78..0094728b7b 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index f82e24ad1f..957f607d5e 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index d97353801a..e7c938c4fa 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/moment/package.json b/npm/packs/moment/package.json index 9a3e0a707d..571aa13ec7 100644 --- a/npm/packs/moment/package.json +++ b/npm/packs/moment/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/moment", "repository": { "type": "git", diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index c40173a001..5426fb22eb 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 0e9d9c6a9b..56fdb028f5 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 7e218c8bb5..b53dc616d1 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~7.4.2", - "@abp/core": "~7.4.2", + "@abp/clipboard": "~8.0.0-rc.2", + "@abp/core": "~8.0.0-rc.2", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/qrcode/package.json b/npm/packs/qrcode/package.json index 244a641640..08134fa3d7 100644 --- a/npm/packs/qrcode/package.json +++ b/npm/packs/qrcode/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/qrcode", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2" + "@abp/core": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 28ffcc1af3..9faeb96210 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index f0967aa432..cba5f39247 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 7a608b1b7f..72bec3a378 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index 227ac3d2b5..6608a84a3b 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", + "@abp/jquery": "~8.0.0-rc.2", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 002dbd1f24..270723065b 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 894cb145db..5722afc0d0 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", + "@abp/jquery": "~8.0.0-rc.2", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index 31046eb01d..8a3cbaeae8 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", + "@abp/jquery": "~8.0.0-rc.2", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index c22bb19e48..74fea3cc45 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.2", - "@abp/prismjs": "~7.4.2" + "@abp/jquery": "~8.0.0-rc.2", + "@abp/prismjs": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index cc66e05da8..49b731fc39 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.2", + "@abp/core": "~8.0.0-rc.2", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index 7e75dd7e6a..8c4a87957a 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "7.4.2", + "version": "8.0.0-rc.2", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index 12c4440bf2..232a2670bc 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~7.4.2", + "@abp/vue": "~8.0.0-rc.2", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index c3809880f0..8e3862b044 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~7.4.2", - "@abp/prismjs": "~7.4.2" + "@abp/clipboard": "~8.0.0-rc.2", + "@abp/prismjs": "~8.0.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index 1045c73c95..02885e96d2 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.2", + "version": "8.0.0-rc.2", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/npm/packs/zxcvbn/package.json b/npm/packs/zxcvbn/package.json index 33a406d942..9c61b8b70a 100644 --- a/npm/packs/zxcvbn/package.json +++ b/npm/packs/zxcvbn/package.json @@ -1,32 +1,31 @@ { - "version": "7.4.0-rc.3", - "name": "@abp/zxcvbn", - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@abp/core": "~7.4.0-rc.3", - "zxcvbn" : "^4.4.2" - }, - "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", - "homepage": "https://abp.io", - "repository": { - "type": "git", - "url": "https://github.com/abpframework/abp.git" - }, - "license": "LGPL-3.0", - "keywords": [ - "aspnetcore", - "boilerplate", - "framework", - "web", - "best-practices", - "angular", - "maui", - "blazor", - "mvc", - "csharp", - "webapp" - ] - } - \ No newline at end of file + "version": "8.0.0-rc.2", + "name": "@abp/zxcvbn", + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@abp/core": "~8.0.0-rc.2", + "zxcvbn": "^4.4.2" + }, + "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", + "homepage": "https://abp.io", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git" + }, + "license": "LGPL-3.0", + "keywords": [ + "aspnetcore", + "boilerplate", + "framework", + "web", + "best-practices", + "angular", + "maui", + "blazor", + "mvc", + "csharp", + "webapp" + ] +} diff --git a/npm/scripts/validate-versions.ts b/npm/scripts/validate-versions.ts index 98f636351a..4583c620e2 100644 --- a/npm/scripts/validate-versions.ts +++ b/npm/scripts/validate-versions.ts @@ -43,7 +43,7 @@ async function compare() { !excludedPackages.includes(pkgJson.name) && pkgJson.version !== compareVersion ) { - throwError(pkgJsonPath, pkgJson.name); + throwError(pkgJsonPath, pkgJson.name, pkgJson.version); } const { dependencies, peerDependencies } = pkgJson; @@ -63,13 +63,15 @@ async function compareDependencies( for (let i = 0; i < entries.length; i++) { const entry = entries[i]; - + const packageName = entry[0]; + const version = getCleanVersionName(entry[1]); + const cleanCompareVersion = getCleanVersionName(compareVersion); if ( !excludedPackages.includes(entry[0]) && - entry[0].match(/@(abp|volo)/)?.length && - entry[1] !== `~${compareVersion}` + packageName.match(/@(abp|volo)/)?.length && + version !== cleanCompareVersion ) { - throwError(filePath, entry[0], `~${compareVersion}`); + throwError(filePath, entry[0], cleanCompareVersion); } } } @@ -77,6 +79,11 @@ async function compareDependencies( function throwError(filePath: string, pkg: string, version?: string) { const { compareVersion } = program.opts(); - log.error(`${filePath}: ${pkg} version is not ${version || compareVersion}`); + log.error(`${filePath}: ${pkg} version is not ${compareVersion}. it is ${version}`); process.exit(1); } + +function getCleanVersionName(version) { + // Remove caret (^) or tilde (~) from the beginning of the version number + return version.replace(/^[\^~]+/, ''); +} \ No newline at end of file diff --git a/nupkg/0 b/nupkg/0 index ca9053508c..cf175e3b0b 100644 Binary files a/nupkg/0 and b/nupkg/0 differ diff --git a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip index f3194b3c52..c5ca2d87c5 100644 Binary files a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ diff --git a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip index c089587ae9..299a6ac078 100644 Binary files a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip index d04d27d82e..f3bd323ac0 100644 Binary files a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip index 6f092a9679..4d260e32e7 100644 Binary files a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip and b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip index a9cfeaf174..7da85faf52 100644 Binary files a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ diff --git a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip index c7ef2011ed..2a28d695c4 100644 Binary files a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip index 2bdbe0b36f..ef3d83ba8d 100644 Binary files a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ diff --git a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip index f2f656f522..bdad8114cf 100644 Binary files a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ diff --git a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip index f735304045..f0b5fb70a4 100644 Binary files a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip and b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ diff --git a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip index 00685ae82c..5fe7925ad4 100644 Binary files a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip index fc5d71943a..2740c6b1d4 100644 Binary files a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip index 44049bdfbf..ba4a0076b7 100644 Binary files a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip index 423ba84344..b1bb9f6dcf 100644 Binary files a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ diff --git a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip index 22f3384db5..19aff51897 100644 Binary files a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ diff --git a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip index b0d4ad3ae8..576eba926c 100644 Binary files a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ diff --git a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip index 624a254709..2321cf35e1 100644 Binary files a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip and b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip differ diff --git a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip index e387938043..5a5f69728e 100644 Binary files a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ diff --git a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip index 0aeb082d34..8ed8edf54c 100644 Binary files a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ diff --git a/templates/.yarnrc b/templates/.yarnrc new file mode 100644 index 0000000000..0bcfa81fd9 --- /dev/null +++ b/templates/.yarnrc @@ -0,0 +1 @@ +"@abp:registry" "https://www.myget.org/F/abp-nightly/npm/" diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 4cf64e3a86..f620a51520 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,44 +12,44 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.components": "~7.4.2", - "@abp/ng.core": "~7.4.2", - "@abp/ng.oauth": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", - "@abp/ng.theme.lepton-x": "~2.4.2", - "@angular/animations": "~16.2.0", - "@angular/common": "~16.2.0", - "@angular/compiler": "~16.2.0", - "@angular/core": "~16.2.0", - "@angular/forms": "~16.2.0", - "@angular/localize": "~16.2.0", - "@angular/platform-browser": "~16.2.0", - "@angular/platform-browser-dynamic": "~16.2.0", - "@angular/router": "~16.2.0", - "rxjs": "~7.4.0", + "@abp/ng.account": "~8.0.0-rc.2", + "@abp/ng.components": "~8.0.0-rc.2", + "@abp/ng.core": "~8.0.0-rc.2", + "@abp/ng.oauth": "~8.0.0-rc.2", + "@abp/ng.identity": "~8.0.0-rc.2", + "@abp/ng.setting-management": "~8.0.0-rc.2", + "@abp/ng.tenant-management": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", + "@abp/ng.theme.lepton-x": "~3.0.0-rc.1", + "@angular/animations": "~17.0.0", + "@angular/common": "~17.0.0", + "@angular/compiler": "~17.0.0", + "@angular/core": "~17.0.0", + "@angular/forms": "~17.0.0", + "@angular/localize": "~17.0.0", + "@angular/platform-browser": "~17.0.0", + "@angular/platform-browser-dynamic": "~17.0.0", + "@angular/router": "~17.0.0", + "rxjs": "~7.8.0", "tslib": "^2.1.0", "bootstrap-icons": "~1.8.3", "zone.js": "~0.13.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~16.2.0", - "@angular-eslint/builder": "~16.2.0", - "@angular-eslint/eslint-plugin": "~16.2.0", - "@angular-eslint/eslint-plugin-template": "~16.2.0", - "@angular-eslint/schematics": "~16.2.0", - "@angular-eslint/template-parser": "~16.2.0", - "@abp/ng.schematics": "~7.4.2", - "@angular/cli": "~16.2.0", - "@angular/compiler-cli": "~16.2.0", - "@angular/language-service": "~16.2.0", + "@angular-devkit/build-angular": "~17.0.0", + "@angular-eslint/builder": "~17.0.0", + "@angular-eslint/eslint-plugin": "~17.0.0", + "@angular-eslint/eslint-plugin-template": "~17.0.0", + "@angular-eslint/schematics": "~17.0.0", + "@angular-eslint/template-parser": "~17.0.0", + "@abp/ng.schematics": "~8.0.0-rc.2", + "@angular/cli": "~17.0.0", + "@angular/compiler-cli": "~17.0.0", + "@angular/language-service": "~17.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", "eslint": "^8.23.0", "jasmine-core": "~4.0.0", "karma": "~6.3.0", @@ -57,7 +57,7 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "ng-packagr": "~16.2.0", - "typescript": "~5.0.4" + "ng-packagr": "~17.0.0", + "typescript": "~5.2.0" } } diff --git a/templates/app-nolayers/angular/src/app/home/home.component.html b/templates/app-nolayers/angular/src/app/home/home.component.html index 14accbdf36..5336e56c18 100644 --- a/templates/app-nolayers/angular/src/app/home/home.component.html +++ b/templates/app-nolayers/angular/src/app/home/home.component.html @@ -1,35 +1,48 @@
-
- {{ '::Welcome_Title' | abpLocalization }} -
+
+ {{ '::Welcome_Title' | abpLocalization }} +
- {{ '::Welcome_Text' | abpLocalization }} + @if(!hasLoggedIn){ + + } + +

{{ '::Welcome_Text' | abpLocalization }}

- +
THE OFFICIAL GUIDE

Mastering ABP Framework

-

Written by the creator of the ABP Framework, this book will help you gain a complete - understanding of the framework and modern web application development techniques.

+

+ Written by the creator of the ABP Framework, this book will help you gain a complete + understanding of the framework and modern web application development techniques. +

- + Buy on Amazon US   - + Buy on PACKT
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index f6bb493964..728927e3ab 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -105,7 +105,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 7238d468c4..7d86dcc5eb 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.2", - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1", + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index f6e53968a1..a8fc94a5a4 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -113,7 +113,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index 0cf54d9b37..2d06cc4fb7 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj index 57dc358c47..3fcb0299a2 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj @@ -46,7 +46,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj index 5c62220d57..39905f66b4 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj @@ -101,7 +101,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj index 863ec4a380..b9e8ae8c90 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj @@ -109,7 +109,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj index a484230d9a..3d7064bf5d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj @@ -33,7 +33,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index 1d0b2df3cc..28cc9a9f11 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -97,7 +97,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index 4204006e49..366e4275f2 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -105,7 +105,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index a63fb04f94..1810473a5e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -109,7 +109,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index cebc70d629..afe64a9c7a 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -117,7 +117,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 530abe4097..2fbb2dfafe 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,44 +12,44 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.components": "~7.4.2", - "@abp/ng.core": "~7.4.2", - "@abp/ng.oauth": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", - "@abp/ng.theme.lepton-x": "~2.4.2", - "@angular/animations": "~16.2.0", - "@angular/common": "~16.2.0", - "@angular/compiler": "~16.2.0", - "@angular/core": "~16.2.0", - "@angular/forms": "~16.2.0", - "@angular/localize": "~16.2.0", - "@angular/platform-browser": "~16.2.0", - "@angular/platform-browser-dynamic": "~16.2.0", - "@angular/router": "~16.2.0", - "bootstrap-icons": "~1.8.3", - "rxjs": "~7.4.0", - "tslib": "^2.1.0", + "@abp/ng.account": "~8.0.0-rc.2", + "@abp/ng.components": "~8.0.0-rc.2", + "@abp/ng.core": "~8.0.0-rc.2", + "@abp/ng.identity": "~8.0.0-rc.2", + "@abp/ng.oauth": "~8.0.0-rc.2", + "@abp/ng.setting-management": "~8.0.0-rc.2", + "@abp/ng.tenant-management": "~8.0.0-rc.2", + "@abp/ng.theme.lepton-x": "~3.0.0-rc.1", + "@abp/ng.theme.shared": "~8.0.0-rc.2", + "@angular/animations": "~17.0.0", + "@angular/common": "~17.0.0", + "@angular/compiler": "~17.0.0", + "@angular/core": "~17.0.0", + "@angular/forms": "~17.0.0", + "@angular/localize": "~17.0.0", + "@angular/platform-browser": "~17.0.0", + "@angular/platform-browser-dynamic": "~17.0.0", + "@angular/router": "~17.0.0", + "bootstrap-icons": "~1.8.0", + "rxjs": "~7.8.0", + "tslib": "^2.0.0", "zone.js": "~0.13.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~16.2.0", - "@angular-eslint/builder": "~16.2.0", - "@angular-eslint/eslint-plugin": "~16.2.0", - "@angular-eslint/eslint-plugin-template": "~16.2.0", - "@angular-eslint/schematics": "~16.2.0", - "@angular-eslint/template-parser": "~16.2.0", - "@abp/ng.schematics": "~7.4.2", - "@angular/cli": "~16.2.0", - "@angular/compiler-cli": "~16.2.0", - "@angular/language-service": "~16.2.0", + "@abp/ng.schematics": "~8.0.0-rc.2", + "@angular-devkit/build-angular": "~17.0.0", + "@angular-eslint/builder": "~17.0.0", + "@angular-eslint/eslint-plugin": "~17.0.0", + "@angular-eslint/eslint-plugin-template": "~17.0.0", + "@angular-eslint/schematics": "~17.0.0", + "@angular-eslint/template-parser": "~17.0.0", + "@angular/cli": "~17.0.0", + "@angular/compiler-cli": "~17.0.0", + "@angular/language-service": "~17.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", "eslint": "^8.23.0", "jasmine-core": "~4.0.0", "karma": "~6.3.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.0.4" + "typescript": "~5.2.0" } } diff --git a/templates/app/aspnet-core/common.props b/templates/app/aspnet-core/common.props index 7e89c3a06b..22d34c4802 100644 --- a/templates/app/aspnet-core/common.props +++ b/templates/app/aspnet-core/common.props @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json index 960af7da27..ec8c54a8f4 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs index c41ed749be..e456ede4f3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs @@ -232,7 +232,6 @@ public class MyProjectNameBlazorModule : AbpModule context.Services.Configure(options => { options.IsDynamicClaimsEnabled = true; - options.RemoteRefreshUrl = configuration["AuthServer:Authority"] + options.RemoteRefreshUrl; }); } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index 0cf54d9b37..2d06cc4fb7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index 0cf54d9b37..2d06cc4fb7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index 833ae909f5..5d955fd6c1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -81,12 +81,6 @@ public class MyProjectNameBlazorModule : AbpModule options.ProviderOptions.DefaultScopes.Add("email"); options.ProviderOptions.DefaultScopes.Add("phone"); }); - - builder.Services.Configure(options => - { - options.IsDynamicClaimsEnabled = true; - options.RemoteRefreshUrl = builder.Configuration["AuthServer:Authority"] + options.RemoteRefreshUrl; - }); } private static void ConfigureUI(WebAssemblyHostBuilder builder) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 70e98a64eb..777d3e8886 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -214,7 +214,6 @@ public class MyProjectNameWebModule : AbpModule context.Services.Configure(options => { options.IsDynamicClaimsEnabled = true; - options.RemoteRefreshUrl = configuration["AuthServer:Authority"] + options.RemoteRefreshUrl; }); } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index 4aa22aef89..e2fd128fc3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1" } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 5f1897d16e..18bead6c85 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -12,43 +12,43 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.components": "~7.4.2", - "@abp/ng.core": "~7.4.2", - "@abp/ng.oauth": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.basic": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", - "@angular/animations": "~16.2.0", - "@angular/common": "~16.2.0", - "@angular/compiler": "~16.2.0", - "@angular/core": "~16.2.0", - "@angular/forms": "~16.2.0", - "@angular/localize": "~16.2.0", - "@angular/platform-browser": "~16.2.0", - "@angular/platform-browser-dynamic": "~16.2.0", - "@angular/router": "~16.2.0", - "rxjs": "~7.4.0", + "@abp/ng.account": "~8.0.0-rc.2", + "@abp/ng.components": "~8.0.0-rc.2", + "@abp/ng.core": "~8.0.0-rc.2", + "@abp/ng.identity": "~8.0.0-rc.2", + "@abp/ng.oauth": "~8.0.0-rc.2", + "@abp/ng.setting-management": "~8.0.0-rc.2", + "@abp/ng.tenant-management": "~8.0.0-rc.2", + "@abp/ng.theme.basic": "~8.0.0-rc.2", + "@abp/ng.theme.shared": "~8.0.0-rc.2", + "@angular/animations": "~17.0.0", + "@angular/common": "~17.0.0", + "@angular/compiler": "~17.0.0", + "@angular/core": "~17.0.0", + "@angular/forms": "~17.0.0", + "@angular/localize": "~17.0.0", + "@angular/platform-browser": "~17.0.0", + "@angular/platform-browser-dynamic": "~17.0.0", + "@angular/router": "~17.0.0", + "rxjs": "~7.8.0", "tslib": "^2.1.0", "zone.js": "~0.13.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~16.2.0", - "@angular-eslint/builder": "~16.2.0", - "@angular-eslint/eslint-plugin": "~16.2.0", - "@angular-eslint/eslint-plugin-template": "~16.2.0", - "@angular-eslint/schematics": "~16.2.0", - "@angular-eslint/template-parser": "~16.2.0", - "@abp/ng.schematics": "~7.4.2", - "@angular/cli": "~16.2.0", - "@angular/compiler-cli": "~16.2.0", - "@angular/language-service": "~16.2.0", + "@abp/ng.schematics": "~8.0.0-rc.2", + "@angular-devkit/build-angular": "~17.0.0", + "@angular-eslint/builder": "~17.0.0", + "@angular-eslint/eslint-plugin": "~17.0.0", + "@angular-eslint/eslint-plugin-template": "~17.0.0", + "@angular-eslint/schematics": "~17.0.0", + "@angular-eslint/template-parser": "~17.0.0", + "@angular/cli": "~17.0.0", + "@angular/compiler-cli": "~17.0.0", + "@angular/language-service": "~17.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", "eslint": "^8.23.0", "jasmine-core": "~4.0.0", "karma": "~6.3.0", @@ -56,6 +56,7 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.0.4" + "ng-packagr": "^17.0.0", + "typescript": "~5.2.0" } } diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index 4d2146c622..c7bb8839ad 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=14", "@angular/core": ">=14", - "@abp/ng.core": ">=7.4.2", - "@abp/ng.theme.shared": ">=7.4.2" + "@abp/ng.core": ">=8.0.0-rc.2", + "@abp/ng.theme.shared": ">=8.0.0-rc.2" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts b/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts index 75934a9b70..f676a219d9 100644 --- a/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts +++ b/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { DynamicLayoutComponent } from '@abp/ng.core'; +import { RouterOutletComponent } from '@abp/ng.core'; import { Routes, RouterModule } from '@angular/router'; import { MyProjectNameComponent } from './components/my-project-name.component'; @@ -7,7 +7,7 @@ const routes: Routes = [ { path: '', pathMatch: 'full', - component: DynamicLayoutComponent, + component: RouterOutletComponent, children: [ { path: '', diff --git a/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpmdl.json b/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpmdl similarity index 76% rename from templates/module/aspnet-core/MyCompanyName.MyProjectName.abpmdl.json rename to templates/module/aspnet-core/MyCompanyName.MyProjectName.abpmdl index 86d90a47ab..27fbba8a82 100644 --- a/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpmdl.json +++ b/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpmdl @@ -8,103 +8,103 @@ }, "packages": { "MyCompanyName.MyProjectName.Domain.Shared": { - "path": "src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.Domain": { - "path": "src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.Application.Contracts": { - "path": "src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.Application": { - "path": "src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.EntityFrameworkCore": { - "path": "src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.MongoDB": { - "path": "src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.HttpApi": { - "path": "src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.HttpApi.Client": { - "path": "src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.TestBase": { - "path": "test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.abppkg.json", + "path": "test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.abppkg", "folder": "test" }, "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests": { - "path": "test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.abppkg.json", + "path": "test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.abppkg", "folder": "test" }, "MyCompanyName.MyProjectName.MongoDB.Tests": { - "path": "test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.abppkg.json", + "path": "test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.abppkg", "folder": "test" }, "MyCompanyName.MyProjectName.Domain.Tests": { - "path": "test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.abppkg.json", + "path": "test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.abppkg", "folder": "test" }, "MyCompanyName.MyProjectName.Application.Tests": { - "path": "test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.abppkg.json", + "path": "test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.abppkg", "folder": "test" }, "MyCompanyName.MyProjectName.HttpApi.Host": { - "path": "host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.abppkg.json", + "path": "host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.abppkg", "folder": "host" }, "MyCompanyName.MyProjectName.Web": { - "path": "src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp": { - "path": "test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.abppkg.json", + "path": "test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.abppkg", "folder": "test" }, "MyCompanyName.MyProjectName.Web.Host": { - "path": "host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.abppkg.json", + "path": "host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.abppkg", "folder": "host" }, "MyCompanyName.MyProjectName.AuthServer": { - "path": "host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.abppkg.json", + "path": "host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.abppkg", "folder": "host" }, "MyCompanyName.MyProjectName.Host.Shared": { - "path": "host/MyCompanyName.MyProjectName.Host.Shared/MyCompanyName.MyProjectName.Host.Shared.abppkg.json", + "path": "host/MyCompanyName.MyProjectName.Host.Shared/MyCompanyName.MyProjectName.Host.Shared.abppkg", "folder": "host" }, "MyCompanyName.MyProjectName.Web.Unified": { - "path": "host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.abppkg.json", + "path": "host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.abppkg", "folder": "host" }, "MyCompanyName.MyProjectName.Blazor": { - "path": "src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.Blazor.Host": { - "path": "host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.abppkg.json", + "path": "host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.abppkg", "folder": "host" }, "MyCompanyName.MyProjectName.Blazor.Server": { - "path": "src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.Blazor.WebAssembly": { - "path": "src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.abppkg.json", + "path": "src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.abppkg", "folder": "src" }, "MyCompanyName.MyProjectName.Blazor.Server.Host": { - "path": "host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.abppkg.json", + "path": "host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.abppkg", "folder": "host" } } diff --git a/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpsln.json b/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpsln similarity index 52% rename from templates/module/aspnet-core/MyCompanyName.MyProjectName.abpsln.json rename to templates/module/aspnet-core/MyCompanyName.MyProjectName.abpsln index 3273040f28..06ee073020 100644 --- a/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpsln.json +++ b/templates/module/aspnet-core/MyCompanyName.MyProjectName.abpsln @@ -1,7 +1,7 @@ { "modules": { "MyCompanyName.MyProjectName": { - "path": "MyCompanyName.MyProjectName.abpmdl.json" + "path": "MyCompanyName.MyProjectName.abpmdl" } } } \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.abppkg.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.abppkg similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.abppkg.json rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.abppkg diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index a3afa9647e..97aa8c7635 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.abppkg.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.abppkg similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.abppkg.json rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.abppkg diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.abppkg.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.abppkg similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.abppkg.json rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.abppkg diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 02a97031df..6d02c10091 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2", - "@abp/aspnetcore.components.server.basictheme": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2", + "@abp/aspnetcore.components.server.basictheme": "~8.0.0-rc.2" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/MyCompanyName.MyProjectName.Host.Shared.abppkg.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/MyCompanyName.MyProjectName.Host.Shared.abppkg similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/MyCompanyName.MyProjectName.Host.Shared.abppkg.json rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/MyCompanyName.MyProjectName.Host.Shared.abppkg diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.abppkg.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.abppkg similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.abppkg.json rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.abppkg diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.abppkg.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.abppkg similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.abppkg.json rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.abppkg diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index ef4a2dea54..b0daf10eee 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.abppkg.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.abppkg similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.abppkg.json rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.abppkg diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index ef4a2dea54..b0daf10eee 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.0.0-rc.2" } } diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj index 15df9828d5..9694d57c61 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj @@ -14,8 +14,8 @@ - - + + true content\ diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.abppkg diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.abppkg.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.abppkg similarity index 100% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.abppkg.json rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.abppkg diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.abppkg.json b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.abppkg similarity index 100% rename from templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.abppkg.json rename to templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.abppkg diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.abppkg.json b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.abppkg similarity index 100% rename from templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.abppkg.json rename to templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.abppkg diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.abppkg.json b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.abppkg similarity index 100% rename from templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.abppkg.json rename to templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.abppkg diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.abppkg.json b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.abppkg similarity index 100% rename from templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.abppkg.json rename to templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.abppkg diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.abppkg.json b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.abppkg similarity index 100% rename from templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.abppkg.json rename to templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.abppkg diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.abppkg.json b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.abppkg similarity index 100% rename from templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.abppkg.json rename to templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.abppkg