diff --git a/Directory.Packages.props b/Directory.Packages.props index ebb6042d76..0a7d88c504 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,7 +11,7 @@ - + @@ -20,10 +20,10 @@ - - - - + + + + @@ -54,7 +54,7 @@ - + @@ -89,8 +89,8 @@ - - + + @@ -122,11 +122,11 @@ - + - + @@ -168,12 +168,13 @@ - + + diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index 7a9687e6d0..7f9b928749 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -672,6 +672,7 @@ "SupportQuestionCountPerDeveloperOnRenewLicense": "Support Question Count Per Developer for License Renewal", "SupportQuestionCountPerDeveloperOnNewLicense": "Support Question Count Per Developer for New License", "IncludedDeveloperCount": "Included Developer Count", + "AiTokenCountPerDeveloper": "AI Token Count Per Developer", "CanBuyAdditionalDevelopers": "Can Buy Additional Developers", "HasEmailSupport": "Has Email Support", "IsSupportPrivateQuestion": "Can Open Private Support Question", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json index 7cccf12cde..622f30420c 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json @@ -262,11 +262,14 @@ "LicenseBanner:CallToAction": "Please extend your license.", "Referral.CreatorUserIdIsRequired": "Creator user ID is required.", "Referral.TargetEmailIsRequired": "Target email is required.", - "Referral.TargetEmailAlreadyExists": "A referral link for this email address already exists.", + "Referral.YouAlreadyHaveLinkForThisEmail": "You have already created a referral link for this email address.", "Referral.MaxLinkLimitExceeded": "You have reached the maximum limit of {Limit} active referral links.", "Referral.LinkNotFound": "Referral link not found.", "Referral.LinkNotFoundOrNotOwned": "Referral link not found or you don't have permission to access it.", "Referral.CannotDeleteUsedLink": "You cannot delete a referral link that has already been used.", + "Referral.CannotReferYourself": "You cannot create a referral link for your own email address.", + "Referral:TargetEmail": "Target Email", + "Referral.CannotReferSameOrganizationMember": "You cannot create a referral link for a user who is already a member of your organization.", "LinkCopiedToClipboard": "Link copied to clipboard", "AreYouSureToDeleteReferralLink": "Are you sure you want to delete this referral link?", "DefaultErrorMessage": "An error occurred." diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 18730b51d6..981500451a 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -1553,6 +1553,15 @@ "IntegrateToYourKubernetesCluster_Description1": "Connect your local development environment to a local or remote Kubernetes cluster, where that cluster already runs your microservice solution.", "IntegrateToYourKubernetesCluster_Description2": "Access any service in Kubernetes with their service name as DNS, just like they are running in your local computer.", "IntegrateToYourKubernetesCluster_Description3": "Intercept any service in that cluster, so all the traffic to the intercepted service is automatically redirected to your service that is running in your local machine. When your service needs to use any service in Kubernetes, the traffic is redirected back to the cluster, just like your local service is running inside the Kubernetes.", + "AskOurAiAssistant": "Ask Our AI Assistant", + "AskOurAiAssistant_Description1": "Build faster with an AI that actually understands your ABP project. The ABP AI Assistant answers your technical questions, explains your code, and helps you solve problems directly inside ABP Studio — with full awareness of your project’s structure. You can even send screenshots or code files to get precise, context-based guidance.", + "AskOurAiAssistant_Description2": "What It Helps You Do", + "AskOurAiAssistant_Description3": "Ask anything about your ABP project — domain layer, modules, configuration, entities, services, or UI.", + "AskOurAiAssistant_Description4": "Get smart, code-aware explanations tailored to your solution.", + "AskOurAiAssistant_Description5": "Generate snippets and scaffolding suggestions instantly.", + "AskOurAiAssistant_Description6": "Fix errors faster with context-aware debugging support.", + "AskOurAiAssistant_Description7": "Learn ABP best practices as you build.", + "AskOurAiAssistant_Description8": "Whether you're generating new features, debugging an issue, or exploring a module, the AI Assistant gives you actionable, project-specific answers — right when you need them.", "GetInformed": "Get Informed", "Studio_GetInformed_Description1": "Leave your contact information to get informed and try it first when ABP Studio has been launched.", "Studio_GetInformed_Description2": "Planned preview release date: Q3 of 2023.", diff --git a/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/POST.md b/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/POST.md new file mode 100644 index 0000000000..32647b5b6c --- /dev/null +++ b/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/POST.md @@ -0,0 +1,89 @@ +# ABP.IO Platform 10.0 Final Has Been Released! + +We are glad to announce that [ABP](https://abp.io/) 10.0 stable version has been released today. + +## What's New With Version 10.0? + +All the new features were explained in detail in the [10.0 RC Announcement Post](https://abp.io/community/announcements/announcing-abp-10-0-release-candidate-86lrnyox), so there is no need to review them again. You can check it out for more details. + +## Getting Started with 10.0 + +### How to Upgrade an Existing Solution + +You can upgrade your existing solutions with either ABP Studio or ABP CLI. In the following sections, both approaches are explained: + +### Upgrading via ABP Studio + +If you are already using the ABP Studio, you can upgrade it to the latest version. ABP Studio periodically checks for updates in the background, and when a new version of ABP Studio is available, you will be notified through a modal. Then, you can update it by confirming the opened modal. See [the documentation](https://abp.io/docs/latest/studio/installation#upgrading) for more info. + +After upgrading the ABP Studio, then you can open your solution in the application, and simply click the **Upgrade ABP Packages** action button to instantly upgrade your solution: + +![](upgrade-abp-packages.png) + +### Upgrading via ABP CLI + +Alternatively, you can upgrade your existing solution via ABP CLI. First, you need to install the ABP CLI or upgrade it to the latest version. + +If you haven't installed it yet, you can run the following command: + +```bash +dotnet tool install -g Volo.Abp.Studio.Cli +``` + +Or to update the existing CLI, you can run the following command: + +```bash +dotnet tool update -g Volo.Abp.Studio.Cli +``` + +After installing/updating the ABP CLI, you can use the [`update` command](https://abp.io/docs/latest/CLI#update) to update all the ABP related NuGet and NPM packages in your solution as follows: + +```bash +abp update +``` + +You can run this command in the root folder of your solution to update all ABP related packages. + +## Migration Guides + +There are a few breaking changes in this version that may affect your application. Please read the migration guide carefully, if you are upgrading from v9.x: [ABP Version 10.0 Migration Guide](https://abp.io/docs/10.0/release-info/migration-guides/abp-10-0) + +## Community News + +### New ABP Community Articles + +As always, exciting articles have been contributed by the ABP community. I will highlight some of them here: + +* [Alper Ebiçoğlu](https://abp.io/community/members/alper) + * [Optimize your .NET app for production Part 1](https://abp.io/community/articles/optimize-your-dotnet-app-for-production-for-any-.net-app-wa24j28e) + * [Optimize your .NET app for production Part 2](https://abp.io/community/articles/optimize-your-dotnet-app-for-production-for-any-.net-app-2-78xgncpi) + * [Return Code vs Exceptions: Which One is Better?](https://abp.io/community/articles/return-code-vs-exceptions-which-one-is-better-1rwcu9yi) +* [Sumeyye Kurtulus](https://abp.io/community/members/sumeyye.kurtulus) + * [Building Scalable Angular Apps with Reusable UI Components](https://abp.io/community/articles/building-scalable-angular-apps-with-reusable-ui-components-b9npiff3) + * [Angular Library Linking Made Easy: Paths, Workspaces and Symlinks](https://abp.io/community/articles/angular-library-linking-made-easy-paths-workspaces-and-5z2ate6e) +* [erdem çaygör](https://abp.io/community/members/erdem.caygor) + * [Building Dynamic Forms in Angular for Enterprise](https://abp.io/community/articles/building-dynamic-forms-in-angular-for-enterprise-6r3ewpxt) + * [From Server to Browser: Angular TransferState Explained](https://abp.io/community/articles/from-server-to-browser-angular-transferstate-explained-m99zf8oh) +* [Mansur Besleney](https://abp.io/community/members/mansur.besleney) + * [Top 10 Exception Handling Mistakes in .NET](https://abp.io/community/articles/top-10-exception-handling-mistakes-in-net-jhm8wzvg) +* [Berkan Şaşmaz](https://abp.io/community/members/berkansasmaz) + * [How to Dynamically Set the Connection String in EF Core](https://abp.io/community/articles/how-to-dynamically-set-the-connection-string-in-ef-core-30k87fpj) +* [Oğuzhan Ağır](https://abp.io/community/members/oguzhan.agir) + * [The ASP.NET Core Dependency Injection System](https://abp.io/community/articles/the-asp.net-core-dependency-injection-system-3vbsdhq8) +* [Selman Koç](https://abp.io/community/members/selmankoc) + * [5 Things Keep in Mind When Deploying Clustered Environment](https://abp.io/community/articles/5-things-keep-in-mind-when-deploying-clustered-environment-i9byusnv) +* [Muhammet Ali ÖZKAYA](https://abp.io/community/members/m.aliozkaya) + * [Repository Pattern in ASP.NET Core](https://abp.io/community/articles/repository-pattern-in-asp.net-core-2dudlg3j) +* [Armağan Ünlü](https://abp.io/community/members/armagan) + * [UI/UX Trends That Will Shape 2026](https://abp.io/community/articles/UI-UX-Trends-That-Will-Shape-2026-bx4c2kow) +* [Salih](https://abp.io/community/members/salih) + * [What is That Domain Service in DDD for .NET Developers?](https://abp.io/community/articles/what-is-that-domain-service-in-ddd-for-.net-developers-uqnpwjja) + * [Building an API Key Management System with ABP Framework](https://abp.io/community/articles/building-an-api-key-management-system-with-abp-framework-28gn4efw) +* [Fahri Gedik](https://abp.io/community/members/fahrigedik) + * [Signal-Based Forms in Angular](https://abp.io/community/articles/signal-based-forms-in-angular-21-9qentsqs) + +Thanks to the ABP Community for all the content they have published. You can also [post your ABP related (text or video) content](https://abp.io/community/posts/create) to the ABP Community. + +## About the Next Version + +The next feature version will be 10.1. You can follow the [release planning here](https://github.com/abpframework/abp/milestones). Please [submit an issue](https://github.com/abpframework/abp/issues/new) if you have any problems with this version. diff --git a/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/cover-image.png b/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/cover-image.png new file mode 100644 index 0000000000..5453dcd4e8 Binary files /dev/null and b/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/cover-image.png differ diff --git a/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/upgrade-abp-packages.png b/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/upgrade-abp-packages.png new file mode 100644 index 0000000000..4ec1d19589 Binary files /dev/null and b/docs/en/Blog-Posts/2025-08-08 v10_0_Release_Stable/upgrade-abp-packages.png differ diff --git a/docs/en/Community-Articles/2025-11-15-Announcing-SSR-Support/article.md b/docs/en/Community-Articles/2025-11-15-Announcing-SSR-Support/article.md new file mode 100644 index 0000000000..51b28ef18c --- /dev/null +++ b/docs/en/Community-Articles/2025-11-15-Announcing-SSR-Support/article.md @@ -0,0 +1,156 @@ +# Announcing Server-Side Rendering (SSR) Support for ABP Framework Angular Applications + +We are pleased to announce that **Server-Side Rendering (SSR)** has become available for ABP Framework Angular applications! This highly requested feature brings major gains in performance, SEO, and user experience to your Angular applications based on ABP Framework. + +## What is Server-Side Rendering (SSR)? + +Server-Side Rendering refers to an approach which renders your Angular application on the server as opposed to the browser. The server creates the complete HTML for a page and sends it to the client, which can then show the page to the user. This poses many advantages over traditional client-side rendering. + +## Why SSR Matters for ABP Angular Applications + +### Improved Performance +- **Quicker visualization of the first contentful paint (FCP)**: Because prerendered HTML is sent over from the server, users will see content quicker. +- **Better perceived performance**: Even on slower devices, the page will be displaying something sooner. +- **Less JavaScript parsing time**: For example, the initial page load will not require parsing and executing a large bundle of JavaScript. + +### Enhanced SEO +- **Improved indexing by search engines**: Search engine bots are able to crawl and index your content quicker. +- **Improved rankings in search**: The quicker the content loads and the easier it is to access, the better your SEO score. +- **Preview when sharing on social channels**: Rich previews with the appropriate meta tags are generated when sharing links on social platforms. + +### Better User Experience +- **Support for low bandwidth**: Users with slower Internet connections will have a better experience +- **Progressive enhancement**: Users can start accessing the content before JavaScript has loaded +- **Better accessibility**: Screen readers and other assistive technologies can access the content immediately + +## Getting Started with SSR + +### Adding SSR to an Existing Project + +You can easily add SSR support to your existing ABP Angular application using the Angular CLI with ABP schematics: + +> Adds SSR configuration to your project +```bash +ng generate @abp/ng.schematics:ssr-add +``` +> Short form +```bash +ng g @abp/ng.schematics:ssr-add +``` +If you have multiple projects in your workspace, you can specify which project to add SSR to: + +```bash +ng g @abp/ng.schematics:ssr-add --project=my-project +``` + +If you want to skip the automatic installation of dependencies: + +```bash +ng g @abp/ng.schematics:ssr-add --skip-install +``` + +## What Gets Configured + +When you add SSR to your ABP Angular project, the schematic automatically: + +1. **Installs necessary dependencies**: Adds `@angular/ssr` and related packages +2. **Creates Server Configuration**: Creates `server.ts` and related files +3. **Updates Project Structure**: + - Creates `main.server.ts` to bootstrap the server + - Adds `app.config.server.ts` for standalone apps (or `app.module.server.ts` for NgModule apps) + - Configures server routes in `app.routes.server.ts` +4. **Updates Build Configuration**: updates `angular.json` to include: + - a `serve-ssr` target for local SSR development + - a `prerender` target for static site generation + - Proper output paths for browser and server bundles + +## Supported Configurations + +The ABP SSR schematic supports both modern and legacy Angular build configurations: + +### Application Builder (Suggested) +- The new `@angular-devkit/build-angular:application` builder +- Optimized for Angular 17+ apps +- Enhanced performance and smaller bundle sizes + +### Server Builder (Legacy) +- The original `@angular-devkit/build-angular:server` builder +- Designed for legacy Angular applications +- Compatible with legacy applications + +## Running Your SSR Application + +After adding SSR to your project, you can run your application in SSR mode: + +```bash +# Development mode with SSR +ng serve + +# Or specifically target SSR development server +npm run serve:ssr + +# Build for production +npm run build:ssr + +# Preview production build +npm run serve:ssr:production +``` + +## Important Considerations + +### Browser-Only APIs +Some browser APIs are not available on the server. Use platform checks to conditionally execute code: + +```typescript +import { isPlatformBrowser } from '@angular/common'; +import { PLATFORM_ID, inject } from '@angular/core'; + +export class MyComponent { + private platformId = inject(PLATFORM_ID); + + ngOnInit() { + if (isPlatformBrowser(this.platformId)) { + // Code that uses browser-only APIs + console.log('Running in browser'); + localStorage.setItem('key', 'value'); + } + } +} +``` + +### Storage APIs +`localStorage` and `sessionStorage` are not accessible on the server. Consider using: +- Cookies for server-accessible data. +- The state transfer API for hydration. +- ABP's built-in storage abstractions. + +### Third-Party Libraries +Please ensure that any third-party libraries you use are compatible with SSR. These libraries can require: +- Dynamic imports for browser-only code. +- Platform-specific service providers. +- Custom Angular Universal integration. + +## ABP Framework Integration + +The SSR implementation is natively integrated with all of the ABP Framework features: + +- **Authentication & Authorization**: The OAuth/OpenID Connect flow functions seamlessly with ABP +- **Multi-tenancy**: Fully supports tenant resolution and switching +- **Localization**: Server-side rendering respects the locale +- **Permission Management**: Permission checks work on both server and client +- **Configuration**: The ABP configuration system is SSR-ready +## Performance Tips + +1. **Utilize State Transfer**: Send data from server to client to eliminate redundant HTTP requests +2. **Optimize Images**: Proper image loading strategies, such as lazy loading and responsive images. +3. **Cache API Responses**: At the server, implement proper caching strategies. +4. **Monitor Bundle Size**: Keep your server bundle optimized +5. **Use Prerendering**: The prerender target should be used for static content. + +## Conclusion + +Server-side rendering can be a very effective feature in improving your ABP Angular application's performance, SEO, and user experience. Our new SSR schematic will make it easier than ever to add SSR to your project. + +Try it today and let us know what you think! + +--- diff --git a/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/coverimage.png b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/coverimage.png new file mode 100644 index 0000000000..b4f2222acd Binary files /dev/null and b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/coverimage.png differ diff --git a/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/images/auth-flow.svg b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/images/auth-flow.svg new file mode 100644 index 0000000000..0ae07fec22 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/images/auth-flow.svg @@ -0,0 +1,70 @@ + + + + + API Key Authentication Flow + + + + + 1. Client Request + X-Api-Key: prefix_key + + + + + + + 2. Extract API Key + From Header/Query + + + + + + + 3. Lookup by Prefix + Cache → Database + + + + + + + 4. Verify Hash + SHA256 + Expiration + + + + + + + Valid? + + + + + Yes + + + 200 OK + ClaimsPrincipal + + + + + No + + + 401 Unauthorized + Invalid/Expired + + + + + ⚡ Cache-first strategy ensures ~95% requests skip database lookup + + + Typical response time: <5ms (cached) | <50ms (database lookup) + + diff --git a/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/post.md b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/post.md new file mode 100644 index 0000000000..87dc698b1d --- /dev/null +++ b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/post.md @@ -0,0 +1,354 @@ +# Building an API Key Management System with ABP Framework + +API keys are one of the most common authentication methods for APIs, especially for machine-to-machine communication. In this article, I'll explain what API key authentication is, when to use it, and how to implement a complete API key management system using ABP Framework. + +## What is API Key Authentication? + +An API key is a unique identifier used to authenticate requests to an API. Unlike user credentials (username/password) or OAuth tokens, API keys are designed for: + +- **Programmatic access** - Scripts, CLI tools, and automated processes +- **Service-to-service communication** - Microservices authenticating with each other +- **Third-party integrations** - External systems accessing your API +- **IoT devices** - Embedded systems with limited authentication capabilities +- **Mobile/Desktop apps** - Native applications that need persistent authentication + +## Why Use API Keys? + +While modern authentication methods like OAuth2 and JWT are excellent for user authentication, API keys offer distinct advantages in certain scenarios: + +**Simplicity**: No complex OAuth flows or token refresh mechanisms. Just include the key in your request header. + +**Long-lived**: Unlike JWT tokens that expire in minutes/hours, API keys can remain valid for months or years, making them ideal for automated systems. + +**Revocable**: You can instantly revoke a compromised key without affecting user credentials. + +**Granular Control**: Different keys for different purposes (read-only, admin, specific services). + +## Real-World Use Cases + +Here are some practical scenarios where API key authentication shines: + +### 1. Mobile Applications +Your mobile app needs to call your backend APIs. Instead of storing user credentials or managing token refresh flows, use an API key. + +```csharp +// Mobile app configuration +var apiClient = new ApiClient("https://api.yourapp.com"); +apiClient.SetApiKey("sk_mobile_prod_abc123..."); +``` + +### 2. Microservice Communication +Service A needs to call Service B's protected endpoints. + +```csharp +// Order Service calling Inventory Service +var request = new HttpRequestMessage(HttpMethod.Get, "https://inventory-service/api/products"); +request.Headers.Add("X-Api-Key", _configuration["InventoryService:ApiKey"]); +``` + +### 3. Third-Party Integrations +You're providing APIs to external partners or customers. + +```bash +# Customer's integration script +curl -H "X-Api-Key: pk_partner_xyz789..." \ + https://api.yourplatform.com/api/orders +``` + +## Implementing API Key Management in ABP Framework + +Now let's see how to build a complete API key management system using ABP Framework. I've created an open-source implementation that you can use in your projects. + +### Project Overview + +The implementation consists of: + +- **User-based API keys** - Each key belongs to a specific user +- **Permission delegation** - Keys inherit user permissions with optional restrictions +- **Secure storage** - Keys are hashed with SHA-256 +- **Prefix-based lookup** - Fast key resolution with caching +- **Web UI** - Manage keys through a user-friendly interface +- **Multi-tenancy support** - Full ABP multi-tenancy compatibility + +![API Keys Management UI](https://raw.githubusercontent.com/salihozkara/AbpApikeyManagement/refs/heads/master/docs/images/api-keys.png) + +### Architecture Overview + +The solution follows ABP's modular architecture with four main layers: + +``` +┌─────────────────────────────────────────────┐ +│ Web Layer (UI) │ +│ • Razor Pages for CRUD operations │ +│ • JavaScript for client interactions │ +└─────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────┐ +│ AspNetCore Layer (Middleware) │ +│ • Authentication Handler │ +│ • API Key Resolver (Header/Query) │ +└─────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────┐ +│ Application Layer (Business Logic) │ +│ • ApiKeyAppService (CRUD operations) │ +│ • DTO mappings and validations │ +└─────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────┐ +│ Domain Layer (Core Business) │ +│ • ApiKey Entity & Manager │ +│ • IApiKeyRepository │ +│ • Domain services & events │ +└─────────────────────────────────────────────┘ +``` + +### Key Components + +#### 1. Domain Layer - The Core Entity + +```csharp +public class ApiKey : FullAuditedAggregateRoot, IMultiTenant +{ + public virtual Guid? TenantId { get; protected set; } + public virtual Guid UserId { get; protected set; } + public virtual string Name { get; protected set; } + public virtual string Prefix { get; protected set; } + public virtual string KeyHash { get; protected set; } + public virtual DateTime? ExpiresAt { get; protected set; } + public virtual bool IsActive { get; protected set; } + + // Key format: {prefix}_{key} + // Only the hash is stored, never the actual key +} +``` + +**Key Design Decisions:** + +- **Prefix-based lookup**: Keys have format `prefix_actualkey`. The prefix is indexed for fast database lookups. +- **SHA-256 hashing**: The actual key is hashed and never stored in plain text. +- **User association**: Each key belongs to a user, inheriting their permissions. +- **Soft delete**: Deleted keys are marked as deleted but not removed from database for audit purposes. + +#### 2. Authentication Flow + +Here's how authentication works when a request arrives: + +![Authentication Flow](images/auth-flow.svg) + +```csharp +// 1. Extract API key from request +var apiKey = httpContext.Request.Headers["X-Api-Key"].FirstOrDefault(); +if (string.IsNullOrEmpty(apiKey)) return AuthenticateResult.NoResult(); + +// 2. Split prefix and key +var parts = apiKey.Split('_', 2); +var prefix = parts[0]; +var key = parts[1]; + +// 3. Find key by prefix (cached) +var apiKeyEntity = await _apiKeyRepository.FindByPrefixAsync(prefix); +if (apiKeyEntity == null) return AuthenticateResult.Fail("Invalid API key"); + +// 4. Verify hash +var keyHash = HashHelper.ComputeSha256(key); +if (apiKeyEntity.KeyHash != keyHash) + return AuthenticateResult.Fail("Invalid API key"); + +// 5. Check expiration and active status +if (apiKeyEntity.ExpiresAt < DateTime.UtcNow || !apiKeyEntity.IsActive) + return AuthenticateResult.Fail("API key expired or inactive"); + +// 6. Create claims principal with user identity +var claims = new List +{ + new Claim(AbpClaimTypes.UserId, apiKeyEntity.UserId.ToString()), + new Claim(AbpClaimTypes.TenantId, apiKeyEntity.TenantId?.ToString() ?? ""), + new Claim("ApiKeyId", apiKeyEntity.Id.ToString()) +}; + +return AuthenticateResult.Success(ticket); +``` + +#### 3. Creating and Managing API Keys + +**Creating a new key:** + +![Create API Key Modal](https://raw.githubusercontent.com/salihozkara/AbpApikeyManagement/refs/heads/master/docs/images/new-api-key.png) + +```csharp +public class ApiKeyManager : DomainService +{ + public async Task<(ApiKey, string)> CreateAsync( + Guid userId, + string name, + DateTime? expiresAt = null) + { + // Generate unique prefix + var prefix = await GenerateUniquePrefixAsync(); + + // Generate secure random key + var key = GenerateSecureRandomString(32); + + // Hash the key for storage + var keyHash = HashHelper.ComputeSha256(key); + + var apiKey = new ApiKey( + GuidGenerator.Create(), + userId, + name, + prefix, + keyHash, + expiresAt, + CurrentTenant.Id + ); + + await _apiKeyRepository.InsertAsync(apiKey); + + // Return both entity and the full key (prefix_key) + // This is the ONLY time the actual key is visible + return (apiKey, $"{prefix}_{key}"); + } +} +``` + +**Important**: The actual key is returned only once during creation. After that, only the hash is stored. + +![Created Key - Copy Once](https://raw.githubusercontent.com/salihozkara/AbpApikeyManagement/refs/heads/master/docs/images/created.png) + +### Using API Keys in Your Application + +Once created, clients can use the API key to authenticate: + +**HTTP Header (Recommended):** +```bash +curl -H "X-Api-Key: sk_prod_abc123def456..." \ + https://api.example.com/api/products +``` + +**JavaScript:** +```javascript +const response = await fetch('https://api.example.com/api/products', { + headers: { + 'X-Api-Key': 'sk_prod_abc123def456...' + } +}); +``` + +**C# HttpClient:** +```csharp +var client = new HttpClient(); +client.DefaultRequestHeaders.Add("X-Api-Key", "sk_prod_abc123def456..."); +var response = await client.GetAsync("https://api.example.com/api/products"); +``` + +**Python:** +```python +import requests + +headers = {'X-Api-Key': 'sk_prod_abc123def456...'} +response = requests.get('https://api.example.com/api/products', headers=headers) +``` + +### Permission Management + +API keys inherit the user's permissions, but you can further restrict them: + +![Permission Management](https://raw.githubusercontent.com/salihozkara/AbpApikeyManagement/refs/heads/master/docs/images/permissions.png) + +This allows scenarios like: +- Read-only API key for reporting tools +- Limited scope keys for third-party integrations +- Service-specific keys with minimal permissions + +```csharp +// Check if current request is authenticated via API key +if (CurrentUser.FindClaim("ApiKeyId") != null) +{ + var apiKeyId = CurrentUser.FindClaim("ApiKeyId").Value; + // Additional API key specific logic +} +``` + +## Performance Considerations + +The implementation uses several optimizations: + +**1. Prefix-based indexing**: Database lookups are done by prefix (indexed column), not the full key hash. + +**2. Distributed caching**: API keys are cached after first lookup, dramatically reducing database queries. + +```csharp +// Cache configuration +Configure(options => +{ + options.KeyPrefix = "ApiKey:"; +}); +``` + +**3. Cache invalidation**: When a key is modified or deleted, cache is automatically invalidated. + +**Typical Performance:** +- Cached lookup: **< 5ms** +- Database lookup: **< 50ms** +- Cache hit rate: **~95%** + +## Security Best Practices + +When implementing API key authentication, follow these guidelines: + +✅ **Always use HTTPS** - Never send API keys over unencrypted connections + +✅ **Use different keys per environment** - Separate keys for dev, staging, production + +❌ **Don't log the full key** - Only log the prefix for debugging + +## Getting Started + +The complete source code is available on GitHub: + +**Repository**: [github.com/salihozkara/AbpApikeyManagement](https://github.com/salihozkara/AbpApikeyManagement) + +To integrate it into your ABP project: + +1. Clone or download the repository +2. Add project references to your solution +3. Add module dependencies to your modules +4. Run EF Core migrations to create the database tables +5. Navigate to `/ApiKeyManagement` to start managing keys + +```csharp +// In your Web module +[DependsOn(typeof(ApiKeyManagementWebModule))] +public class YourWebModule : AbpModule +{ + // ... +} + +// In your HttpApi.Host module +[DependsOn(typeof(ApiKeyManagementHttpApiModule))] +public class YourHttpApiHostModule : AbpModule +{ + // ... +} +``` + +## Conclusion + +API key authentication remains a crucial part of modern API security, especially for machine-to-machine communication. While it shouldn't replace user authentication methods like OAuth2 for user-facing applications, it's perfect for: + +- Automated scripts and tools +- Service-to-service communication +- Third-party integrations +- Long-lived access without token refresh complexity + +The implementation shown here demonstrates how ABP Framework's modular architecture, DDD principles, and built-in features (multi-tenancy, caching, permissions) can be leveraged to build a production-ready API key management system. + +The solution is open-source and ready to be integrated into your ABP projects. Feel free to explore the code, suggest improvements, or adapt it to your specific needs. + +**Resources:** +- GitHub Repository: [salihozkara/AbpApikeyManagement](https://github.com/salihozkara/AbpApikeyManagement) +- ABP Framework: [abp.io](https://abp.io) +- ABP Documentation: [docs.abp.io](https://abp.io/docs/latest) + +Happy coding! 🚀 diff --git a/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/summary.md b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/summary.md new file mode 100644 index 0000000000..4e5abcd224 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-15-building-an-api-key-management-system/summary.md @@ -0,0 +1 @@ +Learn how to implement API key authentication in ABP Framework applications. This comprehensive guide covers what API keys are, when to use them over OAuth2/JWT, real-world use cases for mobile apps and microservices, and a complete implementation with user-based key management, SHA-256 hashing, permission delegation, and built-in UI. diff --git a/docs/en/Community-Articles/2025-11-17-Angular-21-Signals/cover-image.png b/docs/en/Community-Articles/2025-11-17-Angular-21-Signals/cover-image.png new file mode 100644 index 0000000000..a37bb3d775 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-17-Angular-21-Signals/cover-image.png differ diff --git a/docs/en/Community-Articles/2025-11-17-Angular-21-Signals/post.md b/docs/en/Community-Articles/2025-11-17-Angular-21-Signals/post.md new file mode 100644 index 0000000000..60fcc6405b --- /dev/null +++ b/docs/en/Community-Articles/2025-11-17-Angular-21-Signals/post.md @@ -0,0 +1,322 @@ +# Signal-Based Forms in Angular 21: Why You’ll Never Miss Reactive Forms Again + +Angular 21 introduces one of the most exciting developments in the modern edition of Angular: **Signal-Based Forms**. Built directly on the reactive foundation of Angular signals, this new experimental API provides a cleaner, more intuitive, strongly typed, and ergonomic approach for managing form state—without the heavy boilerplate of Reactive Forms. + +> ⚠️ **Important:** Signal Forms are *experimental*. +> Their API can change. Avoid using them in critical production scenarios unless you understand the risks. + +Despite this, Signal Forms clearly represent Angular’s future direction. +--- + +## Why Signal Forms? + +Traditionally in Angular, building forms has involved several concerns: + +- Tracking values +- Managing UI interaction states (touched, dirty) +- Handling validation +- Keeping UI and model in sync + +Reactive Forms solved many challenges but introduced their own: + +- Verbosity FormBuilder API +- Required subscriptions (valueChanges) +- Manual cleaning +- Difficult nested forms +- Weak type-safety + +**Signal Forms solve these problems through:** + +1." Automatic synchronization +2." Full type safety +3." Schema-based validation +4." Fine-grained reactivity +5." Drastically reduced boilerplate +6." Natural integration with Angular Signals + +--- + +### 1. Form Models — The Core of Signal Forms + +A **form model** is simply a writable signal holding the structure of your form data. + +```ts +import { Component, signal } from '@angular/core'; +import { form, Field } from '@angular/forms/signals'; + +@Component({ + selector: 'app-login', + imports: [Field], + template: ` + + + `, +}) +export class LoginComponent { + loginModel = signal({ + email: '', + password: '', + }); + + loginForm = form(this.loginModel); +} +``` + +Calling `form(model)` creates a **Field Tree** that maps directly to your model. + +--- + +### 2. Achieving Full Type Safety + +Although TypeScript can infer types from object literals, defining explicit interfaces provides maximum safety and better IDE support. + +```ts +interface LoginData { + email: string; + password: string; +} + +loginModel = signal({ + email: '', + password: '', +}); + +loginForm = form(loginModel); +``` + +Now: + +- `loginForm.email` → `FieldTree` +- Accessing invalid fields like `loginForm.username` results in compile-time errors + +This level of type safety surpasses Reactive Forms. + +--- + +### 3. Reading Form Values + +#### Read from the model (entire form): + +```ts +onSubmit() { + const data = this.loginModel(); + console.log(data.email, data.password); +} +``` + +#### Read from an individual field: + +```html +

Current email: {{ loginForm.email().value() }}

+``` + +Each field exposes: + +- `value()` +- `valid()` +- `errors()` +- `dirty()` +- `touched()` + +All as signals. + +--- + +### 4. Updating Form Models Programmatically + +Signal Forms allow three update methods. + +#### 1. Replace the entire model + +```ts +this.userModel.set({ + name: 'Alice', + email: 'alice@example.com', +}); +``` + +#### 2. Patch specific fields + +```ts +this.userModel.update(prev => ({ + ...prev, + email: newEmail, +})); +``` + +#### 3. Update a single field + +```ts +this.userForm.email().value.set(''); +``` + +This eliminates the need for: + +- `patchValue()` +- `setValue()` +- `formGroup.get('field')` + +--- + +### 5. Automatic Two-Way Binding With `[field]` + +The `[field]` directive enables perfect two-way data binding: + +```html + +``` + +#### How it works: + +- **User input → Field state → Model** +- **Model updates → Field state → Input UI** + +No subscriptions. +No event handlers. +No boilerplate. + +Reactive Forms could never achieve this cleanly. + +--- + +### 6. Nested Models and Arrays + +Models can contain nested object structures: + +```ts +userModel = signal({ + name: '', + address: { + street: '', + city: '', + }, +}); +``` + +Access fields easily: + +```html + +``` + +Arrays are also supported: + +```ts +orderModel = signal({ + items: [ + { product: '', quantity: 1, price: 0 } + ] +}); +``` + +Field state persists even when array items move, thanks to identity tracking. + +--- + +### 7. Schema-Based Validation + +Validation is clean and centralized: + +```ts +import { required, email } from '@angular/forms/signals'; + +const model = signal({ email: '' }); + +const formRef = form(model, { + email: [required(), email()], +}); +``` + +Field validation state is reactive: + +```ts +formRef.email().valid() +formRef.email().errors() +formRef.email().touched() +``` + +Validation no longer scatters across components. + +--- + +### 8. When Should You Use Signal Forms? + +#### New Angular 21+ apps +Signal-first architecture is the new standard. + +#### Teams wanting stronger type safety +Every field is exactly typed. + +#### Devs tired of Reactive Form boilerplate +Signal Forms drastically simplify code. + +#### Complex UI with computed reactive form state +Signals integrate perfectly. + +#### ❌ Avoid if: +- You need long-term stability +- You rely on mature Reactive Forms features +- Your app must avoid experimental APIs + +--- + +### 9. Reactive Forms vs Signal Forms + +| Feature | Reactive Forms | Signal Forms | +|--------|----------------|--------------| +| Boilerplate | High | Very low | +| Type-safety | Weak | Strong | +| Two-way binding | Manual | Automatic | +| Validation | Scattered | Centralized schema | +| Nested forms | Verbose | Natural | +| Subscriptions | Required | None | +| Change detection | Zone-heavy | Fine-grained | + +Signal Forms feel like the "modern Angular mode," while Reactive Forms increasingly feel legacy. + +--- + +### 10. Full Example: Login Form + +```ts +@Component({ + selector: 'app-login', + imports: [Field], + template: ` +
+ + + +
+ `, +}) +export class LoginComponent { + model = signal({ email: '', password: '' }); + form = form(this.model); + + submit() { + console.log(this.model()); + } +} +``` + +Minimal. Reactive. Completely type-safe. + +--- + +## **Conclusion** + +Signal Forms in Angular 21 represent a big step forward: + +- Cleaner API +- Stronger type safety +- Automatic two-way binding +- Centralized validation +- Fine-grained reactivity +- Dramatically better developer experience + + +Although these are experimental, they clearly show the future of Angular's form ecosystem. +Once you get into using Signal Forms, you may never want to use Reactive Forms again. + +--- diff --git a/docs/en/Community-Articles/2025-11-19-ABP-BLACK-FRIDAY-BLOG/post.md b/docs/en/Community-Articles/2025-11-19-ABP-BLACK-FRIDAY-BLOG/post.md new file mode 100644 index 0000000000..153470666f --- /dev/null +++ b/docs/en/Community-Articles/2025-11-19-ABP-BLACK-FRIDAY-BLOG/post.md @@ -0,0 +1,25 @@ +**ABP Black Friday Deals are Almost Here\!** + +The season of huge savings is back\! We are happy to announce **ABP Black Friday Campaign**, packed with exclusive deals that you simply won't want to miss. Whether you are ready to start building with ABP or looking to expand your existing license, this is your chance to maximize your savings\! + +**Campaign Dates: Mark Your Calendar** + +Black Friday campaign is live for one week only\! Our deals run from: **November 24th \- December 1st.** + +Don't miss this limited-time opportunity to **save up to $3,000** and take your software development to the next level. + +**What's Included in the ABP Black Friday Campaign?** + +Here’s why this campaign is the best time to buy or upgrade: + +* Open to Everyone: This campaign is available for both new and existing customers. +* Stack Your Savings: You can combine this Black Friday offer with our multi-year discounts for the greatest possible value. +* Flexible Upgrades: Planning to upgrade to a higher package? Now is the perfect time to make that move at a lower cost. +* More Developer Seats? No Problem\! Additional developer seats are also eligible under this campaign, allowing you to grow your team effortlessly and affordably. + +**Save Money Now\!** + +This campaign is your best opportunity all year to unlock advanced features, scale your team, or upgrade your plan while **saving up to $3,000.** Secure your savings before the campaign ends on December 1st\! + +[**Visit Pricing Page to Explore Offers\!**](https://abp.io/pricing) + diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/Post.md b/docs/en/Community-Articles/2025-11-21-AntiGravity/Post.md new file mode 100644 index 0000000000..d5e34e7892 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-21-AntiGravity/Post.md @@ -0,0 +1,158 @@ +# My First Look and Experience with Google AntiGravity + +## Is Google AntiGravity Going to Replace Your Main Code Editor? + +Today, I tried the new code-editor AntiGravity by Google. *"It's beyond a code-editor*" by Google 🙄 +When I first launch it, I see the UI is almost same as Cursor. They're both based on Visual Studio Code. +That's why it was not hard to find what I'm looking for. + +First of all, the main difference as I see from the Cursor is; when I type a prompt in the agent section **AntiGravity first creates a Task List** (like a road-map) and whenever it finishes a task, it checks the corresponding task. Actually Cursor has a similar functionality but AntiGravity took it one step further. + +Second thing which was good to me; AntiGravity uses [Nano Banana 🍌](https://gemini.google/tr/overview/image-generation/). This is Google's AI image generation model... Why it's important because when you create an app, you don't need to search for graphics, deal with image licenses. **AntiGravity generates images automatically and no license is required!** + +Third exciting feature for me; **AntiGravity is integrated with Google Chrome and can communicate with the running website**. When I first run my web project, it installed a browser extension which can see and interact with my website. It can see the results, click somewhere else on the page, scroll, fill up the forms, amazing 😵 + +Another feature I loved is that **you can enter a new prompt even while AntiGravity is still generating a response** 🧐. It instantly prioritizes the latest input and adjusts the ongoing process if needed. But in Cursor, if you add a prompt before the cursor finishes, it simply queues it and runs it later 😔. + +And lastly, **AntiGravity is working very good with Gemini 3**. + +Well, everything was not so perfect 😥 When I tried AntiGravity, couple of times it stucked AI generation and Agent stopped. I faced errors like this 👇 + +![Errors](errors.png) + + + +## Debugging .NET Projects via AntiGravity + +⚠ There's a crucial development issue with AntiGravity (and also for Cursor, Windsurf etc...) 🤕 you **cannot debug your .NET application with AntiGravity 🥺.** *This is Microsoft's policy!* Microsoft doesn't allow debugging for 3rd party IDEs and shows the below error... That's why I cannot say it's a downside of AntiGravity. You need to use Microsft's original VS Code, Visual Studio or Rider for debugging. But wait a while there's a workaround for this, I'll let you know in the next section. + + + +![Debugging](debug.png) + +### What does this error mean? + +AntiGravity, Cursor, Windsurf etc... are using Visual Studio Code and the C# extension for VS Code includes the Microsoft .NET Core Debugger "*vsdbg*". +VS Code is open-source but "*vsdbg*" is not open-source! It's working only with Visual Studio Code, Visual Studio and Visual Studio for Mac. This is clearly stated at [Microsoft's this link](https://github.com/dotnet/vscode-csharp/blob/main/docs/debugger/Microsoft-.NET-Core-Debugger-licensing-and-Microsoft-Visual-Studio-Code.md). + +### Ok! How to resolve debugging issue with AntiGravity? and Cursor and Windsurf... + +There's a free C# debugger extension for Visual Studio Code based IDEs that supports AntiGravity, Cursor and Windsurf. The extension name is **C#**. +You can download this free C# debugger extension at 👉 [open-vsx.org/extension/muhammad-sammy/csharp/](https://open-vsx.org/extension/muhammad-sammy/csharp/). +For AntiGravity open Extension window (*Ctrl + Shift + X*) and search for `C#`, there you'll see this extension. + +![C# Debugging Extension](csharp-debug-extension.png) + +After installing, I restarted AntiGravity and now I can see the red circle which allows me to add breakpoint on C# code. + +![Add C# Breakpoint](breakpoint.png) + +### Another Extension For Debugging .NET Apps on VS Code + +Recently I heard about DotRush extension from the folks. As they say DotRush works slightly faster and support Razor pages (.cshtml files). +Here's the link for DotRush https://github.com/JaneySprings/DotRush + +### Finding Website Running Port + +When you run the web project via C# debugger extension, normally it's not using the `launch.json` therefore the website port is not the one when you start from Visual Studio / Rider... So what's my website's port which I just run now? Normally for ASP.NET Core **the default port is 5000**. You can try navigating to http://localhost:5000/. +Alternatively you can write the below code in `Program.cs` which prints the full address of your website in the logs. +If you do the steps which I showed you, you can debug your C# application via AntiGravity and other VS Code derivatives. + +![Find Website Port](find-website-port.png) + +## How Much is AntiGravity? 💲 + +Currently there's only individual plan is available for personal accounts and that's free 👏! The contents of Team and Enterprise plans and prices are not announced yet. But **Gemini 3 is not free**! I used it with my company's Google Workspace account which we normally pay for Gemini. + +![Pricing](pricing.png) + +## More About AntiGravity + +There have been many AI assisted IDEs like [Windsurf](https://windsurf.com/), [Cursor](https://cursor.com/), [Zed](https://zed.dev/), [Replit](https://replit.com/) and [Fleet](https://www.jetbrains.com/fleet/). But this time it's different, this is backed by Google. +As you see from the below image AntiGravity, uses a standard grid layout as others based on VS Code editor. +It's very similar to Cursor, Visual Studio, Rider. + +![AntiGravity UI](anti-gravity-ui.png) + +## Supported LLMs 🧠 + +Antigravity offers the below models which supports reasoning: Gemini 3 Pro, Claude Sonnet 4.5, GPT-OSS + +![LLMs](llms.png) + +Antigravity uses other models for supportive tasks in the background: + +- **Nano banana**: This is used to generate images. +- **Gemini 2.5 Pro UI Checkpoint**: It's for the browser subagent to trigger browser action such as clicking, scrolling, or filling in input. +- **Gemini 2.5 Flash**: For checkpointing and context summarization, this is used. +- **Gemini 2.5 Flash Lite**: And when it's need to make a semantic search in your code-base, this is used. + +## AntiGravity Can See Your Website + +This makes a big difference from traditional IDEs. AntiGravity's browser agent is taking screenshots of your pages when it needs to check. This is achieved by a Chrome Extension as a tool to the agent, and you can also prompt the agent to take a screenshot of a page. It can iterate on website designs and implementations, it can perform UI Testing, it can monitor dashboards, it can automate routine tasks like rerunning CI. +This is the link for the extension 👉 [chromewebstore.google.com/detail/antigravity-browser-exten/eeijfnjmjelapkebgockoeaadonbchdd](https://chromewebstore.google.com/detail/antigravity-browser-exten/eeijfnjmjelapkebgockoeaadonbchdd). AntiGravity will install this extension automatically on the first run. + +![Browser Extension](extension.png) + +![Extension Features](extension-features.png) + +## MCP Integration + +### When Do We Need MCP in a Code Editor? + +Simply if we want to connect to a 3rd party service to complete our task we need MCP. So AntiGravity can connect to your DB and write proper SQL queries or it can pull in recent build logs from Netlify or Heroku. Also you can ask AntiGravity to to connect GitHub for finding the best authentication pattern. + +### AntiGravity Supports These MCP Servers + +Airweave, AlloyDB for PostgreSQL, Atlassian, BigQuery, Cloud SQL for PostgreSQL, Cloud SQL for MySQL, Cloud SQL for SQL Server, Dart, Dataplex, Figma Dev Mode MCP, Firebase, GitHub, Harness, Heroku, Linear, Locofy, Looker, MCP Toolbox for Databases, MongoDB, Neon, Netlify, Notion, PayPal, Perplexity Ask, Pinecone, Prisma, Redis, Sequential Thinking, SonarQube, Spanner, Stripe and Supabase. + +![MCP](mcp.png) + +## Agent Settings ⚙️ + +The major settings of Agent are: + +- **Agent Auto Fix Lints**: I enabled this setting because I want the Agent automatically fixes its own mistakes for invalid syntax, bad formatting, unused variables, unreachable code or following coding standards... It makes extra tool calls that's why little bit expensive 🥴. +- **Auto Execution**: Sometimes Agent tries to build application or writing test code and running it, in these cases it executes command. I choose "Turbo" 🤜 With this option, Agent always runs the terminal command and controls my browser. +- **Review Policy**: How much control you are giving to agent 🙎. I choose "Always Proceed" 👌 because I mostly trust AI 😀. The Agent will never ask for review. + +![Agent Settings](agent-settings.png) + +## Differences Between Cursor and AntiGravity + +While Cursor was the champion of AI code editors, **Antigravity brings a different philosophy**. + +### 1. "Agent-First 🤖" vs "You-First 🤠" + +- **Cursor:** It acts like an assistant; it predicts your next move, auto-completes your thoughts, and helps you refactor while you type. You are still the driver; Cursor just drives the car at 200 km/h. +- **Antigravity:** Antigravity is built to let you manage coding tasks. It is "Agent-First." You don't just type code; you assign tasks to autonomous agents (e.g., "Fix the bug in the login flow and verify it in the browser"). It behaves more like a junior developer that you supervise. + +### 2. The Interface + +- **Cursor:** Looks and feels exactly like **VS Code**. If you know VS Code, you know Cursor. + +- **Antigravity:** Introduces 2 major layouts: + - **Editor View:** Similar to a standard IDE + - **Manager View:** A dashboard where you see multiple "Agents" working in parallel. You can watch them plan, execute, and test tasks asynchronously. + +### 3. Verification & Trust + +- **Cursor:** You verify by reading the code diffs it suggests. +- **Antigravity:** Introduces **Artifacts**... Since the agents work autonomously, they generate proof-of-work documents, screenshots of the app running, browser logs and execution plans. So you can verify what they did without necessarily reading every line of code immediately. + +### 4. Capabilities + +- **Cursor:** Best-in-class **Autocomplete** ("Tab" feature) and **Composer** (multi-file editing). It excels at "Vibe Coding". It's getting into a flow state where the AI writes the boilerplate and you direct the logic. +- **Antigravity:** Is good at **Autonomous Execution**. It has a built-in browser and terminal that the *Agent* controls. The Agent can write code, run the server, open the browser, see the error, and fix it 😎 + +### 5. AI Models (Brains 🧠) + +- **Cursor:** Model Agnostic. You can switch between **Claude 3.5 Sonnet** *-mostly the community uses this-*, GPT-4o, and others. +- **Antigravity:** Built deeply around **Gemini 3 Pro**. It leverages Gemini's massive context window (1M+ tokens) to understand huge mono repos without needing as much "RAG" as Cursor. + + + +## Try It Yourself Now 🤝 + +If you are ready to experience the new AI code editor by Google, download and use 👇 +[**Launch Google AntiGravity**](https://antigravity.google/) \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/agent-settings.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/agent-settings.png new file mode 100644 index 0000000000..a659c244c5 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/agent-settings.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/anti-gravity-ui.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/anti-gravity-ui.png new file mode 100644 index 0000000000..885284dd56 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/anti-gravity-ui.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/breakpoint.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/breakpoint.png new file mode 100644 index 0000000000..0ef01d71a3 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/breakpoint.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/cover.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/cover.png new file mode 100644 index 0000000000..b2ec245a2f Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/cover.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/csharp-debug-extension.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/csharp-debug-extension.png new file mode 100644 index 0000000000..6807c3f6bc Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/csharp-debug-extension.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/debug.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/debug.png new file mode 100644 index 0000000000..c4674a89f3 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/debug.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/errors.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/errors.png new file mode 100644 index 0000000000..f8c2e43dac Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/errors.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/extension-features.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/extension-features.png new file mode 100644 index 0000000000..cd0b07cabf Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/extension-features.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/extension.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/extension.png new file mode 100644 index 0000000000..601a28849a Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/extension.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/find-website-port.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/find-website-port.png new file mode 100644 index 0000000000..183e8c6f5b Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/find-website-port.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/image-20251123185724281.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/image-20251123185724281.png new file mode 100644 index 0000000000..82b8f478e1 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/image-20251123185724281.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/llms.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/llms.png new file mode 100644 index 0000000000..82b8f478e1 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/llms.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/mcp.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/mcp.png new file mode 100644 index 0000000000..06a343f068 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/mcp.png differ diff --git a/docs/en/Community-Articles/2025-11-21-AntiGravity/pricing.png b/docs/en/Community-Articles/2025-11-21-AntiGravity/pricing.png new file mode 100644 index 0000000000..0b552352e3 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-21-AntiGravity/pricing.png differ diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/coverimage.png b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/coverimage.png new file mode 100644 index 0000000000..b264e259e9 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/coverimage.png differ diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/chat-history-hybrid.svg b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/chat-history-hybrid.svg new file mode 100644 index 0000000000..ab1bb36114 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/chat-history-hybrid.svg @@ -0,0 +1,114 @@ + + + + + + + Hybrid Chat History: Truncation + RAG on History + + + + + + Full Chat History + + + (100 messages, 20K tokens) + + + + + Messages 1-10 (1 day ago) + + + Messages 11-20 (12 hours ago) + + ... + + + Messages 81-90 + + + Messages 91-100 (Last 10) + + + + + + + + + + + + Old Messages + Recent Messages + + + + + Vector DB + + + (Long-term Memory) + + + Messages 1-90 with embeddings + + + Tool: SearchChatHistory() + + + + + + Prompt (Short-term) + + + Messages 91-100 + + + Truncation (Last 10 messages) + + + Low tokens, fast + + + + + + + + + LLM + + + Short-term context + + + + Long-term memory via tool + + + access when needed + + + + + + ✅ Hybrid Approach Benefits + + + + + + Low Cost: Only last 10 messages in prompt per request (truncation) + + + + + + + High Fidelity: LLM can access old messages via SearchChatHistory tool when needed + + + \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/mcp-architecture.svg b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/mcp-architecture.svg new file mode 100644 index 0000000000..ee590d27eb --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/mcp-architecture.svg @@ -0,0 +1,150 @@ + + + + + + + Model Context Protocol (MCP): Out-of-Process Tools + + + + + MCP Hosts (Clients) + + + + + + Semantic Kernel + + + (.NET Agent) + + + + + + + VS Code Copilot + + + (.vscode/mcp.json) + + + + + + + Claude Desktop + + + (Anthropic) + + + + + + + + + + + + + + + + stdio/http + + + JSON-RPC + + + + + + MCP Protocol + + + (Standardized Interface) + + + ModelContextProtocol SDK + + + + + + + + + + MCP Servers (Tools) + + + + + + filesystem.mcp.exe + + + ReadFile(), ListFiles() + + + (.NET Console App) + + + + + + + sqlserver.mcp.exe + + + ExecuteQuery(), GetSchema() + + + (.NET Console App) + + + + + + + github.mcp.js + + + CreateIssue(), GetPR() + + + (Node.js / TypeScript) + + + + + + + ✅ MCP Benefits + + + + + + Reusability: Write once, use everywhere (SK, VS Code, Claude) + + + + + + + Independence: MCP server runs separately, doesn't affect main app (out-of-process) + + + + + + + Language Agnostic: Can be written in C#, Python, Node.js, everyone speaks same protocol + + + \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/multilingual-rag.svg b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/multilingual-rag.svg new file mode 100644 index 0000000000..81173091f0 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/multilingual-rag.svg @@ -0,0 +1,135 @@ + + + + + + + Multilingual RAG: Query Translation Pattern + + + + + + User Query + + + 🇹🇷 "Yazıcıyı ağa + + + nasıl bağlarım?" + + + + + + + + + + + + Tool 1 + + + + + + TranslationPlugin + + + TranslateText() + + + Target: English + + + + + + Tool 2 + + + + + RAGPlugin + + + 🇬🇧 "How do I connect + + + the printer to network?" + + + + + + Vector Search + + + + + Vector DB + + + (English Docs) + + + "Navigate to Settings + + + > Network > Wi-Fi..." + + + + + + + + Retrieved Context + + + 🇬🇧 English text + + + (Manual excerpt) + + + + + + + + + LLM (GPT-5) + + + Context: [English] + + + Generates: [Turkish Response] + + + + + + + + + Response to User + + + 🇹🇷 "Ayarlar > Ağ > + + + Wi-Fi bölümüne gidin..." + + + + + + ✅ Benefit: Single language (English) docs, multi-language query support + + + Tool Chain: TranslationPlugin → RAGPlugin → LLM Final Generation (Original language) + + \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/pgvector-integration.svg b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/pgvector-integration.svg new file mode 100644 index 0000000000..2903740e57 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/pgvector-integration.svg @@ -0,0 +1,112 @@ + + + + + + + PostgreSQL + pgvector: Integrated RAG with EF Core + + + + + + .NET Application + + + (EF Core DbContext) + + + + + + + + + + + + LINQ Query + + + + + + Pgvector.EntityFrameworkCore + + + CosineDistance(), L2Distance() + + + EF Core Extensions + + + + + + SQL Query + + + + + + PostgreSQL + pgvector + + + + + + + + id + content + embedding + + + + + 1 + Contoso... + [0.2, -0.1,...] + + 2 + Revenue... + [0.5, 0.3,...] + + + + + + ✅ Benefits + + + + + + Existing SQL Knowledge: PostgreSQL is already a familiar database + + + + + + + EF Core Integration: Vector queries with LINQ (.OrderBy(), .Where()) + + + + + + + Metadata JOIN: Vector + Relational data in same query (tenant_id, user_id...) + + + + + + + ACID Compliant: Transaction support (rollback, commit) + + + + + + \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/rag-parent-child.svg b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/rag-parent-child.svg new file mode 100644 index 0000000000..752c2c42b1 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/rag-parent-child.svg @@ -0,0 +1,118 @@ + + + + + + + Parent-Child RAG Pattern: Search Small, Respond Large + + + + + Original Document + + + + Parent 1 (800 token) + + + Parent 2 (800 token) + + + Parent 3... + + + + + + + + + + + + + + + + + + + Child Chunks + (In Vector DB) + + + + + Child 1.1 (100 token) [ParentID=1] + + + + + Child 1.2 (100 token) [ParentID=1] + + + + + Child 1.3 (100 token) [ParentID=1] + + + + + Child 2.1 (100 token) [ParentID=2] + + + + + Child 2.2... + + + + + User Query + "What was Contoso's + 2024 revenue?" + + + + 1. Vector Search + (On Child chunks) + + + + Best Match + Child 1.2 (Score: 0.95) + + + + + + 2. Fetch Parent via + ParentID + + + + Retrieved Parent Chunk + Parent 1 (800 tokens) + Full context + details + + + + 3. Send to LLM + + + + LLM Response + "Contoso's 2024 + revenue was $2.5 billion + as reported." + + + + + ✅ Benefit: Precise search (Child) + Rich context (Parent) = Optimal quality + + + Alternative: Only large chunks → Lower precision | Only small chunks → Insufficient context + + \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/reasoning-effort-diagram.svg b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/reasoning-effort-diagram.svg new file mode 100644 index 0000000000..fc6a18d68d --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/reasoning-effort-diagram.svg @@ -0,0 +1,60 @@ + + + + + + + ReasoningEffortLevel: Cost vs Quality + + + + + + + + High + Medium + Low + + + + Quality / Cost + + + + + + Minimal + Fast + Cheap + + + + + Low + Simple Queries + + + + + Medium + Standard + + + + + High + Complex + Coding + + + + + + + + + + + Increasing Cost (Reasoning Tokens ↑) + + \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/svg-diagram-example.svg b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/svg-diagram-example.svg new file mode 100644 index 0000000000..6087893702 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/images/svg-diagram-example.svg @@ -0,0 +1,149 @@ + + + + + + + PostgreSQL + pgvector Architecture + + + + + + + .NET Application + + + + + + Web API / + + + Controllers + + + + + + Business Logic / + + + Services + + + + + + Data Access + + + Layer + + + + + + + + + + + + ORM + + + + + + Entity Framework + + + Core + + + DbContext + + + LINQ Queries + + + + + + Npgsql + + + + + + PostgreSQL + + + + + + Relational Tables + + + (Standard Data) + + + + + + pgvector + + + Vector Storage + + + + + + Vector Search + + + Similarity Queries + + + (<=>, <->, <#>) + + + + + + + + + + + Search Results + + + • Embeddings + + + • Similarity Score + + + • Ranked Results + + + + + + + + + + Data Flow: + + + 1. .NET → EF Core → PostgreSQL (Data Operations) + + + 2. Vector Similarity Search with pgvector + + + \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/post.md b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/post.md new file mode 100644 index 0000000000..8fa2067d01 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/post.md @@ -0,0 +1,414 @@ +# Building Production-Ready LLM Applications with .NET: A Practical Guide + +Large Language Models (LLMs) have evolved rapidly, and integrating them into production .NET applications requires staying current with the latest approaches. In this article, I'll share practical tips and patterns I've learned while building LLM-powered systems, covering everything from API changes in GPT-5 to implementing efficient RAG (Retrieval Augmented Generation) architectures. + +Whether you're building a chatbot, a knowledge base assistant, or integrating AI into your enterprise applications, these production-tested insights will help you avoid common pitfalls and build more reliable systems. + +## The Temperature Paradigm Shift: GPT-5 Changes Everything + +If you've been working with GPT-4 or earlier models, you're familiar with the `temperature` and `top_p` parameters for controlling response randomness. **Here's the critical update**: GPT-5 no longer supports these parameters! + +### The Old Way (GPT-4) +```csharp +var chatRequest = new ChatOptions +{ + Temperature = 0.7, // ✅ Worked with GPT-4 + TopP = 0.9 // ✅ Worked with GPT-4 +}; +``` + +### The New Way (GPT-5) +```csharp +var chatRequest = new ChatOptions +{ + RawRepresentationFactory = (client => new ChatCompletionOptions() + { +#pragma warning disable OPENAI001 + ReasoningEffortLevel = "minimal", +#pragma warning restore OPENAI001 + }) +}; +``` + +**Why the change?** GPT-5 incorporates an internal reasoning and verification process. Instead of controlling randomness, you now specify how much computational effort the model should invest in reasoning through the problem. + +![Reasoning Effort Levels](images/reasoning-effort-diagram.svg) + +### Choosing the Right Reasoning Level + +- **Low**: Quick responses for simple queries (e.g., "What's the capital of France?") +- **Medium**: Balanced approach for most use cases +- **High**: Complex reasoning tasks (e.g., code generation, multi-step problem solving) + +> **Pro Tip**: Reasoning tokens are included in your API costs. Use "High" only when necessary to optimize your budget. + +## System Prompts: The "Lost in the Middle" Problem + +Here's a critical insight that can save you hours of debugging: **Important rules must be repeated at the END of your prompt!** + +### ❌ What Doesn't Work +``` +You are a helpful assistant. +RULE: Never share passwords or sensitive information. + +[User Input] +``` + +### ✅ What Actually Works +``` +You are a helpful assistant. +RULE: Never share passwords or sensitive information. + +[User Input] + +⚠️ REMINDER: Apply the rules above strictly, ESPECIALLY regarding passwords. +``` + +**Why?** LLMs suffer from the "Lost in the Middle" phenomenon—they pay more attention to the beginning and end of the context window. Critical instructions buried in the middle are often ignored. + +## RAG Architecture: The Parent-Child Pattern + +Retrieval Augmented Generation (RAG) is essential for grounding LLM responses in your own data. The most effective pattern I've found is the **Parent-Child approach**. + +![RAG Parent-Child Architecture](images/rag-parent-child.svg) + +### How It Works + +1. **Split documents into hierarchies**: + - **Parent chunks**: Large sections (1000-2000 tokens) for context + - **Child chunks**: Small segments (200-500 tokens) for precise retrieval + +2. **Store both in vector database** with references + +3. **Query flow**: + - Search using child chunks (higher precision) + - Return parent chunks to LLM (richer context) + +### The Overlap Strategy + +Always use overlapping chunks to prevent information loss at boundaries! + +``` +Chunk 1: Token 0-500 +Chunk 2: Token 400-900 ← 100 token overlap +Chunk 3: Token 800-1300 ← 100 token overlap +``` + +**Standard recommendation**: 10-20% overlap (for 500 tokens, use 50-100 token overlap) + +### Implementation with Semantic Kernel + +```csharp +using Microsoft.SemanticKernel.Text; + +var chunks = TextChunker.SplitPlainTextParagraphs( + documentText, + maxTokensPerParagraph: 500, + overlapTokens: 50 +); + +foreach (var chunk in chunks) +{ + var embedding = await embeddingService.GenerateEmbeddingAsync(chunk); + await vectorDb.StoreAsync(chunk, embedding); +} +``` + +## PostgreSQL + pgvector: The Pragmatic Choice + +For .NET developers, choosing a vector database can be overwhelming. After evaluating multiple options, **PostgreSQL with pgvector** is the most practical choice for most scenarios. + +![pgvector Integration](images/pgvector-integration.svg) + +### Why pgvector? + +✅ **Use existing SQL knowledge** - No new query language to learn +✅ **EF Core integration** - Works with your existing data access layer +✅ **JOIN with metadata** - Combine vector search with traditional queries +✅ **WHERE clause filtering** - Filter by tenant, user, date, etc. +✅ **ACID compliance** - Transaction support for data consistency +✅ **No separate infrastructure** - One database for everything + +### Setting Up pgvector with EF Core + +First, install the NuGet package: + +```bash +dotnet add package Pgvector.EntityFrameworkCore +``` + +Define your entity: + +```csharp +using Pgvector; +using Pgvector.EntityFrameworkCore; + +public class DocumentChunk +{ + public Guid Id { get; set; } + public string Content { get; set; } + public Vector Embedding { get; set; } // 👈 pgvector type + public Guid ParentChunkId { get; set; } + public DateTime CreatedAt { get; set; } +} +``` + +Configure in DbContext: + +```csharp +protected override void OnModelCreating(ModelBuilder builder) +{ + builder.HasPostgresExtension("vector"); + + builder.Entity() + .Property(e => e.Embedding) + .HasColumnType("vector(1536)"); // 👈 OpenAI embedding dimension + + builder.Entity() + .HasIndex(e => e.Embedding) + .HasMethod("hnsw") // 👈 Fast approximate search + .HasOperators("vector_cosine_ops"); +} +``` + +### Performing Vector Search + +```csharp +using Pgvector.EntityFrameworkCore; + +public async Task> SearchAsync(string query) +{ + // 1. Convert query to embedding + var queryVector = await _embeddingService.GetEmbeddingAsync(query); + + // 2. Search + return await _context.DocumentChunks + .OrderBy(c => c.Embedding.L2Distance(queryVector)) // 👈 Lower is better + .Take(5) + .ToListAsync(); +} +``` + +**Source**: [Pgvector.NET on GitHub](https://github.com/pgvector/pgvector-dotnet?tab=readme-ov-file#entity-framework-core) + +## Smart Tool Usage: Make RAG a Tool, Not a Tax + +A common mistake is calling RAG on every single user message. This wastes tokens and money. Instead, **make RAG a tool** and let the LLM decide when to use it. + +### ❌ Expensive Approach +```csharp +// Always call RAG, even for "Hello" +var context = await PerformRAG(userMessage); +var response = await chatClient.CompleteAsync($"{context}\n\n{userMessage}"); +``` + +### ✅ Smart Approach +```csharp +[KernelFunction] +[Description("Search the company knowledge base for information")] +public async Task SearchKnowledgeBase( + [Description("The search query")] string query) +{ + var results = await _vectorDb.SearchAsync(query); + return string.Join("\n---\n", results.Select(r => r.Content)); +} +``` + +The LLM will call `SearchKnowledgeBase` only when needed: +- "Hello" → No tool call +- "What was our 2024 revenue?" → Calls tool +- "Tell me a joke" → No tool call + +## Multilingual RAG: Query Translation Strategy + +When your documents are in one language (e.g., English) but users query in another (e.g., Turkish), you need a translation strategy. + +![Multilingual RAG Architecture](images/multilingual-rag.svg) + +### Solution Options + +**Option 1**: Use an LLM that automatically calls tools in English +- Many modern LLMs can do this if properly instructed + +**Option 2**: Tool chain approach +```csharp +[KernelFunction] +[Description("Translate text to English")] +public async Task TranslateToEnglish(string text) +{ + // Translation logic +} + +[KernelFunction] +[Description("Search knowledge base (English only)")] +public async Task SearchKnowledgeBase(string englishQuery) +{ + // Search logic +} +``` + +The LLM will: +1. Call `TranslateToEnglish("2024 geliri nedir?")` +2. Get "What was 2024 revenue?" +3. Call `SearchKnowledgeBase("What was 2024 revenue?")` +4. Return results and respond in Turkish + +## Model Context Protocol (MCP): Beyond In-Process Tools + +Microsoft and Anthropic recently released official C# SDKs for the Model Context Protocol (MCP). This is a game-changer for tool reusability. + +![MCP Architecture](images/mcp-architecture.svg) + +### MCP vs. Semantic Kernel Plugins + +| Feature | SK Plugins | MCP Servers | +|---------|-----------|-------------| +| **Process** | In-process | Out-of-process (stdio/http) | +| **Reusability** | Application-specific | Cross-application | +| **Examples** | Used within your app | VS Code Copilot, Claude Desktop | + +### Creating an MCP Server + +```csharp +using Microsoft.Extensions.Hosting; +using ModelContextProtocol.Extensions.Hosting; + +var builder = Host.CreateEmptyApplicationBuilder(settings: null); + +builder.Services.AddMcpServer() +.WithStdioServerTransport() +.WithToolsFromAssembly(); + +await builder.Build().RunAsync(); +``` + +Define your tools: + +```csharp +[McpServerToolType] +public static class FileSystemTools +{ + [McpServerTool, Description("Read a file from the file system")] + public static async Task ReadFile(string path) + { + // ⚠️ SECURITY: Always validate paths! + if (!IsPathSafe(path)) + throw new SecurityException("Invalid path"); + + return await File.ReadAllTextAsync(path); + } + + private static bool IsPathSafe(string path) + { + // Implement path traversal prevention + var fullPath = Path.GetFullPath(path); + return fullPath.StartsWith(AllowedDirectory); + } +} +``` + +Your MCP server can now be used by VS Code Copilot, Claude Desktop, or any other MCP client! + +## Chat History Management: Truncation + RAG Hybrid + +For long conversations, storing all history in the context window becomes impractical. Here's the pattern that works: + +![Chat History Hybrid Strategy](images/chat-history-hybrid.svg) + +### ❌ Lossy Approach +``` +First 50 messages → Summarize with LLM → Single summary message +``` +**Problem**: Detail loss (fidelity loss) + +### ✅ Hybrid Approach +1. **Recent messages** (last 5-10): Keep in prompt for immediate context +2. **Older messages**: Store in vector database as a tool + +```csharp +[KernelFunction] +[Description("Search conversation history for past discussions")] +public async Task SearchChatHistory( + [Description("What to search for")] string query) +{ + var relevantMessages = await _vectorDb.SearchAsync(query); + return string.Join("\n", relevantMessages.Select(m => + $"[{m.Timestamp}] {m.Role}: {m.Content}")); +} +``` + +The LLM retrieves only relevant past context when needed, avoiding summary-induced information loss. + +## RAG vs. Fine-Tuning: Choose Wisely + +A common misconception is using fine-tuning for knowledge injection. Here's when to use each: + +| Purpose | RAG | Fine-Tuning | +|---------|-----|-------------| +| **Goal** | Memory (provide facts) | Behavior (teach style) | +| **Updates** | Dynamic (add docs anytime) | Static (requires retraining) | +| **Cost** | Low dev, higher inference | High dev, lower inference | +| **Hallucination** | Reduces | Doesn't reduce | +| **Use Case** | Company docs, FAQs | Brand voice, specific format | + +**Common mistake**: "Let's fine-tune on our company documents" ❌ +**Better approach**: Use RAG! ✅ + +Fine-tuning is for teaching the model *how* to respond, not *what* to know. + +**Source**: [Oracle - RAG vs Fine-Tuning](https://www.oracle.com/artificial-intelligence/generative-ai/retrieval-augmented-generation-rag/rag-fine-tuning/) + +## Bonus: Why SVG is Superior for LLM-Generated Images + +When using LLMs to generate diagrams and visualizations, always request SVG format instead of PNG or JPG. + +### Why SVG? + +✅ **Text-based** → LLMs produce better results +✅ **Lower cost** → Fewer tokens than base64-encoded images +✅ **Editable** → Easy to modify after generation +✅ **Scalable** → Perfect quality at any size +✅ **Version control friendly** → Works great in Git + +### Example Prompt + +``` +Create an architecture diagram showing PostgreSQL with pgvector integration. +Format: SVG, 800x400 pixels. Show: .NET Application → EF Core → PostgreSQL → Vector Search. +Use arrows to connect stages. Color scheme: Blue tones. +``` + +![SVG Diagram Example](images/svg-diagram-example.svg) + +All diagrams in this article were generated as SVG, resulting in excellent quality and lower token costs! + +> **Pro Tip**: If you don't need photographs or complex renders, always choose SVG. + +## Architecture Roadmap: Putting It All Together + +Here's the recommended stack for building production LLM applications with .NET: + +1. **Orchestration**: Microsoft.Extensions.AI + Semantic Kernel (when needed) +2. **Vector Database**: PostgreSQL + Pgvector.EntityFrameworkCore +3. **RAG Pattern**: Parent-Child chunks with 10-20% overlap +4. **Tools**: MCP servers for reusability +5. **Reasoning**: ReasoningEffortLevel instead of temperature +6. **Prompting**: Critical rules at the end +7. **Cost Optimization**: Make RAG a tool, not automatic + +## Key Takeaways + +Let me summarize the most important production tips: + +1. **Temperature is gone** → Use `ReasoningEffortLevel` with GPT-5 +2. **Rules at the end** → Combat "Lost in the Middle" +3. **RAG as a tool** → Reduce costs significantly +4. **Parent-Child pattern** → Search small, respond with large +5. **Always use overlap** → 10-20% is the standard +6. **pgvector for most cases** → Unless you have billions of vectors +7. **MCP for reusability** → One codebase, works everywhere +8. **SVG for diagrams** → Better results, lower cost +9. **Hybrid chat history** → Recent in prompt, old in vector DB +10. **RAG > Fine-tuning** → For knowledge, not behavior + +Happy coding! 🚀 \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/summary.md b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/summary.md new file mode 100644 index 0000000000..fb1d41af5c --- /dev/null +++ b/docs/en/Community-Articles/2025-11-22-building-production-ready-llm-applications/summary.md @@ -0,0 +1 @@ +Learn how to build production-ready LLM applications with .NET. This comprehensive guide covers GPT-5 API changes, advanced RAG architectures with parent-child patterns, PostgreSQL pgvector integration, smart tool usage strategies, multilingual query handling, Model Context Protocol (MCP) for cross-application tool reusability, and chat history management techniques for enterprise applications. diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/POST.md b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/POST.md new file mode 100644 index 0000000000..75f2bd2e97 --- /dev/null +++ b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/POST.md @@ -0,0 +1,56 @@ +# .NET Conf China 2025: Changing the World, Changing Ourselves - See You Again in Shanghai + +![](./images/1.png) + +.NET Conf China 2025 is an annual community event for developers, celebrating the release of .NET 10 (LTS) and the achievements of the past year in China. As an extension of .NET Conf 2025, this event brings together local tech communities, well-known companies, and open-source organizations. It has become the largest .NET online and offline conference in China, dedicated to spreading .NET technology in Chinese and fostering collaboration and exchange. + +## Event Highlights: Key Topics and Takeaways + +This year’s conference focused on three main themes: performance improvements, AI integration, and cross-platform development. Topics covered how to achieve performance gains while maintaining engineering quality, balancing between multi-platform consistency and native capabilities, and taking generative AI from “demo-level” to “production-ready.” On the community and ecosystem side, the event showcased the .NET Foundation’s and domestic and international companies’ progress in supporting architectures like ARM, LoongArch, and RISC-V. It also highlighted best practices in DevOps, observability, and engineering toolchains, creating a complete path from ideas to implementation. + +### Opening Keynote + +Scott Hanselman opened the event with a video keynote. In his remarks, he shared some high-level thoughts on the development of .NET and conveyed an encouraging and positive message to the community. He also touched on the ongoing exploration of emerging technology trends, including AI, encouraging developers to stay open-minded and focus on long-term value and practical innovation. At the same time, he extended his best wishes for the success of the conference, hoping that all participants would gain inspiration from the exchanges and collectively contribute to the advancement of future technologies. + +![2](./images/2.png) + +### Roundtable Discussion + +The roundtable discussion, titled “Empowering with AI, Breaking Through Cross-Platform Barriers, and Ecosystem Innovation,” focused on practical implementation. It explored typical paths for large models and intelligent agents in enterprises, key considerations for choosing cross-platform UI frameworks, and the evolution of these frameworks. Panelists discussed questions like: How can AI capabilities be integrated into existing business processes instead of creating an “experimental” pipeline? How should cross-platform solutions be evaluated in terms of performance, ecosystem, and team skillsets? What are the unique opportunities for domestic ecosystems in the global tech landscape? And how can community collaboration help developers quickly adopt best practices? A shared consensus emerged: in the short term, focus on running scenarios; in the long term, return to engineering fundamentals. Both toolchains and methodologies are equally important. + +![](./images/21.png) + +### In-Depth Sessions + +The afternoon featured four breakout sessions, covering a wide range of topics with deep dives into both foundational technologies and real-world project reviews: + +- **Frontend and Cross-Platform:** Focused on the progress of Avalonia, Blazor, and WebAssembly, as well as the integrated experience of .NET Aspire in multi-service applications. Speakers shared insights on reusing core logic between desktop and web, shortening cold start times with incremental compilation and resource trimming, and performance profiling and optimization in WASM scenarios. +- **AI Agents and Enterprise Adoption:** Discussed multi-agent orchestration, the MCP plugin ecosystem, and enterprise data compliance. From common pitfalls of “demo-level” AI to the “five-step method” for moving from POC to production, the session covered use cases like knowledge retrieval, process automation, intelligent customer service, and developer assistants, emphasizing evaluation metrics, prompt engineering, and monitoring governance. +- **.NET Practices and Engineering:** Focused on the latest capabilities and performance practices of EF Core, the boundaries of NativeAOT, automated testing strategies, and observability implementation. Discussions included database migration strategies, caching and concurrency control for hot paths, end-to-end tracing, and structured logging. +- **Solutions and Case Studies:** From Clean Architecture/DDD to AI-powered business evolution, topics included application modernization, SaaS transformation, and edge-cloud collaboration in AIoT. Speakers broke down modular governance, team collaboration, and release strategies for complex systems, putting “delivering value continuously” at the center stage. + +![](./images/3.png) + +## ABP Booth Highlights: Showcases, Conversations, and Fun + +The story of ABP began with a promise to create a better starting point. From the frustration of “copy-pasting boilerplate code,” we crafted a modular, opinionated framework. We chose open source and community collaboration. We founded Volosoft to turn our vision into reality with professional tools. Today, tens of thousands of developers explore the ABP framework, and thousands of teams rely on the ABP platform to deliver production-grade .NET applications faster and more securely. + +![](./images/4.png) + +At .NET Conf China 2025, we brought our “developer platform built for developers” to every visitor. Our booth demonstrations started with “a production-ready skeleton from the start”: modular layered architecture, built-in authentication and authorization systems, multi-tenancy support, audit logging, and localization—all out of the box. On the frontend and backend, ABP offers diverse options like MVC, Blazor, and Angular, enabling teams to quickly implement solutions on familiar stacks while maintaining flexibility for future evolution. We also showcased how ABP integrates with containerization, CI/CD, and observability, emphasizing “engineering built into the framework, not reinvented by every team.” + +![](./images/42.png) + +**Interaction and Prizes:** Sharing technology should also be warm and engaging. We hosted a QR code raffle at the booth, with prizes including ABP stickers, the book *Mastering ABP Framework*, and Bluetooth headphones. Multiple rounds of raffles and group photos made the interactions more memorable. Many developers shared their ABP experiences and plans for improvement right at the booth, and a few impromptu “code walkthroughs” naturally happened. The love and joy for technology were captured in every handshake and discussion. + +![](./images/41.png) + +## Looking Ahead: Building the Ecosystem Together + +From an open-source journey to a complete development platform for the future, we’ve always believed that developers deserve a better starting point. Around performance, intelligence, and cross-platform capabilities, we will continue investing in engineering, ecosystem collaboration, and best practice sharing. We also welcome more partners to contribute through documentation and examples, share your experiences, and submit your ideas. Together, let’s make “useful infrastructure” more stable, efficient, and business-friendly. + +We look forward to exchanging ideas, sharing practices, and building the ecosystem together at the next gathering. Technology meets creativity, and the possibilities are endless. We’re on the road and waiting for you at the next event. + +See you next year at .NET Conf China 2026! + +![](./images/5.png) \ No newline at end of file diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/1.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/1.png new file mode 100644 index 0000000000..beaf49b86e Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/1.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/2.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/2.png new file mode 100644 index 0000000000..a081bf99e3 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/2.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/21.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/21.png new file mode 100644 index 0000000000..345452360a Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/21.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/3.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/3.png new file mode 100644 index 0000000000..b69f36ef66 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/3.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/4.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/4.png new file mode 100644 index 0000000000..a3a2ece3e9 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/4.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/41.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/41.png new file mode 100644 index 0000000000..19143279aa Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/41.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/42.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/42.png new file mode 100644 index 0000000000..730969eb8e Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/42.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/5.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/5.png new file mode 100644 index 0000000000..f1a2a437a0 Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/5.png differ diff --git a/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/cover.png b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/cover.png new file mode 100644 index 0000000000..f0eb6cea5f Binary files /dev/null and b/docs/en/Community-Articles/2025-11-30-NET-Conf-China-2025/images/cover.png differ diff --git a/docs/en/cli/index.md b/docs/en/cli/index.md index 7decaa658c..3a3d0c2304 100644 --- a/docs/en/cli/index.md +++ b/docs/en/cli/index.md @@ -7,11 +7,7 @@ # ABP CLI -ABP CLI (Command Line Interface) is a command line tool to perform some common operations for ABP based solutions or ABP Studio features. - -> With **v8.2+**, the old/legacy ABP CLI has been replaced with a new CLI system to align with the new templating system and [ABP Studio](../studio/index.md). The new ABP CLI commands are explained in this documentation. However, if you want to learn more about the differences between the old and new CLIs, want to learn the reason for the change, or need guidance to use the old ABP CLI, please refer to the [Old vs New CLI](differences-between-old-and-new-cli.md) documentation. -> -> You may need to remove the Old CLI before installing the New CLI, by running the following command: `dotnet tool uninstall -g Volo.Abp.Cli` +ABP CLI (Command Line Interface) is a command line tool to perform some common operations for ABP based solutions or [ABP Studio](../studio/index.md) features. ## Installation @@ -29,16 +25,16 @@ dotnet tool update -g Volo.Abp.Studio.Cli ## Global Options -While each command may have a set of options, there are some global options that can be used with any command; +While each command may have a set of options, there are some global options that can be used with any command: -* `--skip-cli-version-check` or `-scvc`: Skips to check the latest version of the ABP CLI. If you don't specify, it will check the latest version and shows a warning message if there is a newer version of the ABP CLI. -- `--skip-extension-version-check` or `-sevc`: Skips to check the latest version of the ABP CLI extensions. If you don't specify, it will check the latest version and download the latest version if there is a newer version of the ABP CLI extensions. +* `--skip-cli-version-check` or `-scvc`: Skips checking the latest version of the ABP CLI. If you don't specify, it will check the latest version and shows a warning message if there is a newer version of the ABP CLI. +- `--skip-extension-version-check` or `-sevc`: Skips checking the latest version of the ABP CLI extensions. If you don't specify, it will check the latest version and download the latest version if there is a newer version of the ABP CLI extensions. * `--old`: ABP CLI has two variations: `Volo.Abp.Studio.Cli` and `Volo.Abp.Cli`. New features/templates are added to the `Volo.Abp.Studio.Cli`. But if you want to use the old version, you can use this option **at the end of your commands**. For example, `abp new Acme.BookStore --old`. * `--help` or `-h`: Shows help for the specified command. ## Commands -Here, is the list of all available commands before explaining their details: +Here is the list of all available commands before explaining their details: * **[`help`](../cli#help)**: Shows help on the usage of the ABP CLI. * **[`cli`](../cli#cli)**: Update or remove ABP CLI. diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index 6fa1f5e620..10e2251b8e 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -552,6 +552,24 @@ "text": "Audit Logging", "path": "framework/infrastructure/audit-logging.md" }, + { + "text": "Artificial Intelligence", + "items":[ + { + "text": "Overview", + "path": "framework/infrastructure/artificial-intelligence/index.md", + "isIndex": true + }, + { + "text": "Microsoft.Extensions.AI", + "path": "framework/infrastructure/artificial-intelligence/microsoft-extensions-ai.md" + }, + { + "text": "Semantic Kernel", + "path": "framework/infrastructure/artificial-intelligence/microsoft-semantic-kernel.md" + } + ] + }, { "text": "Background Jobs", "items": [ diff --git a/docs/en/framework/infrastructure/artificial-intelligence.md b/docs/en/framework/infrastructure/artificial-intelligence.md deleted file mode 100644 index 652c7c8233..0000000000 --- a/docs/en/framework/infrastructure/artificial-intelligence.md +++ /dev/null @@ -1,307 +0,0 @@ -# Artificial Intelligence - -ABP provides a simple way to integrate AI capabilities into your applications by unifying two popular .NET AI stacks under a common concept called a "workspace": - -- Microsoft.Extensions.AI `IChatClient` -- Microsoft.SemanticKernel `Kernel` - -A workspace is just a named scope. You configure providers per workspace and then resolve either default services (for the "Default" workspace) or workspace-scoped services. - -## Installation - -> This package is not included by default. Install it to enable AI features. - -It is suggested to use the ABP CLI to install the package. Open a command line window in the folder of the project (.csproj file) and type the following command: - -```bash -abp add-package Volo.Abp.AI -``` - -### Manual Installation - -Add nuget package to your project: - -```bash -dotnet add package Volo.Abp.AI -``` - -Then add the module dependency to your module class: - -```csharp -using Volo.Abp.AI; -using Volo.Abp.Modularity; - -[DependsOn(typeof(AbpAIModule))] -public class MyProjectModule : AbpModule -{ -} -``` - -## Usage - -### Chat Client - -#### Default configuration (quick start) - -Configure the default workspace to inject `IChatClient` directly. - -```csharp -using Microsoft.Extensions.AI; -using Microsoft.SemanticKernel; -using Volo.Abp.AI; -using Volo.Abp.Modularity; - -public class MyProjectModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.PreConfigure(options => - { - options.Workspaces.ConfigureDefault(configuration => - { - configuration.ConfigureChatClient(chatClientConfiguration => - { - chatClientConfiguration.Builder = new ChatClientBuilder( - sp => new OllamaApiClient("http://localhost:11434", "mistral") - ); - }); - - // Chat client only in this quick start - }); - }); - } -} -``` - -Once configured, inject the default chat client: - -```csharp -using Microsoft.Extensions.AI; - -public class MyService -{ - private readonly IChatClient _chatClient; // default chat client - - public MyService(IChatClient chatClient) - { - _chatClient = chatClient; - } -} -``` - -#### Workspace configuration - -Workspaces allow multiple, isolated AI configurations. Define workspace types (optionally decorated with `WorkspaceNameAttribute`). If omitted, the type’s full name is used. - -```csharp -using Volo.Abp.AI; - -[WorkspaceName("GreetingAssistant")] -public class GreetingAssistant // ChatClient-only workspace -{ -} -``` - -Configure a ChatClient workspace: - -```csharp -public class MyProjectModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.PreConfigure(options => - { - options.Workspaces.Configure(configuration => - { - configuration.ConfigureChatClient(chatClientConfiguration => - { - chatClientConfiguration.Builder = new ChatClientBuilder( - sp => new OllamaApiClient("http://localhost:11434", "mistral") - ); - - chatClientConfiguration.BuilderConfigurers.Add(builder => - { - // Anything you want to do with the builder: - // builder.UseFunctionInvocation().UseLogging(); // For example - }); - }); - }); - }); - } -} -``` - -### Semantic Kernel - -#### Default configuration - - -```csharp -public class MyProjectModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.PreConfigure(options => - { - options.Workspaces.ConfigureDefault(configuration => - { - configuration.ConfigureKernel(kernelConfiguration => - { - kernelConfiguration.Builder = Kernel.CreateBuilder() - .AddAzureOpenAIChatClient("...", "..."); - }); - // Note: Chat client is not configured here - }); - }); - } -} -``` - -Once configured, inject the default kernel: - -```csharp -using System.Threading.Tasks; -using Volo.Abp.AI; - -public class MyService -{ - private readonly IKernelAccessor _kernelAccessor; - public MyService(IKernelAccessor kernelAccessor) - { - _kernelAccessor = kernelAccessor; - } - - public async Task DoSomethingAsync() - { - var kernel = _kernelAccessor.Kernel; // Kernel might be null if no workspace is configured. - - var result = await kernel.InvokeAsync(/*... */); - } -} -``` - -#### Workspace configuration - -```csharp -public class MyProjectModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.PreConfigure(options => - { - options.Workspaces.Configure(configuration => - { - configuration.ConfigureKernel(kernelConfiguration => - { - kernelConfiguration.Builder = Kernel.CreateBuilder() - .AddOpenAIChatCompletion("...", "..."); - }); - }); - }); - } -} -``` - -#### Workspace usage - -```csharp -using Microsoft.Extensions.AI; -using Volo.Abp.AI; -using Microsoft.SemanticKernel; - -public class PlanningService -{ - private readonly IKernelAccessor _kernelAccessor; - private readonly IChatClient _chatClient; // available even if only Kernel is configured - - public PlanningService( - IKernelAccessor kernelAccessor, - IChatClient chatClient) - { - _kernelAccessor = kernelAccessor; - _chatClient = chatClient; - } - - public async Task PlanAsync(string topic) - { - var kernel = _kernelAccessor.Kernel; // Microsoft.SemanticKernel.Kernel - // Use Semantic Kernel APIs if needed... - - var response = await _chatClient.GetResponseAsync( - [new ChatMessage(ChatRole.User, $"Create a content plan for: {topic}")] - ); - return response?.Message?.Text ?? string.Empty; - } -} -``` - -## Options - -`AbpAIOptions` configuration pattern offers `ConfigureChatClient(...)` and `ConfigureKernel(...)` methods for configuration. These methods are defined in the `WorkspaceConfiguration` class. They are used to configure the `ChatClient` and `Kernel` respectively. - -`Builder` is set once and is used to build the `ChatClient` or `Kernel` instance. `BuilderConfigurers` is a list of actions that are applied to the `Builder` instance for incremental changes. These actions are executed in the order they are added. - -If a workspace configures only the Kernel, a chat client may still be exposed for that workspace through the Kernel’s service provider (when available). - - -## Advanced Usage and Customizations - -### Addding Your Own DelegatingChatClient - -If you want to build your own decorator, implement a `DelegatingChatClient` derivative and provide an extension method that adds it to the `ChatClientBuilder` using `builder.Use(...)`. - -Example sketch: - -```csharp -using Microsoft.Extensions.AI; - -public class SystemMessageChatClient : DelegatingChatClient -{ - public SystemMessageChatClient(IChatClient inner, string systemMessage) : base(inner) - { - SystemMessage = systemMessage; - } - - public string SystemMessage { get; set; } - - public override Task GetResponseAsync(IEnumerable messages, ChatOptions? options = null, CancellationToken cancellationToken = default) - { - // Mutate messages/options as needed, then call base - return base.GetResponseAsync(messages, options, cancellationToken); - } -} - -public static class SystemMessageChatClientExtensions -{ - public static ChatClientBuilder UseSystemMessage(this ChatClientBuilder builder, string systemMessage) - { - return builder.Use(client => new SystemMessageChatClient(client, systemMessage)); - } -} -``` - - -```cs -chatClientConfiguration.BuilderConfigurers.Add(builder => -{ - builder.UseSystemMessage("You are a helpful assistant that greets users in a friendly manner with their names."); -}); -``` - -## Technical Anatomy - -- `AbpAIModule`: Wires up configured workspaces, registers keyed services and default services for the `"Default"` workspace. -- `AbpAIOptions`: Holds `Workspaces` and provides helper methods for internal keyed service naming. -- `WorkspaceConfigurationDictionary` and `WorkspaceConfiguration`: Configure per-workspace Chat Client and Kernel. -- `ChatClientConfiguration` and `KernelConfiguration`: Hold builders and a list of ordered builder configurers. -- `WorkspaceNameAttribute`: Names a workspace; falls back to the type’s full name if not specified. -- `IChatClient`: Typed chat client for a workspace. -- `IKernelAccessor`: Provides access to the workspace’s `Kernel` instance if configured. -- `AbpAIWorkspaceOptions`: Exposes `ConfiguredWorkspaceNames` for diagnostics. - -There are no database tables for this feature; it is a pure configuration and DI integration layer. - -## See Also - -- Microsoft.Extensions.AI (Chat Client) -- Microsoft Semantic Kernel \ No newline at end of file diff --git a/docs/en/framework/infrastructure/artificial-intelligence/index.md b/docs/en/framework/infrastructure/artificial-intelligence/index.md new file mode 100644 index 0000000000..bdd1125e9d --- /dev/null +++ b/docs/en/framework/infrastructure/artificial-intelligence/index.md @@ -0,0 +1,38 @@ +```json +//[doc-seo] +{ + "Description": "Explore ABP Framework's AI integration, enabling seamless AI capabilities, workspace management, and reusable modules for .NET developers." +} +``` + +# Artificial Intelligence (AI) +ABP Framework provides integration for AI capabilities to your application by using Microsoft's popular AI libraries. The main purpose of this integration is to provide a consistent and easy way to use AI capabilities and manage different AI providers, models and configurations in a single application. + +ABP introduces a concept called **AI Workspace**. A workspace allows you to configure isolated AI configurations for a named scope. You can then resolve AI services for a specific workspace when you need to use them. + +> ABP Framework can work with any AI library or framework that supports .NET development. However, the AI integration features explained in the following documents provide a modular and standard way to work with AI, which allows ABP developers to create reusable modules and components with AI capabilities in a standard way. + +## Installation + +Use the [ABP CLI](../../../cli/index.md) to install the [Volo.Abp.AI](https://www.nuget.org/packages/Volo.Abp.AI) NuGet package into your project. Open a command line window in the root directory of your project (`.csproj` file) and type the following command: + +```bash +abp add-package Volo.Abp.AI +``` + +*For different installation options, check [the package definition page](https://abp.io/package-detail/Volo.Abp.AI).* + +## Usage + +The `Volo.Abp.AI` package provides integration with the following libraries: + +* [Microsoft.Extensions.AI](https://learn.microsoft.com/en-us/dotnet/ai/microsoft-extensions-ai) +* [Microsoft.SemanticKernel](https://learn.microsoft.com/en-us/semantic-kernel/overview/) + +The Microsoft.Extensions.AI library is suggested for library developers to keep the library dependency minimum and simple (since it provides basic abstractions and fundamental AI provider integrations), while Semantic Kernel is suggested for applications that need rich and advanced AI integration features. + +Check the following documentation to learn how to use these libraries with the ABP integration: + +- [ABP Microsoft.Extensions.AI integration](./microsoft-extensions-ai.md) +- [ABP Microsoft.SemanticKernel integration](./microsoft-semantic-kernel.md) + diff --git a/docs/en/framework/infrastructure/artificial-intelligence/microsoft-extensions-ai.md b/docs/en/framework/infrastructure/artificial-intelligence/microsoft-extensions-ai.md new file mode 100644 index 0000000000..35b370585e --- /dev/null +++ b/docs/en/framework/infrastructure/artificial-intelligence/microsoft-extensions-ai.md @@ -0,0 +1,176 @@ +# Microsoft.Extensions.AI +[Microsoft.Extensions.AI](https://learn.microsoft.com/en-us/dotnet/ai/microsoft-extensions-ai) is a library that provides a unified API for integrating AI services. It is a part of the Microsoft AI Extensions Library. It is used to integrate AI services into your application. This documentation is about the usage of this library with ABP Framework. Make sure you have read the [Artificial Intelligence](./index.md) documentation before reading this documentation. + +## Usage + +You can resolve `IChatClient` to access configured chat client from your service and use it directly. + +```csharp +public class MyService +{ + private readonly IChatClient _chatClient; + public MyService(IChatClient chatClient) + { + _chatClient = chatClient; + } + + public async Task GetResponseAsync(string prompt) + { + return await _chatClient.GetResponseAsync(prompt); + } +} +``` + +You can also resolve `IChatClientAccessor` to access the `IChatClient` optionally configured scenarios such as developing a module or a service that may use AI capabilities **optionally**. + + +```csharp +public class MyService +{ + private readonly IChatClientAccessor _chatClientAccessor; + public MyService(IChatClientAccessor chatClientAccessor) + { + _chatClientAccessor = chatClientAccessor; + } + + public async Task GetResponseAsync(string prompt) + { + var chatClient = _chatClientAccessor.ChatClient; + if (chatClient is null) + { + return "No chat client configured"; + } + return await chatClient.GetResponseAsync(prompt); + } +} +``` + +### Workspaces + +Workspaces are a way to configure isolated AI configurations for a named scope. You can define a workspace by decorating a class with the `WorkspaceNameAttribute` attribute that carries the workspace name. +- Workspace names must be unique. +- Workspace names cannot contain spaces _(use underscores or camelCase)_. +- Workspace names are case-sensitive. + +```csharp +using Volo.Abp.AI; + +[WorkspaceName("CommentSummarization")] +public class CommentSummarization +{ +} +``` + +> [!NOTE] +> If you don't specify the workspace name, the full name of the class will be used as the workspace name. + +You can resolve generic versions of `IChatClient` and `IChatClientAccessor` services for a specific workspace as generic arguments. If Chat Client is not configured for a workspace, you will get `null` from the accessor services. You should check the accessor before using it. This applies only for specified workspaces. Another workspace may have a configured Chat Client. + +`IChatClient` or `IChatClientAccessor` can be resolved to access a specific workspace's chat client. This is a typed chat client and can be configured separately from the default chat client. + + +Example of resolving a typed chat client: +```csharp +public class MyService +{ + private readonly IChatClient _chatClient; + + public MyService(IChatClient chatClient) + { + _chatClient = chatClient; + } + + public async Task GetResponseAsync(string prompt) + { + return await _chatClient.GetResponseAsync(prompt); + } +} +``` + +Example of resolving a typed chat client accessor: +```csharp +public class MyService +{ + private readonly IChatClientAccessor _chatClientAccessor; +} + public async Task GetResponseAsync(string prompt) + { + var chatClient = _chatClientAccessor.ChatClient; + if (chatClient is null) + { + return "No chat client configured"; + } + return await chatClient.GetResponseAsync(prompt); + } +} +``` + +## Configuration + +`AbpAIWorkspaceOptions` configuration is used to configure AI workspaces and their configurations. You can configure the default workspace and also configure isolated workspaces by using the this options class.It has to be configured **before the services are configured** in the `PreConfigure` method of your module class. It is important since the services are registered after the configuration is applied. + +- `AbpAIWorkspaceOptions` has a `Workspaces` property that is type of `WorkspaceConfigurationDictionary` which is a dictionary of workspace names and their configurations. It provides `Configure` and `ConfigureDefault` methods to configure the default workspace and also configure isolated workspaces by using the workspace type. + +- Configure method passes `WorkspaceConfiguration` object to the configure action. You can configure the `ChatClient` by using the `ConfigureChatClient` method. + +- `ConfigureChatClient()` method passes `ChatClientConfiguration` parameter to the configure action. You can configure the `Builder` and `BuilderConfigurers` by using the `ConfigureBuilder` method. + - `Builder` is set once and is used to build the `ChatClient` instance. + - `BuilderConfigurers` is a list of actions that are applied to the `Builder` instance for incremental changes.These actions are executed in the order they are added. + +To configure a chat client, you'll need a LLM provider package such as [Microsoft.Extensions.AI.OpenAI](https://www.nuget.org/packages/Microsoft.Extensions.AI.OpenAI) or [OllamaSharp](https://www.nuget.org/packages/OllamaSharp/) to configure a chat client. + +_The following example requires [OllamaSharp](https://www.nuget.org/packages/OllamaSharp/) package to be installed._ + + +Demonstration of the default workspace configuration: +```csharp +[DependsOn(typeof(AbpAIModule))] +public class MyProjectModule : AbpModule +{ + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(options => + { + options.Workspaces.ConfigureDefault(configuration => + { + configuration.ConfigureChatClient(chatClientConfiguration => + { + chatClientConfiguration.Builder = new ChatClientBuilder( + sp => new OllamaApiClient("http://localhost:11434", "mistral") + ); + }); + }); + }); + } +} +``` + + +Demonstration of the isolated workspace configuration: +```csharp +[DependsOn(typeof(AbpAIModule))] +public class MyProjectModule : AbpModule +{ + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(options => + { + options.Workspaces.Configure(configuration => + { + configuration.ConfigureChatClient(chatClientConfiguration => + { + chatClientConfiguration.Builder = new ChatClientBuilder( + sp => new OllamaApiClient("http://localhost:11434", "mistral") + ); + }); + }); + }); + } +} +``` + + +## See Also + +- [Usage of Semantic Kernel](./microsoft-semantic-kernel.md) +- [AI Samples for .NET](https://learn.microsoft.com/en-us/samples/dotnet/ai-samples/ai-samples/) \ No newline at end of file diff --git a/docs/en/framework/infrastructure/artificial-intelligence/microsoft-semantic-kernel.md b/docs/en/framework/infrastructure/artificial-intelligence/microsoft-semantic-kernel.md new file mode 100644 index 0000000000..07622391bd --- /dev/null +++ b/docs/en/framework/infrastructure/artificial-intelligence/microsoft-semantic-kernel.md @@ -0,0 +1,135 @@ +# Microsoft.SemanticKernel +[Microsoft.SemanticKernel](https://learn.microsoft.com/en-us/semantic-kernel/overview/) is a library that provides a unified SDK for integrating AI services. This documentation is about the usage of this library with ABP Framework. Make sure you have read the [Artificial Intelligence](./index.md) documentation before reading this documentation. + +## Usage + +Semantic Kernel can be used by resolving `IKernelAccessor` service that carries the `Kernel` instance. Kernel might be `null` if no workspace is configured. You should check the kernel before using it. + +```csharp +public class MyService +{ + private readonly IKernelAccessor _kernelAccessor; + public MyService(IKernelAccessor kernelAccessor) + { + _kernelAccessor = kernelAccessor; + } + + public async Task GetResponseAsync(string prompt) + { + var kernel = _kernelAccessor.Kernel; + if (kernel is null) + { + return "No kernel configured"; + } + return await kernel.InvokeAsync(prompt); + } +} +``` + +### Workspaces + +Workspaces are a way to configure isolated AI configurations for a named scope. You can define a workspace by decorating a class with the `WorkspaceNameAttribute` attribute that carries the workspace name. +- Workspace names must be unique. +- Workspace names cannot contain spaces _(use underscores or camelCase)_. +- Workspace names are case-sensitive. + +```csharp +using Volo.Abp.AI; + +[WorkspaceName("CommentSummarization")] +public class CommentSummarization +{ +} +``` + +> [!NOTE] +> If you don't specify the workspace name, the full name of the class will be used as the workspace name. + +You can resolve generic versions of `IKernelAccessor` service for a specific workspace as generic arguments. If Kernel is not configured for a workspace, you will get `null` from the accessor service. You should check the accessor before using it. This applies only for specified workspaces. Another workspace may have a configured Kernel. + + +`IKernelAccessor` can be resolved to access a specific workspace's kernel. This is a typed kernel accessor and each workspace can have its own kernel configuration. + +Example of resolving a typed kernel accessor: +```csharp +public class MyService +{ + private readonly IKernelAccessor _kernelAccessor; +} + public async Task GetResponseAsync(string prompt) + { + var kernel = _kernelAccessor.Kernel; + if (kernel is null) + { + return "No kernel configured"; + } + return await kernel.InvokeAsync(prompt); + } +} +``` + +## Configuration + +`AbpAIWorkspaceOptions` configuration is used to configure AI workspaces and their configurations. You can configure the default workspace and also configure isolated workspaces by using the this options class.It has to be configured **before the services are configured** in the `PreConfigure` method of your module class. It is important since the services are registered after the configuration is applied. + +- `AbpAIWorkspaceOptions` has a `Workspaces` property that is type of `WorkspaceConfigurationDictionary` which is a dictionary of workspace names and their configurations. It provides `Configure` and `ConfigureDefault` methods to configure the default workspace and also configure isolated workspaces by using the workspace type. + +- Configure method passes `WorkspaceConfiguration` object to the configure action. You can configure the `Kernel` by using the `ConfigureKernel` method. + +- `ConfigureKernel()` method passes `KernelConfiguration` parameter to the configure action. You can configure the `Builder` and `BuilderConfigurers` by using the `ConfigureBuilder` method. + - `Builder` is set once and is used to build the `Kernel` instance. + - `BuilderConfigurers` is a list of actions that are applied to the `Builder` instance for incremental changes.These actions are executed in the order they are added. + +To configure a kernel, you'll need a kernel connector package such as [Microsoft.SemanticKernel.Connectors.OpenAI](Microsoft.SemanticKernel.Connectors.OpenAI) to configure a kernel to use a specific LLM provider. + +_The following example requires [Microsoft.SemanticKernel.Connectors.AzureOpenAI](Microsoft.SemanticKernel.Connectors.AzureOpenAI) package to be installed._ + +Demonstration of the default workspace configuration: +```csharp +[DependsOn(typeof(AbpAIModule))] +public class MyProjectModule : AbpModule +{ + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(options => + { + options.Workspaces.ConfigureDefault(configuration => + { + configuration.ConfigureKernel(kernelConfiguration => + { + kernelConfiguration.Builder = Kernel.CreateBuilder() + .AddAzureOpenAIChatClient("...", "..."); + }); + // Note: Chat client is not configured here + }); + }); + } +} +``` + +Demonstration of the isolated workspace configuration: +```csharp +[DependsOn(typeof(AbpAIModule))] +public class MyProjectModule : AbpModule +{ + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(options => + { + options.Workspaces.Configure(configuration => + { + configuration.ConfigureKernel(kernelConfiguration => + { + kernelConfiguration.Builder = Kernel.CreateBuilder() + .AddAzureOpenAIChatClient("...", "..."); + }); + }); + }); + } +} +``` + +## See Also + +- [Usage of Microsoft.Extensions.AI](./microsoft-extensions-ai.md) +- [AI Samples for .NET](https://learn.microsoft.com/en-us/samples/dotnet/ai-samples/ai-samples/) \ No newline at end of file diff --git a/docs/en/framework/infrastructure/index.md b/docs/en/framework/infrastructure/index.md index a242c8b4fa..ec6377d757 100644 --- a/docs/en/framework/infrastructure/index.md +++ b/docs/en/framework/infrastructure/index.md @@ -10,7 +10,7 @@ ABP provides a complete infrastructure for creating real world software solutions with modern architectures based on the .NET platform. Each of the following documents explains an infrastructure feature: * [Audit Logging](./audit-logging.md) -* [Artificial Intelligence](./artificial-intelligence.md) +* [Artificial Intelligence](./artificial-intelligence/index.md) * [Background Jobs](./background-jobs/index.md) * [Background Workers](./background-workers/index.md) * [BLOB Storing](./blob-storing/index.md) diff --git a/docs/en/framework/ui/angular/modifying-the-menu.md b/docs/en/framework/ui/angular/modifying-the-menu.md index 75da5169cb..eec9e79ba0 100644 --- a/docs/en/framework/ui/angular/modifying-the-menu.md +++ b/docs/en/framework/ui/angular/modifying-the-menu.md @@ -44,7 +44,29 @@ export const appConfig: ApplicationConfig = { Notes - This approach works across themes. If you are using LeptonX, the brand logo component reads these values automatically; you don't need any theme-specific code. -- You can still override visuals with CSS variables if desired. See the LeptonX section for CSS overrides. +- You can still override visuals with CSS variables if desired. See the alternative approach below. + +### Alternative: Using CSS Variables (LeptonX Theme) + +If you're using the LeptonX theme, you can also configure the logo using CSS variables in your `styles.scss` file. This approach is specific to LeptonX and provides direct control over the logo styling. + +Add the following to your `src/styles.scss`: + +```scss +:root { + --lpx-logo: url('/assets/images/logo/logo-light.png'); + --lpx-logo-icon: url('/assets/images/logo/logo-light-thumbnail.png'); +} +``` + +**When to use each approach:** + +| Approach | Use Case | Theme Support | +|----------|----------|-------------| +| **provideLogo** (recommended) | Cross-theme compatibility, environment-based configuration | All themes | +| **CSS Variables** | LeptonX-specific styling, fine-grained CSS control | LeptonX only | + +**Recommendation:** Use the `provideLogo` approach for most cases as it's theme-independent and follows ABP's standard configuration pattern. Use CSS variables only when you need LeptonX-specific styling control or have existing CSS-based theme customizations. ## How to Add a Navigation Element diff --git a/docs/en/images/abp-overall-diagram-1600.png b/docs/en/images/abp-overall-diagram-1600.png index 16d397466a..3b02dd66dc 100644 Binary files a/docs/en/images/abp-overall-diagram-1600.png and b/docs/en/images/abp-overall-diagram-1600.png differ diff --git a/docs/en/images/db-options.png b/docs/en/images/db-options.png index 91d2b51ce7..d25811c49b 100644 Binary files a/docs/en/images/db-options.png and b/docs/en/images/db-options.png differ diff --git a/docs/en/images/ui-options.png b/docs/en/images/ui-options.png index 6affab9d21..3c30cd16d7 100644 Binary files a/docs/en/images/ui-options.png and b/docs/en/images/ui-options.png differ diff --git a/docs/en/modules/ai-management/index.md b/docs/en/modules/ai-management/index.md index c114edfdd2..a126d9c59d 100644 --- a/docs/en/modules/ai-management/index.md +++ b/docs/en/modules/ai-management/index.md @@ -9,8 +9,11 @@ > You must have an ABP Team or a higher license to use this module. -This module implements AI (Artificial Intelligence) management capabilities on top of the [Artificial Intelligence Workspaces](../../framework/infrastructure/artificial-intelligence.md) feature of the ABP Framework and allows to manage workspaces dynamically from the application including UI components and API endpoints. +> **⚠️ Important Notice** +> The **AI Management Module** is currently in **preview** and not yet production-ready. The documentation and implementation are subject to change. +> We recommend using this module for **evaluation and experimentation** only, not in production environments for now. +This module implements AI (Artificial Intelligence) management capabilities on top of the [Artificial Intelligence Workspaces](../../framework/infrastructure/artificial-intelligence/index.md) feature of the ABP Framework and allows to manage workspaces dynamically from the application including UI components and API endpoints. ## How to Install @@ -75,7 +78,7 @@ The AI Management module includes a built-in chat interface for testing workspac * Test streaming responses * Verify workspace configuration before using in production -> Access the chat interface at: `/AIManagement/Chat` +> Access the chat interface at: `/AIManagement/Workspaces/{WorkspaceName}` ## Workspace Configuration @@ -248,7 +251,7 @@ public class MyService } ``` -> See [Artificial Intelligence](../../framework/infrastructure/artificial-intelligence.md) documentation for more details about workspace configuration. +> See [Artificial Intelligence](../../framework/infrastructure/artificial-intelligence/index.md) documentation for more details about workspace configuration. ### Scenario 2: AI Management with Domain Layer Dependency (Local Execution) @@ -626,6 +629,6 @@ The cache is automatically invalidated when workspaces are created, updated, or ## See Also -- [Artificial Intelligence Infrastructure](../../framework/infrastructure/artificial-intelligence.md): Learn about the underlying AI workspace infrastructure +- [Artificial Intelligence Infrastructure](../../framework/infrastructure/artificial-intelligence/index.md): Learn about the underlying AI workspace infrastructure - [Microsoft.Extensions.AI](https://learn.microsoft.com/en-us/dotnet/ai/): Microsoft's unified AI abstractions -- [Semantic Kernel](https://learn.microsoft.com/en-us/semantic-kernel/): Microsoft's Semantic Kernel integration \ No newline at end of file +- [Semantic Kernel](https://learn.microsoft.com/en-us/semantic-kernel/): Microsoft's Semantic Kernel integration diff --git a/docs/en/modules/file-management.md b/docs/en/modules/file-management.md index e0cb3225f1..8a5f7aae29 100644 --- a/docs/en/modules/file-management.md +++ b/docs/en/modules/file-management.md @@ -144,6 +144,12 @@ You can move files by clicking `Actions -> Move` on the table. You can rename a file by clicking `Actions -> Rename` on the table. +###### File Sharing + +To share a file, click `Actions -> Share` in the table. Once sharing is enabled, you can copy the shared link directly from the table. + +> Anyone with the shared link will be able to access the file while sharing is enabled. + ## Data Seed This module doesn't seed any data. diff --git a/docs/en/release-info/migration-guides/abp-10-0.md b/docs/en/release-info/migration-guides/abp-10-0.md index b5fb4e0ed9..334adb2f4f 100644 --- a/docs/en/release-info/migration-guides/abp-10-0.md +++ b/docs/en/release-info/migration-guides/abp-10-0.md @@ -15,6 +15,24 @@ This document is a guide for upgrading ABP v9.x solutions to ABP v10.0. There ar We've upgraded ABP to .NET 10.0, so you need to move your solutions to .NET 10.0 if you want to use ABP 10.0. You can check Microsoft’s [Migrate from ASP.NET Core 9.0 to 10.0](https://learn.microsoft.com/en-us/aspnet/core/migration/90-to-100) documentation to see how to update an existing ASP.NET Core 9.0 project to ASP.NET Core 10.0. +### MySQL Support for .NET 10.0 + +**If you are using MySQL as your database provider, please be aware of the following compatibility issues before upgrading to ABP 10.0!** + +The MySQL Entity Framework Core providers currently have limited support for .NET 10.0: + +* **Pomelo.EntityFrameworkCore.MySql**: Does not yet support .NET 10.0. The team is actively working on adding support. +* **MySql.EntityFrameworkCore**: Currently in Release Candidate (RC) status with known bugs that may affect production applications. + +**Recommendation**: If you are using MySQL, we recommend waiting to upgrade to ABP 10.0 until the MySQL providers release stable versions with full .NET 10.0 support. + +**Track Progress**: + +* [Pomelo Provider - EF Core 10 Support](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/issues/2007) +* [MySql.EntityFrameworkCore NuGet Package](https://www.nuget.org/packages/MySql.EntityFrameworkCore/#versions-body-tab) + +We will update to support the latest stable MySQL providers as soon as they become available. + ### Add New EF Core Migrations Some entities in certain modules have been modified. If you are using Entity Framework Core, please create a new EF Core migration in your project after upgrading to ABP 10.0. @@ -27,6 +45,8 @@ We removed the Razor Runtime Compilation support since it is obsolete and replac If you want to keep using it, you can add [Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation](https://www.nuget.org/packages/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation) package to your project and configure it manually. +> If the referenced project also contains Razor Pages that require this feature, add the package to that project as well. + ```csharp using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; using Volo.Abp.DependencyInjection; diff --git a/docs/en/release-info/release-notes.md b/docs/en/release-info/release-notes.md index cb6d5f421d..bf335fa7a2 100644 --- a/docs/en/release-info/release-notes.md +++ b/docs/en/release-info/release-notes.md @@ -14,9 +14,21 @@ Also see the following notes about ABP releases: * [ABP Studio release notes](../studio/release-notes.md) * [Change logs for ABP pro packages](https://abp.io/pro-releases) +## 10.0 (2025-11-18) + +See the detailed **[blog post / announcement](https://abp.io/community/announcements/abp.io-platform-10.0-final-has-been-released-spknn925)** for the v10.0 release. + +* Upgraded to .NET 10.0 +* Upgraded to `Blazorise` **v1.8.6** +* New PRO Module: [Elsa Workflows](../modules/elsa-pro.md) +* New Object Mapper: **Mapperly** +* Localization: Nested Object Support in JSON Files +* EF Core Shared Entity Types on Repositories +* Angular SSR Support + ## 9.3 (2025-06-17) -This is currently a RC (release-candidate) and you can see the detailed **[blog post / announcement](https://abp.io/community/articles/announcing-abp-9-3-release-candidate-4dqgiryf)** for the v9.3 release. +See the detailed **[blog post / announcement](https://abp.io/community/announcements/announcing-abp-9-3-stable-release-fw4n9sng)** for the v9.3 release. * Cron Expression Support for Background Workers * Docs Module: PDF Export diff --git a/docs/en/release-info/road-map.md b/docs/en/release-info/road-map.md index f7b432a39d..0df94ec157 100644 --- a/docs/en/release-info/road-map.md +++ b/docs/en/release-info/road-map.md @@ -11,36 +11,39 @@ This document provides a road map, release schedule, and planned features for th ## Next Versions -### v10.0 +### v10.1 -The next version will be 10.0 and planned to release the stable 10.0 version in December 2025. We will be mostly working on the following topics: +The next version will be 10.1 and planned to release the stable 10.1 version in January 2026. We will be mostly working on the following topics: * Framework - * Upgrading to .NET 10 - * Upgrading 3rd-party dependencies - * Enhancements in the core points + * OpenTelemetry Protocol Support for 3rd-party Integrations + * Resource Based Authorization Integration + * Upgrading 3rd-party Dependencies + * Enhancements in the Core Points * ABP Suite - * Define navigation properties without target string property dependency - * Improvements one-to-many scenarios - * File Upload Modal enhancements - + * Define Navigation Properties Without Target String Property Dependency + * Improvements on Master-Detail Page Desing (making it more compact) + * Improvements One-To-Many Scenarios + * File Upload Modal Enhancements * ABP Studio - * Allow to directly create new solutions with ABP's RC (Release Candidate) versions - * Automate more details on new service creation for a microservice solution - * Support multiple concurrent Kubernetes deployment/integration scenarios - * Improve the module installation experience / installation guides - * Improve client proxy generation experience - * Modular Monolith Application Startup Template - -* Application modules - * Account module: Support mixed social/local login scenarios & adding security related features - * UI/UX improvements on existing application modules - -* Updating existing tutorials & documents (with other UI & DB options) - * Microservice development - * Modular monolith development + * Allow to Directly Create New Solutions with ABP's RC (Release Candidate) Versions + * Automate More Details on New Service Creation for a Microservice Solution + * Allow to Download ABP Samples from ABP Studio + * Task Panel Enhancements (and Documentation) + * Support Multiple Concurrent Kubernetes Deployment/Integration Scenarios + * Improve the Module Installation Experience / Installation Guides + +* Application Modules + * Payment Module: Public Page Implementation (for Blazor & Angular UIs) + * AI Management Module: UI Implementation for Blazor & Angular UIs + * CMS Kit: Enhancements for Some Features (Rating, Dynamic Widgets, FAQ and more...) + * UI/UX Improvements on Existing Application Modules + +* Updating Existing Tutorials & Documents (with Other UI & DB Options) + * Microservice Development + * Modular Monolith Development ## Backlog Items @@ -50,7 +53,6 @@ The *Next Versions* section above shows the main focus of the planned versions. The ABP framework is [open source](https://github.com/abpframework/abp) and free for everyone. You can see its [public backlog](https://github.com/abpframework/abp/milestone/2). Here, are some of the important features you can expect from next versions: -* [#236](https://github.com/abpframework/abp/issues/236) / Resource based authorization system * [#2882](https://github.com/abpframework/abp/issues/2882) / Providing a gRPC integration infrastructure (while it is [already possible](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) to create or consume gRPC endpoints for your application, we plan to create endpoints for the [standard application modules](../modules/index.md)) * [#57](https://github.com/abpframework/abp/issues/57) / Built-in CQRS infrastructure * [#58](https://github.com/abpframework/abp/issues/58) / Content localization system (multilingual entities) @@ -85,12 +87,9 @@ Here, are some of the important planned features for next ABP Studio versions: * Analyze user solutions to explore entities, domain services, application services, pages and other fundamental objects. * Swagger authentication support for the built-in browser * Show related requests/events (traces) together in the solution runner panel -* Integrate common tool dashboards into ABP Studio (such a Garana, Redis, RabbitMQ, Kibana, etc) * Built-in command terminal * Automate all steps of new service creation for microservice solutions -* Container application type support for Solution Runner (to individually control docker dependencies) * More options while creating new solutions -* Downloading samples in ABP studio * Built-in ABP documentation experience * Auto-execute terminal commands in markdown files * Compare changes on the startup templates when a new ABP version is published diff --git a/docs/en/testing/integration-tests.md b/docs/en/testing/integration-tests.md index dce7813e45..c87d270747 100644 --- a/docs/en/testing/integration-tests.md +++ b/docs/en/testing/integration-tests.md @@ -350,7 +350,7 @@ There are multiple overloads of the `WithUnitOfWorkAsync` method that you can us ## Working with DbContext -In some cases, you may want to directory work with the [Entity Framework's `DbContext` object](https://learn.microsoft.com/en-us/dotnet/api/system.data.entity.dbcontext) to perform database operations in your test methods. In this case, you can use `IDbContextProvider`service to obtain a `DbContext` instance inside a unit of work. +In some cases, you may want to directly work with the [Entity Framework's `DbContext` object](https://learn.microsoft.com/en-us/dotnet/api/system.data.entity.dbcontext) to perform database operations in your test methods. In this case, you can use `IDbContextProvider`service to obtain a `DbContext` instance inside a unit of work. The following example shows how you can create a `DbContext` object in a test method: diff --git a/docs/en/tutorials/book-store-with-abp-suite/index.md b/docs/en/tutorials/book-store-with-abp-suite/index.md index 9a2f9372b7..204380bdf0 100644 --- a/docs/en/tutorials/book-store-with-abp-suite/index.md +++ b/docs/en/tutorials/book-store-with-abp-suite/index.md @@ -46,4 +46,4 @@ This tutorial is organized as the following parts: ### Download the Source Code -After logging in to the ABP website, you can download the source code from [here](https://abp.io/api/download/samples/suite-bookstore-mvc-ef). \ No newline at end of file +After logging in to the ABP website, you can download the source code from [here](https://abp.io/api/download/samples/bookstore-mvc-ef). diff --git a/docs/en/tutorials/book-store/part-02.md b/docs/en/tutorials/book-store/part-02.md index 750808fe4d..1fe21c2848 100644 --- a/docs/en/tutorials/book-store/part-02.md +++ b/docs/en/tutorials/book-store/part-02.md @@ -315,7 +315,7 @@ This is a fully working, server side paged, sorted and localized table of books. ## Install NPM packages -> Notice: This tutorial is based on the ABP v3.1.0+ If your project version is older, then please upgrade your solution. Check the [migration guide](../../framework/ui/angular/migration-guide-v3.md) if you are upgrading an existing project with v2.x. +> Notice: This tutorial is based on the ABP v9.3.0+ If your project version is older, then please upgrade your solution. Check the [migration guide](../../framework/ui/angular/migration-guide-v3.md) if you are upgrading an existing project with v2.x. If you haven't done it before, open a new command line interface (terminal window) and go to your `angular` folder and then run the `yarn` command to install the NPM packages: @@ -330,69 +330,42 @@ It's time to create something visible and usable! There are some tools that we w - [Ng Bootstrap](https://ng-bootstrap.github.io/#/home) will be used as the UI component library. - [Ngx-Datatable](https://swimlane.gitbook.io/ngx-datatable/) will be used as the datatable library. -Run the following command line to create a new module, named `BookModule` in the root folder of the angular application: +Run the following command line to create a new component, named `BookComponent` in the root folder of the angular application: ```bash -yarn ng generate module book --module app --routing --route books +yarn ng generate component book ``` This command should produce the following output: ````bash -> yarn ng generate module book --module app --routing --route books - -yarn run v1.19.1 -$ ng generate module book --module app --routing --route books -CREATE src/app/book/book-routing.module.ts (336 bytes) -CREATE src/app/book/book.module.ts (335 bytes) -CREATE src/app/book/book.component.html (19 bytes) -CREATE src/app/book/book.component.spec.ts (614 bytes) -CREATE src/app/book/book.component.ts (268 bytes) +> yarn ng generate component book + +yarn run v1.22.22 +$ ng generate component book +CREATE src/app/book/book.component.spec.ts (537 bytes) +CREATE src/app/book/book.component.ts (189 bytes) CREATE src/app/book/book.component.scss (0 bytes) -UPDATE src/app/app-routing.module.ts (1289 bytes) +CREATE src/app/book/book.component.html (20 bytes) Done in 3.88s. ```` -### BookModule - -Open the `/src/app/book/book.module.ts` and replace the content as shown below: - -````js -import { NgModule } from '@angular/core'; -import { SharedModule } from '../shared/shared.module'; -import { BookRoutingModule } from './book-routing.module'; -import { BookComponent } from './book.component'; - -@NgModule({ - declarations: [BookComponent], - imports: [ - BookRoutingModule, - SharedModule - ] -}) -export class BookModule { } - -```` - -* Added the `SharedModule`. `SharedModule` exports some common modules needed to create user interfaces. -* `SharedModule` already exports the `CommonModule`, so we've removed the `CommonModule`. - ### Routing -The generated code places the new route definition to the `src/app/app-routing.module.ts` file as shown below: +The generated code places the new route definition to the `src/app/app.routes.ts` file as shown below: ````js -const routes: Routes = [ +export const routes: Routes = [ // other route definitions... - { path: 'books', loadChildren: () => import('./book/book.module').then(m => m.BookModule) }, + { path : 'books', loadComponent: () => import('./book/book.component').then(c => c.BookComponent) }, ]; ```` Now, open the `src/app/route.provider.ts` file and replace the `configureRoutes` function declaration as shown below: ```js -function configureRoutes(routes: RoutesService) { - return () => { +function configureRoutes() { + const routes = inject(RoutesService); routes.add([ { path: '/', @@ -416,7 +389,6 @@ function configureRoutes(routes: RoutesService) { }, ]); }; -} ``` `RoutesService` is a service provided by the ABP to configure the main menu and the routes. @@ -497,7 +469,7 @@ Open the `/src/app/book/book.component.html` and replace the content as shown be
- + {%{{{ '::Enum:BookType.' + row.type | abpLocalization }}}%} diff --git a/docs/en/tutorials/book-store/part-03.md b/docs/en/tutorials/book-store/part-03.md index 546b4a743d..a2bac2110e 100644 --- a/docs/en/tutorials/book-store/part-03.md +++ b/docs/en/tutorials/book-store/part-03.md @@ -742,8 +742,8 @@ export class BookComponent implements OnInit { * Imported `FormGroup`, `FormBuilder` and `Validators` from `@angular/forms`. * Added a `form: FormGroup` property. * Added a `bookTypes` property as a list of `BookType` enum members. That will be used in form options. -* Injected with the `FormBuilder` inject function.. [FormBuilder](https://angular.io/api/forms/FormBuilder) provides convenient methods for generating form controls. It reduces the amount of boilerplate needed to build complex forms. -* Added a `buildForm` method to the end of the file and executed the `buildForm()` in the `createBook` method. +* Injected the `FormBuilder` with the inject function. [FormBuilder](https://angular.io/api/forms/FormBuilder) provides convenient methods for generating form controls. It reduces the amount of boilerplate that is needed to build complex forms. +* Added a `buildForm` method at the end of the file and executed the `buildForm()` in the `createBook` method. * Added a `save` method. Open `/src/app/book/book.component.html` and replace ` ` with the following code part: @@ -765,7 +765,11 @@ Open `/src/app/book/book.component.html` and replace ` Type *
@@ -804,46 +808,24 @@ Also replace ` ` with the following code p We've used [NgBootstrap datepicker](https://ng-bootstrap.github.io/#/components/datepicker/overview) in this component. So, we need to arrange the dependencies related to this component. -Open `/src/app/book/book.module.ts` and replace the content as below: - -```js -import { NgModule } from '@angular/core'; -import { SharedModule } from '../shared/shared.module'; -import { BookRoutingModule } from './book-routing.module'; -import { BookComponent } from './book.component'; -import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap'; // add this line - -@NgModule({ - declarations: [BookComponent], - imports: [ - BookRoutingModule, - SharedModule, - NgbDatepickerModule, // add this line - ] -}) -export class BookModule { } -``` - -* We imported `NgbDatepickerModule` to be able to use the date picker. - Open `/src/app/book/book.component.ts` and replace the content as below: ```js import { ListService, PagedResultDto } from '@abp/ng.core'; import { Component, OnInit, inject } from '@angular/core'; import { BookService, BookDto, bookTypeOptions } from '@proxy/books'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; - -// added this line -import { NgbDateNativeAdapter, NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap'; +import { FormGroup, FormBuilder, Validators, ReactiveFormsModule } from '@angular/forms'; +import { NgbDateNativeAdapter, NgbDateAdapter, NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap'; +import { ThemeSharedModule } from '@abp/ng.theme.shared'; @Component({ selector: 'app-book', templateUrl: './book.component.html', styleUrls: ['./book.component.scss'], + imports: [ThemeSharedModule, ReactiveFormsModule, NgbDatepickerModule], providers: [ ListService, - { provide: NgbDateAdapter, useClass: NgbDateNativeAdapter } // add this line + { provide: NgbDateAdapter, useClass: NgbDateNativeAdapter } ], }) export class BookComponent implements OnInit { diff --git a/docs/en/tutorials/book-store/part-05.md b/docs/en/tutorials/book-store/part-05.md index b7b05103c9..3db00ea423 100644 --- a/docs/en/tutorials/book-store/part-05.md +++ b/docs/en/tutorials/book-store/part-05.md @@ -311,23 +311,19 @@ We've only added the `.RequirePermissions(BookStorePermissions.Books.Default)` e First step of the UI is to prevent unauthorized users to see the "Books" menu item and enter to the book management page. -Open the `/src/app/book/book-routing.module.ts` and replace with the following content: +Open the `/src/app/app.routes.ts` and replace with the following content: ````js -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; import { authGuard, permissionGuard } from '@abp/ng.core'; import { BookComponent } from './book.component'; const routes: Routes = [ - { path: '', component: BookComponent, canActivate: [authGuard, permissionGuard] }, +{ + path: 'books', + loadComponent: () => import('./book/book.component').then(c => BookComponent), + canActivate: [authGuard, permissionGuard], +}, ]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class BookRoutingModule {} ```` * Imported `authGuard` and `permissionGuard` from the `@abp/ng.core`. diff --git a/docs/en/tutorials/book-store/part-09.md b/docs/en/tutorials/book-store/part-09.md index c30b018494..b70fd3e875 100644 --- a/docs/en/tutorials/book-store/part-09.md +++ b/docs/en/tutorials/book-store/part-09.md @@ -477,49 +477,43 @@ That's all! You can run the application and try to edit an author. ## The Author Management Page -Run the following command line to create a new module, named `AuthorModule` in the root folder of the angular application: +Run the following command line to create a new component, named `AuthorComponent` in the root folder of the angular application: ```bash -yarn ng generate module author --module app --routing --route authors +yarn ng generate component author ``` This command should produce the following output: ```bash -> yarn ng generate module author --module app --routing --route authors +> yarn ng generate component author yarn run v1.19.1 -$ ng generate module author --module app --routing --route authors -CREATE src/app/author/author-routing.module.ts (344 bytes) -CREATE src/app/author/author.module.ts (349 bytes) +$ yarn ng generate component author CREATE src/app/author/author.component.html (21 bytes) CREATE src/app/author/author.component.spec.ts (628 bytes) CREATE src/app/author/author.component.ts (276 bytes) CREATE src/app/author/author.component.scss (0 bytes) -UPDATE src/app/app-routing.module.ts (1396 bytes) Done in 2.22s. ``` -### AuthorModule +### Author Component -Open the `/src/app/author/author.module.ts` and replace the content as shown below: +Open the `/src/app/author/author.component.ts` and replace the content as shown below: ```js -import { NgModule } from '@angular/core'; -import { SharedModule } from '../shared/shared.module'; -import { AuthorRoutingModule } from './author-routing.module'; -import { AuthorComponent } from './author.component'; +import { Component } from '@angular/core'; import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap'; -@NgModule({ - declarations: [AuthorComponent], - imports: [SharedModule, AuthorRoutingModule, NgbDatepickerModule], +@Component({ + selector: 'app-author', + templateUrl: './author.component.html', + styleUrls: ['./author.component.scss'], + imports: [NgbDatepickerModule], }) -export class AuthorModule {} +export class AuthorComponent {} ``` -- Added the `SharedModule`. `SharedModule` exports some common modules needed to create user interfaces. -- `SharedModule` already exports the `CommonModule`, so we've removed the `CommonModule`. - Added `NgbDatepickerModule` that will be used later on the author create and edit forms. ### Menu Definition @@ -753,13 +747,13 @@ Open the `/src/app/author/author.component.html` and replace the content as belo - + {%{{{ row.birthDate | date }}}%} - + diff --git a/docs/en/tutorials/book-store/part-10.md b/docs/en/tutorials/book-store/part-10.md index 5e0235ad14..e03ada5a96 100644 --- a/docs/en/tutorials/book-store/part-10.md +++ b/docs/en/tutorials/book-store/part-10.md @@ -970,7 +970,7 @@ Book list page change is trivial. Open the `/src/app/book/book.component.html` a [name]="'::Author' | abpLocalization" prop="authorName" [sortable]="false" -> +/> ```` When you run the application, you can see the *Author* column on the table: @@ -1098,9 +1098,11 @@ Open the `/src/app/book/book.component.html` and add the following form group ju * ```` diff --git a/docs/en/tutorials/microservice/index.md b/docs/en/tutorials/microservice/index.md index 938d9b9108..7f6dc734f3 100644 --- a/docs/en/tutorials/microservice/index.md +++ b/docs/en/tutorials/microservice/index.md @@ -45,7 +45,7 @@ This tutorial is organized as the following parts: ## Download the Source Code -After logging in to the ABP website, you can download the source code from {{if UI == "MVC"}} [here](https://abp.io/api/download/samples/cloud-crm-mvc-ef) {{else if UI == "NG"}} [here](https://abp.io/api/download/samples/cloud-crm-ng-ef) {{else if UI == "Blazor"}} [here](https://abp.io/api/download/samples/cloud-crm-blazor-wasm-ef) {{else if UI == "BlazorServer"}} [here](https://abp.io/api/download/samples/cloud-crm-blazor-server-ef) {{else if UI == "BlazorWebApp"}} [here](https://abp.io/api/download/samples/cloud-crm-blazor-webapp-ef) {{end}}. +After logging in to the ABP website, you can download the source code from {{if UI == "MVC"}} [here](https://abp.io/api/download/samples/cloud-crm-mvc-ef) {{else if UI == "NG"}} [here](https://abp.io/api/download/samples/cloud-crm-angular-ef) {{else if UI == "Blazor"}} [here](https://abp.io/api/download/samples/cloud-crm-blazor-wasm-ef) {{else if UI == "BlazorServer"}} [here](https://abp.io/api/download/samples/cloud-crm-blazor-server-ef) {{else if UI == "BlazorWebApp"}} [here](https://abp.io/api/download/samples/cloud-crm-blazor-webapp-ef) {{end}}. ## See Also diff --git a/docs/en/tutorials/microservice/part-01.md b/docs/en/tutorials/microservice/part-01.md index a3529019a5..7006226e21 100644 --- a/docs/en/tutorials/microservice/part-01.md +++ b/docs/en/tutorials/microservice/part-01.md @@ -25,7 +25,7 @@ } ```` -Follow the *[Get Started](../../get-started/microservice.md)* guide to create a new layered web application with the following configurations: +Follow the *[Get Started](../../get-started/microservice.md)* guide to create a new microservice solution with the following configurations: * **Solution name**: `CloudCrm` {{if DB == "EF"}} @@ -82,4 +82,4 @@ You can see the *[Microservice Solution Template](../../solution-templates/micro ## Summary -In this part, you've created the initial microservice solution, which already contains a few infrastructure services. We will create our first business service in the [next part](part-02.md). \ No newline at end of file +In this part, you've created the initial microservice solution, which already contains a few infrastructure services. We will create our first business service in the [next part](part-02.md). diff --git a/docs/en/tutorials/microservice/part-05.md b/docs/en/tutorials/microservice/part-05.md index 24da71a716..29727700e8 100644 --- a/docs/en/tutorials/microservice/part-05.md +++ b/docs/en/tutorials/microservice/part-05.md @@ -628,7 +628,7 @@ export const APP_ROUTES: Routes = [ // ... { path: 'order-service', - children: ORDER_SERVICE_ROUTES, + loadChildren: () => import('ordering-service').then(c =>c.ORDER_SERVICE_ROUTES), }, ]; ``` @@ -636,12 +636,8 @@ export const APP_ROUTES: Routes = [ ```typescript // order-service.routes.ts export const ORDER_SERVICE_ROUTES: Routes = [ - { - path: '', - pathMatch: 'full', - component: RouterOutletComponent, - }, - { path: 'orders', children: ORDER_ROUTES }, + { path: 'orders', loadComponent: () => import('./order/order.component').then(c => c.OrderComponent) }, + { path: '**', redirectTo: 'orders' } ]; ``` @@ -657,17 +653,16 @@ import { OrderDto, OrderService } from './proxy/ordering-service/services'; @Component({ selector: 'lib-order', templateUrl: './order.component.html', - styleUrl: './order.component.css' + styleUrl: './order.component.css', imports: [CommonModule] }) export class OrderComponent { items: OrderDto[] = []; - - private readonly proxy = inject(OrderService); + private readonly orderService = inject(OrderService); constructor() { - this.proxy.getList().subscribe((res) => { + this.orderService.getList().subscribe((res) => { this.items = res; }); } @@ -686,11 +681,13 @@ export class OrderComponent { Product Id Customer Name - - {%{{{item.id}}}%} - {%{{{item.productId}}}%} - {%{{{item.customerName}}}%} - + @for (item of items; track item.id) { + + {%{{{item.id}}}%} + {%{{{item.productId}}}%} + {%{{{item.customerName}}}%} + + } diff --git a/docs/en/tutorials/microservice/part-06.md b/docs/en/tutorials/microservice/part-06.md index bf54602936..a694631979 100644 --- a/docs/en/tutorials/microservice/part-06.md +++ b/docs/en/tutorials/microservice/part-06.md @@ -314,11 +314,13 @@ Open the `order.component.html` file (the `order.component.html` file under the Product Name Customer Name - - {%{{{item.id}}}%} - {%{{{item.productName}}}%} - {%{{{item.customerName}}}%} - + @for (item of items; track item.id) { + + {%{{{item.id}}}%} + {%{{{item.productName}}}%} + {%{{{item.customerName}}}%} + + } diff --git a/docs/en/tutorials/todo/layered/index.md b/docs/en/tutorials/todo/layered/index.md index 08c463e81c..632168c4b3 100644 --- a/docs/en/tutorials/todo/layered/index.md +++ b/docs/en/tutorials/todo/layered/index.md @@ -139,7 +139,7 @@ Ensure the `TodoApp.HttpApi.Host` project is the startup project, then run the a ![todo-swagger-ui-initial](../images/todo-swagger-ui-initial.png) -You can explore and test your HTTP API with this UI. Now, we can set the `TodoApp.Blazor` as the startup project and run it to open the actual Blazor application UI: +You can explore and test your HTTP API with this UI. Now, we can set the {{if UI=="Blazor"}}`TodoApp.Blazor`{{else if UI=="MAUIBlazor"}}`TodoApp.MauiBlazor`{{end}} as the startup project and run it to open the actual Blazor application UI: {{else if UI=="NG"}} @@ -577,7 +577,11 @@ If you open the [Swagger UI](https://swagger.io/tools/swagger-ui/) by entering t ### Index.razor.cs -Open the `Index.razor.cs` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}} *TodoApp.Blazor.Client* {{else if UI=="BlazorServer"}} *TodoApp.Blazor* {{else if UI=="MAUIBlazor"}} *TodoApp.MauiBlazor* {{end}} project and replace the content with the following code block: +Open the `Index.razor.cs` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}} `TodoApp.Blazor.Client` {{else if UI=="BlazorServer"}} `TodoApp.Blazor` {{else if UI=="MAUIBlazor"}} `TodoApp.MauiBlazor` {{end}} project and replace the content with the following code block: + +{{if UI=="MAUIBlazor"}} +_(Create this file if it doesn't exist)_ +{{end}} ```csharp using Microsoft.AspNetCore.Components; @@ -756,45 +760,46 @@ We can then use `todoService` to use the server-side HTTP APIs, as we'll do in t Open the `/angular/src/app/home/home.component.ts` file and replace its content with the following code block: -```js +```ts +import {Component, inject, OnInit} from '@angular/core'; +import {FormsModule} from '@angular/forms'; import { ToasterService } from '@abp/ng.theme.shared'; -import { Component, OnInit, inject } from '@angular/core'; import { TodoItemDto, TodoService } from '@proxy'; @Component({ - selector: 'app-home', - standalone: false, - templateUrl: './home.component.html', - styleUrls: ['./home.component.scss'] + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'], + imports: [FormsModule] }) export class HomeComponent implements OnInit { - todoItems: TodoItemDto[]; - newTodoText: string; + todoItems: TodoItemDto[]; + newTodoText: string; + readonly todoService = inject(TodoService); + readonly toasterService = inject(ToasterService); - private readonly todoService = inject(TodoService); - private readonly toasterService = inject(ToasterService); + ngOnInit(): void { + this.todoService.getList().subscribe(response => { + this.todoItems = response; + }); + } - ngOnInit(): void { - this.todoService.getList().subscribe(response => { - this.todoItems = response; - }); - } - - create(): void { - this.todoService.create(this.newTodoText).subscribe((result) => { - this.todoItems = this.todoItems.concat(result); - this.newTodoText = null; - }); - } + create(): void{ + this.todoService.create(this.newTodoText).subscribe((result) => { + this.todoItems = this.todoItems.concat(result); + this.newTodoText = null; + }); + } - delete(id: string): void { - this.todoService.delete(id).subscribe(() => { - this.todoItems = this.todoItems.filter(item => item.id !== id); - this.toasterService.info('Deleted the todo item.'); - }); - } + delete(id: string): void { + this.todoService.delete(id).subscribe(() => { + this.todoItems = this.todoItems.filter(item => item.id !== id); + this.toasterService.info('Deleted the todo item.'); + }); + } } + ``` We've used `todoService` to get the list of todo items and assigned the returning value to the `todoItems` array. We've also added `create` and `delete` methods. These methods will be used on the view side. @@ -805,31 +810,35 @@ Open the `/angular/src/app/home/home.component.html` file and replace its conten ```html
-
-
-
TODO LIST
-
-
- -
-
-
- -
+
+
+
TODO LIST
-
- +
+ + +
+
+ +
+
+
+ +
+ + + +
    + @for (todoItem of todoItems; track todoItem.id) { +
  • + {%{{{ todoItem.text }}}%} +
  • + } +
- - -
    -
  • - {%{{{ todoItem.text }}}%} -
  • -
-
+ ``` ### home.component.scss diff --git a/docs/en/tutorials/todo/single-layer/index.md b/docs/en/tutorials/todo/single-layer/index.md index 16206b9bd7..1452462dcd 100644 --- a/docs/en/tutorials/todo/single-layer/index.md +++ b/docs/en/tutorials/todo/single-layer/index.md @@ -567,7 +567,7 @@ If you open [Swagger UI](https://swagger.io/tools/swagger-ui/) by entering the ` ### Index.razor.cs -Open the `Index.razor.cs` file in the `Pages` folder{{if UI=="Blazor"}} in your `Todo.Blazor` project{{end}} and replace the content with the following code block: +Open the `Index.razor.cs` file in the {{if UI=="BlazorServer"}}`Components/Pages` {{else}} `Pages` {{end}} folder{{if UI=="Blazor"}} in your `Todo.Blazor` project{{end}} and replace the content with the following code block: ```csharp {{if UI=="Blazor"}} @@ -580,7 +580,11 @@ using TodoApp.Services; using TodoApp.Services.Dtos; {{end}} +{{if UI=="Blazor"}} namespace TodoApp.Pages; +{{else}} +namespace TodoApp.Components.Pages; +{{end}} public partial class Index { @@ -615,7 +619,7 @@ This class uses the {{if UI=="Blazor"}}`ITodoAppService`{{else}}`TodoAppService` ### Index.razor -Open the `Index.razor` file in the `Pages` folder and replace the content with the following code block: +Open the `Index.razor` file in the {{if UI=="BlazorServer"}}`Components/Pages`{{else}}`Pages`{{end}} folder and replace the content with the following code block: ```xml @page "/" @@ -658,7 +662,7 @@ Open the `Index.razor` file in the `Pages` folder and replace the content with t ### Index.razor.css -As the final touch, open the `Index.razor.css` file in the `Pages` folder and add the following code block at the end of the file: +As the final touch, open the `Index.razor.css` file in the {{if UI=="BlazorServer"}}`Components/Pages`{{else}}`Pages`{{end}} folder and add the following code block at the end of the file: ````css #TodoList{ @@ -724,43 +728,43 @@ Then, we can use the `TodoService` to use the server-side HTTP APIs, as we'll do Open the `/angular/src/app/home/home.component.ts` file and replace its content with the following code block: ```ts -import { ToasterService } from "@abp/ng.theme.shared"; -import { Component, OnInit, inject } from '@angular/core'; -import { TodoItemDto } from "@proxy/services/dtos"; -import { TodoService } from "@proxy/services"; +import {Component, inject, OnInit} from '@angular/core'; +import {FormsModule} from '@angular/forms'; +import { ToasterService } from '@abp/ng.theme.shared'; +import { TodoItemDto, TodoService } from '@proxy'; @Component({ - selector: 'app-home', - templateUrl: './home.component.html', - styleUrls: ['./home.component.scss'], + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'], + imports: [FormsModule] }) export class HomeComponent implements OnInit { - todoItems: TodoItemDto[]; - newTodoText: string; + todoItems: TodoItemDto[]; + newTodoText: string; + readonly todoService = inject(TodoService); + readonly toasterService = inject(ToasterService); - private readonly todoService = inject(TodoService); - private readonly toasterService = inject(ToasterService); + ngOnInit(): void { + this.todoService.getList().subscribe(response => { + this.todoItems = response; + }); + } - ngOnInit(): void { - this.todoService.getList().subscribe(response => { - this.todoItems = response; - }); - } - - create(): void { - this.todoService.create(this.newTodoText).subscribe((result) => { - this.todoItems = this.todoItems.concat(result); - this.newTodoText = null; - }); - } + create(): void{ + this.todoService.create(this.newTodoText).subscribe((result) => { + this.todoItems = this.todoItems.concat(result); + this.newTodoText = null; + }); + } - delete(id: string): void { - this.todoService.delete(id).subscribe(() => { - this.todoItems = this.todoItems.filter(item => item.id !== id); - this.toasterService.info('Deleted the todo item.'); - }); - } + delete(id: string): void { + this.todoService.delete(id).subscribe(() => { + this.todoItems = this.todoItems.filter(item => item.id !== id); + this.toasterService.info('Deleted the todo item.'); + }); + } } ``` @@ -772,30 +776,33 @@ Open the `/angular/src/app/home/home.component.html` file and replace its conten ````html
-
-
-
TODO LIST
-
-
- -
-
-
- -
+
+
+
TODO LIST
-
- +
+ + +
+
+ +
+
+
+ +
+ + + +
    + @for (todoItem of todoItems; track todoItem.id) { +
  • + {%{{{ todoItem.text }}}%} +
  • + } +
- - -
    -
  • - {%{{{ todoItem.text }}}%} -
  • -
-
```` diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo/Abp/AspNetCore/Mvc/NewtonsoftJson/AbpAspNetCoreMvcNewtonsoftModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo/Abp/AspNetCore/Mvc/NewtonsoftJson/AbpAspNetCoreMvcNewtonsoftModule.cs index 95e07a06e0..214b866197 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo/Abp/AspNetCore/Mvc/NewtonsoftJson/AbpAspNetCoreMvcNewtonsoftModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.NewtonsoftJson/Volo/Abp/AspNetCore/Mvc/NewtonsoftJson/AbpAspNetCoreMvcNewtonsoftModule.cs @@ -13,7 +13,7 @@ public class AbpAspNetCoreMvcNewtonsoftModule : AbpModule { context.Services.AddMvcCore().AddNewtonsoftJson(); - context.Services.AddOptions() + context.Services.AddAbpOptions() .Configure((options, rootServiceProvider) => { options.SerializerSettings.ContractResolver = diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelper.cs index dbcf84437f..d129007d50 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelper.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Razor.TagHelpers; @@ -14,6 +15,8 @@ public class AbpSelectTagHelper : AbpTagHelper? AspItems { get; set; } public AbpFormControlSize Size { get; set; } = AbpFormControlSize.Default; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index 248a217495..eab2944002 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions; using Volo.Abp.Localization; +using Volo.Abp.Reflection; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; @@ -169,7 +170,9 @@ public class AbpSelectTagHelperService : AbpTagHelperService private bool IsEnum() { var value = TagHelper.AspFor.Model; - return (value != null && value.GetType().IsEnum) || TagHelper.AspFor.ModelExplorer.Metadata.IsEnum; + return (value != null && value.GetType().IsEnum) || + TagHelper.AspFor.ModelExplorer.Metadata.IsEnum || + (TagHelper.EnumType != null && TypeHelper.IsNullableEnum(TagHelper.EnumType)); } protected virtual async Task GetLabelAsHtmlAsync(TagHelperContext context, TagHelperOutput output, TagHelperOutput selectTag) @@ -258,19 +261,20 @@ public class AbpSelectTagHelperService : AbpTagHelperService protected virtual List GetSelectItemsFromEnum(TagHelperContext context, TagHelperOutput output, ModelExplorer explorer) { + var enumType = TagHelper.EnumType ?? explorer.ModelType; + var selectItems = new List(); - var isNullableType = Nullable.GetUnderlyingType(explorer.ModelType) != null; - var enumType = explorer.ModelType; + var isNullableType = Nullable.GetUnderlyingType(enumType!) != null; if (isNullableType) { - enumType = Nullable.GetUnderlyingType(explorer.ModelType)!; + enumType = Nullable.GetUnderlyingType(enumType!)!; selectItems.Add(new SelectListItem()); } var containerLocalizer = _tagHelperLocalizer.GetLocalizerOrNull(explorer.Container.ModelType.Assembly); - foreach (var enumValue in enumType.GetEnumValuesAsUnderlyingType()) + foreach (var enumValue in enumType!.GetEnumValuesAsUnderlyingType()) { var localizedMemberName = _abpEnumLocalizer.GetString(enumType, enumValue, new[] @@ -306,7 +310,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService }; var innerOutput = await labelTagHelper.ProcessAndGetOutputAsync(new TagHelperAttributeList { { "class", "form-label" } }, context, "label", TagMode.StartTagAndEndTag); - + innerOutput.Content.AppendHtml(GetRequiredSymbol(context, output)); return innerOutput.Render(_encoder); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs index d4d1b796ee..62b86bc1c5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs @@ -88,6 +88,16 @@ public static class MvcUiObjectExtensionPropertyInfoExtensions ?? "text"; //default } + public static bool IsEnum(this ObjectExtensionPropertyInfo propertyInfo) + { + return propertyInfo.Type.IsEnum || TypeHelper.IsNullableEnum(propertyInfo.Type); + } + + public static bool IsNullableEnum(this ObjectExtensionPropertyInfo propertyInfo) + { + return TypeHelper.IsNullableEnum(propertyInfo.Type); + } + private static string? GetInputTypeFromAttributeOrNull(Attribute attribute) { if (attribute is EmailAddressAttribute) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs index c3fc470ed8..ad8d8c1c28 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs @@ -165,7 +165,7 @@ public class AbpAspNetCoreMvcModule : AbpModule context.Services.AddSingleton(); context.Services.TryAddEnumerable(ServiceDescriptor.Transient()); - context.Services.AddOptions() + context.Services.AddAbpOptions() .Configure((mvcOptions, serviceProvider) => { mvcOptions.AddAbp(context.Services); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs index d0ba8b98c0..554ec424bd 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs @@ -15,7 +15,8 @@ public static class ApplicationPartSorter { var orderedModuleAssemblies = moduleContainer.Modules .Select((moduleDescriptor, index) => new { moduleDescriptor.Assembly, index }) - .ToDictionary(x => x.Assembly, x => x.index); + .GroupBy(x => x.Assembly) + .ToDictionary(g => g.Key, g => g.First().index); var modulesAssemblies = moduleContainer.Modules.Select(x => x.Assembly).ToList(); var sortedTypes = partManager.ApplicationParts diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/MvcCoreBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/MvcCoreBuilderExtensions.cs index f2bac81316..89af08fd43 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/MvcCoreBuilderExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/MvcCoreBuilderExtensions.cs @@ -13,7 +13,7 @@ public static class MvcCoreBuilderExtensions { public static IMvcCoreBuilder AddAbpJson(this IMvcCoreBuilder builder) { - builder.Services.AddOptions() + builder.Services.AddAbpOptions() .Configure((options, rootServiceProvider) => { options.JsonSerializerOptions.ReadCommentHandling = JsonCommentHandling.Skip; diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionChecker.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionChecker.cs index 7e7457b753..4a5e48c220 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionChecker.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionChecker.cs @@ -48,7 +48,7 @@ public class PermissionChecker : IPermissionChecker, ITransientDependency { return false; } - + if (!permission.IsEnabled) { return false; @@ -92,12 +92,12 @@ public class PermissionChecker : IPermissionChecker, ITransientDependency return isGranted; } - public async Task IsGrantedAsync(string[] names) + public virtual async Task IsGrantedAsync(string[] names) { return await IsGrantedAsync(PrincipalAccessor.Principal, names); } - public async Task IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, string[] names) + public virtual async Task IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, string[] names) { Check.NotNull(names, nameof(names)); @@ -146,16 +146,27 @@ public class PermissionChecker : IPermissionChecker, ITransientDependency claimsPrincipal); var multipleResult = await provider.CheckAsync(context); - foreach (var grantResult in multipleResult.Result.Where(grantResult => - result.Result.ContainsKey(grantResult.Key) && - result.Result[grantResult.Key] == PermissionGrantResult.Undefined && - grantResult.Value != PermissionGrantResult.Undefined)) + + foreach (var grantResult in multipleResult.Result.Where(x => result.Result.ContainsKey(x.Key))) { - result.Result[grantResult.Key] = grantResult.Value; - permissionDefinitions.RemoveAll(x => x.Name == grantResult.Key); + switch (grantResult.Value) + { + case PermissionGrantResult.Granted: + { + if (result.Result[grantResult.Key] != PermissionGrantResult.Prohibited) + { + result.Result[grantResult.Key] = PermissionGrantResult.Granted; + } + break; + } + case PermissionGrantResult.Prohibited: + result.Result[grantResult.Key] = PermissionGrantResult.Prohibited; + permissionDefinitions.RemoveAll(x => x.Name == grantResult.Key); + break; + } } - if (result.AllGranted || result.AllProhibited) + if (result.AllProhibited) { break; } diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs index ce4dc1e189..f1e266b745 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs +++ b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs @@ -2,7 +2,6 @@ using AutoMapper; using AutoMapper.Internal; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Volo.Abp.Auditing; using Volo.Abp.Modularity; @@ -41,7 +40,7 @@ public class AbpAutoMapperModule : AbpModule configurator(autoMapperConfigurationContext); } - var mapperConfiguration = new MapperConfiguration(mapperConfigurationExpression, sp.GetRequiredService()); + var mapperConfiguration = new MapperConfiguration(mapperConfigurationExpression); foreach (var profileType in options.ValidatingProfiles) { diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs index fa4994e2f9..3026682f62 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs @@ -218,6 +218,11 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions ?? typeof(TextExtensionProperty<,>); //default } + public static bool IsEnum(this ObjectExtensionPropertyInfo propertyInfo) + { + return propertyInfo.Type.IsEnum || TypeHelper.IsNullableEnum(propertyInfo.Type); + } + private static Type? GetInputTypeFromAttributeOrNull(Attribute attribute) { var hasTextEditSupport = TextEditSupportedAttributeTypes.Any(t => t == attribute.GetType()); diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor index f97b8bac0b..b483288b2e 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor @@ -9,7 +9,7 @@ { if (!propertyInfo.Name.EndsWith("_Text")) { - if (propertyInfo.Type.IsEnum) + if (propertyInfo.IsEnum()) { } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor.cs index 27f69f3ba4..b840119d18 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/ExtensionProperties.razor.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Immutable; +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; @@ -29,8 +30,13 @@ public partial class ExtensionProperties : Component public ImmutableList Properties { get; set; } = ImmutableList.Empty; - protected async override Task OnInitializedAsync() + protected override async Task OnInitializedAsync() { - Properties = await ObjectExtensionManager.Instance.GetPropertiesAndCheckPolicyAsync(ServiceProvider); + Properties = + (await ObjectExtensionManager.Instance.GetPropertiesAndCheckPolicyAsync(ServiceProvider)) + .Where(p => ModalType == ExtensionPropertyModalType.CreateModal + ? p.UI.CreateModal.IsVisible + : p.UI.EditModal.IsVisible) + .ToImmutableList(); } } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor.cs index 0dedaf3486..dec24710ec 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Localization; +using System; +using Microsoft.Extensions.Localization; using System.Collections.Generic; using Volo.Abp.Data; @@ -7,23 +8,35 @@ namespace Volo.Abp.BlazoriseUI.Components.ObjectExtending; public partial class SelectExtensionProperty where TEntity : IHasExtraProperties { - protected List> SelectItems = new(); + protected List> SelectItems = new(); - public int SelectedValue { - get { return Entity.GetProperty(PropertyInfo.Name); } + public int? SelectedValue { + get + { + return Entity.GetProperty(PropertyInfo.Name, Nullable.GetUnderlyingType(PropertyInfo.Type!) != null ? null : 0); + } set { Entity.SetProperty(PropertyInfo.Name, value, false); } } - protected virtual List> GetSelectItemsFromEnum() + protected virtual List> GetSelectItemsFromEnum() { - var selectItems = new List>(); + var selectItems = new List>(); + + var isNullableType = Nullable.GetUnderlyingType(PropertyInfo.Type!) != null; + var enumType = isNullableType + ? Nullable.GetUnderlyingType(PropertyInfo.Type)! + : PropertyInfo.Type; - foreach (var enumValue in PropertyInfo.Type.GetEnumValues()) + if (isNullableType) { - selectItems.Add(new SelectItem + selectItems.Add(new SelectItem()); + } + foreach (var enumValue in enumType.GetEnumValues()) + { + selectItems.Add(new SelectItem { Value = (int)enumValue, - Text = AbpEnumLocalizer.GetString(PropertyInfo.Type, enumValue, new []{ StringLocalizerFactory.CreateDefaultOrNull() }) + Text = AbpEnumLocalizer.GetString(enumType, enumValue, new []{ StringLocalizerFactory.CreateDefaultOrNull() }) }); } @@ -37,7 +50,14 @@ public partial class SelectExtensionProperty if (!Entity.HasProperty(PropertyInfo.Name)) { - SelectedValue = (int)PropertyInfo.Type.GetEnumValues().GetValue(0)!; + var isNullableType = Nullable.GetUnderlyingType(PropertyInfo.Type!) != null; + if (!isNullableType) + { + var enumType = isNullableType + ? Nullable.GetUnderlyingType(PropertyInfo.Type)! + : PropertyInfo.Type; + SelectedValue = (int)enumType.GetEnumValues().GetValue(0)!; + } } } } diff --git a/framework/src/Volo.Abp.BlobStoring.Bunny/Volo.Abp.BlobStoring.Bunny.csproj b/framework/src/Volo.Abp.BlobStoring.Bunny/Volo.Abp.BlobStoring.Bunny.csproj index f6b3713761..6881925027 100644 --- a/framework/src/Volo.Abp.BlobStoring.Bunny/Volo.Abp.BlobStoring.Bunny.csproj +++ b/framework/src/Volo.Abp.BlobStoring.Bunny/Volo.Abp.BlobStoring.Bunny.csproj @@ -21,6 +21,7 @@ + diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionOptionsExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionOptionsExtensions.cs new file mode 100644 index 0000000000..43230c4dbb --- /dev/null +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionOptionsExtensions.cs @@ -0,0 +1,22 @@ +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Options; +using Volo.Abp.Options; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class ServiceCollectionOptionsExtensions +{ + /// + /// You should only use this method to register options if you need to continue using the ServiceProvider to get other options in your Options configuration method. + /// Otherwise, please use the default AddOptions method for better performance. + /// + /// + /// + /// + public static OptionsBuilder AddAbpOptions(this IServiceCollection services) + where TOptions : class + { + services.TryAddSingleton, AbpUnnamedOptionsManager>(); + return services.AddOptions(); + } +} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs index 04ea98644e..4ec967ed01 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using System.Runtime.InteropServices; using System.Threading.Tasks; using JetBrains.Annotations; using Microsoft.Extensions.Configuration; @@ -200,7 +201,13 @@ public abstract class AbpApplicationBase : IAbpApplication using var scope = ServiceProvider.CreateScope(); var abpHostEnvironment = scope.ServiceProvider.GetRequiredService(); var configuration = scope.ServiceProvider.GetRequiredService(); - return abpHostEnvironment.IsDevelopment() && configuration.GetValue("Abp:Telemetry:IsEnabled") != false; + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + return abpHostEnvironment.IsDevelopment() && configuration.GetValue("Abp:Telemetry:IsEnabled") != false; + } + + return false; } //TODO: We can extract a new class for this diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs index e01768c418..c57d51e6f2 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs @@ -114,7 +114,10 @@ internal sealed class TelemetrySolutionInfoEnricher : TelemetryActivityEventEnri } var moduleJsonFileContent = File.ReadAllText(modulePath); - using var moduleDoc = JsonDocument.Parse(moduleJsonFileContent); + using var moduleDoc = JsonDocument.Parse(moduleJsonFileContent, new JsonDocumentOptions + { + AllowTrailingCommas = true + }); if (!moduleDoc.RootElement.TryGetProperty("imports", out var imports)) { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs index 6796af7179..b37ec15d71 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs @@ -25,6 +25,8 @@ public class TelemetryActivityStorage : ITelemetryActivityStorage, ISingletonDep public TelemetryActivityStorage() { CreateDirectoryIfNotExist(); + + DeleteExistingOldInformation(); State = LoadState(); } @@ -166,6 +168,22 @@ public class TelemetryActivityStorage : ITelemetryActivityStorage, ISingletonDep } } + private static void DeleteExistingOldInformation() + { + try + { + var file = new FileInfo(TelemetryPaths.ActivityStorage); + if (file.Exists && file.CreationTime < new DateTime(2025, 12, 01)) + { + file.Delete(); + } + } + catch + { + // Ignored + } + } + private static TelemetryActivityStorageState LoadState() { try diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/ActivityPropertyNames.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/ActivityPropertyNames.cs index 924cd1dd7d..0157c61bb8 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/ActivityPropertyNames.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/ActivityPropertyNames.cs @@ -12,6 +12,7 @@ public static class ActivityPropertyNames public const string IpAddress = "IpAddress"; public const string IsFirstSession = "IsFirstSession"; public const string DeviceId = "DeviceId"; + public const string UserDeviceId = "UserDeviceId"; public const string DeviceLanguage = "DeviceLanguage"; public const string OperatingSystem = "OperatingSystem"; public const string CountryIsoCode = "CountryIsoCode"; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/DeviceManager.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/DeviceManager.cs index e3993886a0..393f974e98 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/DeviceManager.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Constants/DeviceManager.cs @@ -133,7 +133,7 @@ static internal class DeviceManager { try { - return GetProcessorIdForWindows(); + return GetBaseBoardSerialNumberForWindows(); } catch { @@ -142,10 +142,10 @@ static internal class DeviceManager return GetWindowsMachineUniqueId(); } - private static string GetProcessorIdForWindows() + private static string GetBaseBoardSerialNumberForWindows() { using (var managementObjectSearcher = - new System.Management.ManagementObjectSearcher("SELECT ProcessorId FROM Win32_Processor")) + new System.Management.ManagementObjectSearcher("SELECT SerialNumber FROM Win32_BaseBoard")) { using (var searcherObj = managementObjectSearcher.Get()) { @@ -156,7 +156,7 @@ static internal class DeviceManager var managementObjectEnumerator = searcherObj.GetEnumerator(); managementObjectEnumerator.MoveNext(); - return managementObjectEnumerator.Current.GetPropertyValue("ProcessorId").ToString()!; + return managementObjectEnumerator.Current.GetPropertyValue("SerialNumber").ToString()!; } } } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs index 3d35c7192a..b37760cb04 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs @@ -40,7 +40,10 @@ internal sealed class AbpStudioDetector : SoftwareDetector return null; } using var fs = new FileStream(ideStateJsonPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - using var doc = JsonDocument.Parse(fs); + using var doc = JsonDocument.Parse(fs, new JsonDocumentOptions + { + AllowTrailingCommas = true + }); return doc.RootElement.TryGetProperty("theme", out var themeElement) ? themeElement.GetString() : null; } @@ -55,7 +58,10 @@ internal sealed class AbpStudioDetector : SoftwareDetector } using var fs = new FileStream(extensionsFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - using var doc = JsonDocument.Parse(fs); + using var doc = JsonDocument.Parse(fs, new JsonDocumentOptions + { + AllowTrailingCommas = true + }); if (doc.RootElement.TryGetProperty("Extensions", out var extensionsElement) && extensionsElement.ValueKind == JsonValueKind.Array) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs index 72fda0f500..52559663c2 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs @@ -77,7 +77,10 @@ internal sealed class VisualStudioCodeDetector : SoftwareDetector { try { - using var jsonDoc = JsonDocument.Parse(File.ReadAllText(productJson)); + using var jsonDoc = JsonDocument.Parse(File.ReadAllText(productJson), new JsonDocumentOptions + { + AllowTrailingCommas = true + }); var root = jsonDoc.RootElement; if (root.TryGetProperty("version", out var versionProp)) { @@ -105,7 +108,10 @@ internal sealed class VisualStudioCodeDetector : SoftwareDetector { try { - using var json = JsonDocument.Parse( File.ReadAllText(settingsPath)); + using var json = JsonDocument.Parse( File.ReadAllText(settingsPath), new JsonDocumentOptions + { + AllowTrailingCommas = true + }); var root = json.RootElement; if (root.TryGetProperty("theme", out var themeProp)) { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Helpers/AbpPackageMetadataReader.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Helpers/AbpPackageMetadataReader.cs index f9ce98a2e5..446462c527 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Helpers/AbpPackageMetadataReader.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Helpers/AbpPackageMetadataReader.cs @@ -49,11 +49,13 @@ static internal class AbpProjectMetadataReader private static AbpProjectMetaData ReadOrCreateMetadata(string packagePath) { - var fileContent = File.ReadAllText(packagePath); var metadata = new AbpProjectMetaData(); - using var document = JsonDocument.Parse(fileContent); + using var document = JsonDocument.Parse(fileContent, new JsonDocumentOptions + { + AllowTrailingCommas = true + }); var root = document.RootElement; if (TryGetProjectId(root,out var projectId)) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/TelemetryService.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/TelemetryService.cs index 8a2e3b4382..2f684acd29 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/TelemetryService.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/TelemetryService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.DependencyInjection; using Volo.Abp.Internal.Telemetry.Activity.Contracts; using Volo.Abp.Internal.Telemetry.Constants; @@ -11,17 +12,11 @@ namespace Volo.Abp.Internal.Telemetry; public class TelemetryService : ITelemetryService, IScopedDependency { - private readonly ITelemetryActivitySender _telemetryActivitySender; - private readonly ITelemetryActivityEventBuilder _telemetryActivityEventBuilder; - private readonly ITelemetryActivityStorage _telemetryActivityStorage; + private readonly IServiceScopeFactory _serviceScopeFactory; - public TelemetryService(ITelemetryActivitySender telemetryActivitySender, - ITelemetryActivityEventBuilder telemetryActivityEventBuilder, - ITelemetryActivityStorage telemetryActivityStorage) + public TelemetryService(IServiceScopeFactory serviceScopeFactory) { - _telemetryActivitySender = telemetryActivitySender; - _telemetryActivityEventBuilder = telemetryActivityEventBuilder; - _telemetryActivityStorage = telemetryActivityStorage; + _serviceScopeFactory = serviceScopeFactory; } @@ -74,24 +69,37 @@ public class TelemetryService : ITelemetryService, IScopedDependency { _ = Task.Run(async () => { - await BuildAndSendActivityAsync(context); + using var scope = _serviceScopeFactory.CreateScope(); + + var telemetryActivityEventBuilder = scope.ServiceProvider.GetRequiredService(); + var telemetryActivityStorage = scope.ServiceProvider.GetRequiredService(); + var telemetryActivitySender = scope.ServiceProvider.GetRequiredService(); + + await BuildAndSendActivityAsync(context, + telemetryActivityEventBuilder, + telemetryActivityStorage, + telemetryActivitySender); }); return Task.CompletedTask; } - private async Task BuildAndSendActivityAsync(ActivityContext context) + private static async Task BuildAndSendActivityAsync( + ActivityContext context, + ITelemetryActivityEventBuilder telemetryActivityEventBuilder, + ITelemetryActivityStorage telemetryActivityStorage, + ITelemetryActivitySender telemetryActivitySender) { try { - var activityEvent = await _telemetryActivityEventBuilder.BuildAsync(context); + var activityEvent = await telemetryActivityEventBuilder.BuildAsync(context); if (activityEvent is null) { return; } - _telemetryActivityStorage.SaveActivity(activityEvent); - await _telemetryActivitySender.TrySendQueuedActivitiesAsync(); + telemetryActivityStorage.SaveActivity(activityEvent); + await telemetryActivitySender.TrySendQueuedActivitiesAsync(); } catch { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Options/AbpUnnamedOptionsManager.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Options/AbpUnnamedOptionsManager.cs new file mode 100644 index 0000000000..894df70e75 --- /dev/null +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Options/AbpUnnamedOptionsManager.cs @@ -0,0 +1,34 @@ +using Microsoft.Extensions.Options; + +namespace Volo.Abp.Options; + +/// +/// This Options manager is similar to Microsoft UnnamedOptionsManager but without the locking mechanism. +/// Prevent deadlocks when accessing options in multiple threads. +/// +/// +public class AbpUnnamedOptionsManager : IOptions + where TOptions : class +{ + private readonly IOptionsFactory _factory; + private TOptions? _value; + + public AbpUnnamedOptionsManager(IOptionsFactory factory) + { + _factory = factory; + } + + public TOptions Value + { + get + { + if (_value is { } value) + { + return value; + } + + _value = _factory.Create(Microsoft.Extensions.Options.Options.DefaultName); + return _value; + } + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj index a4b84d8d90..063f956379 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj @@ -22,8 +22,6 @@ - - diff --git a/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs b/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs index 518de26437..8092107395 100644 --- a/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs +++ b/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs @@ -21,17 +21,20 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling; public class DefaultExceptionToErrorInfoConverter : IExceptionToErrorInfoConverter, ITransientDependency { + protected AbpExceptionHandlingOptions ExceptionHandlingOptions { get; } protected AbpExceptionLocalizationOptions LocalizationOptions { get; } protected IStringLocalizerFactory StringLocalizerFactory { get; } protected IStringLocalizer L { get; } protected IServiceProvider ServiceProvider { get; } public DefaultExceptionToErrorInfoConverter( + IOptions exceptionHandlingOptions, IOptions localizationOptions, IStringLocalizerFactory stringLocalizerFactory, IStringLocalizer stringLocalizer, IServiceProvider serviceProvider) { + ExceptionHandlingOptions = exceptionHandlingOptions.Value; ServiceProvider = serviceProvider; StringLocalizerFactory = stringLocalizerFactory; L = stringLocalizer; @@ -327,8 +330,8 @@ public class DefaultExceptionToErrorInfoConverter : IExceptionToErrorInfoConvert { return new AbpExceptionHandlingOptions { - SendExceptionsDetailsToClients = false, - SendStackTraceToClients = true + SendExceptionsDetailsToClients = ExceptionHandlingOptions.SendExceptionsDetailsToClients, + SendStackTraceToClients = ExceptionHandlingOptions.SendStackTraceToClients }; } } diff --git a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj index 2d7c28f075..bb1acf0822 100644 --- a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj +++ b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj @@ -18,6 +18,8 @@ + + diff --git a/framework/src/Volo.Abp.Json.Newtonsoft/Volo/Abp/Json/Newtonsoft/AbpJsonNewtonsoftModule.cs b/framework/src/Volo.Abp.Json.Newtonsoft/Volo/Abp/Json/Newtonsoft/AbpJsonNewtonsoftModule.cs index ea35831d86..4b35ee5f25 100644 --- a/framework/src/Volo.Abp.Json.Newtonsoft/Volo/Abp/Json/Newtonsoft/AbpJsonNewtonsoftModule.cs +++ b/framework/src/Volo.Abp.Json.Newtonsoft/Volo/Abp/Json/Newtonsoft/AbpJsonNewtonsoftModule.cs @@ -10,7 +10,7 @@ public class AbpJsonNewtonsoftModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddOptions() + context.Services.AddAbpOptions() .Configure((options, rootServiceProvider) => { options.JsonSerializerSettings.ContractResolver = new AbpCamelCasePropertyNamesContractResolver( diff --git a/framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/AbpJsonSystemTextJsonModule.cs b/framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/AbpJsonSystemTextJsonModule.cs index 0a5066cec1..2679cca96c 100644 --- a/framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/AbpJsonSystemTextJsonModule.cs +++ b/framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/AbpJsonSystemTextJsonModule.cs @@ -15,7 +15,7 @@ public class AbpJsonSystemTextJsonModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddOptions() + context.Services.AddAbpOptions() .Configure((options, rootServiceProvider) => { // If the user hasn't explicitly configured the encoder, use the less strict encoder that does not encode all non-ASCII characters. diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiFormConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiFormConfiguration.cs index d1d041a9b1..9a95cd6481 100644 --- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiFormConfiguration.cs +++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiFormConfiguration.cs @@ -6,4 +6,9 @@ public class ExtensionPropertyUiFormConfiguration /// Default: true. /// public bool IsVisible { get; set; } = true; + + /// + /// Default: false. + /// + public bool IsReadOnly { get; set; } = false; } diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs index 9a13b17028..40b9e8feb6 100644 --- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs +++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs @@ -175,6 +175,10 @@ public static class ModuleExtensionConfigurationHelper property.DefaultValueFactory = propertyConfig.DefaultValueFactory; property.Lookup = propertyConfig.UI.Lookup; property.UI.Order = propertyConfig.UI.Order; + property.UI.CreateModal.IsVisible = propertyConfig.UI.OnCreateForm.IsVisible; + property.UI.CreateModal.IsReadOnly = propertyConfig.UI.OnCreateForm.IsReadOnly; + property.UI.EditModal.IsVisible = propertyConfig.UI.OnEditForm.IsVisible; + property.UI.EditModal.IsReadOnly = propertyConfig.UI.OnEditForm.IsReadOnly; property.Policy = propertyConfig.Policy; foreach (var configuration in propertyConfig.Configuration) { diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs index e5ed79b99e..35c40e8043 100644 --- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs +++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs @@ -90,16 +90,34 @@ public class ObjectExtensionPropertyInfo : IHasNameWithLocalizableDisplayName, I { public int Order { get; set; } + public ExtensionPropertyUICreateModal CreateModal { get; set; } + public ExtensionPropertyUIEditModal EditModal { get; set; } public ExtensionPropertyUI() { + CreateModal = new ExtensionPropertyUICreateModal(); EditModal = new ExtensionPropertyUIEditModal(); } } + public class ExtensionPropertyUICreateModal + { + /// + /// Default: true. + /// + public bool IsVisible { get; set; } = true; + + public bool IsReadOnly { get; set; } + } + public class ExtensionPropertyUIEditModal { + /// + /// Default: true. + /// + public bool IsVisible { get; set; } = true; + public bool IsReadOnly { get; set; } } } diff --git a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs index 1238d766be..d63ca833eb 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerUI; using Volo.Abp.Content; @@ -21,7 +21,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions { Func remoteStreamContentSchemaFactory = () => new OpenApiSchema() { - Type = "string", + Type = JsonSchemaType.String, Format = "binary" }; @@ -42,7 +42,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions { var authorizationUrl = new Uri($"{authority.TrimEnd('/')}{authorizationEndpoint.EnsureStartsWith('/')}"); var tokenUrl = new Uri($"{authority.TrimEnd('/')}{tokenEndpoint.EnsureStartsWith('/')}"); - + return services .AddAbpSwaggerGen() .AddSwaggerGen( @@ -62,19 +62,9 @@ public static class AbpSwaggerGenServiceCollectionExtensions } }); - options.AddSecurityRequirement(new OpenApiSecurityRequirement + options.AddSecurityRequirement(document => new OpenApiSecurityRequirement() { - { - new OpenApiSecurityScheme - { - Reference = new OpenApiReference - { - Type = ReferenceType.SecurityScheme, - Id = "oauth2" - } - }, - Array.Empty() - } + [new OpenApiSecuritySchemeReference("oauth2", document)] = [] }); setupAction?.Invoke(options); @@ -100,7 +90,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions swaggerUiOptions.ConfigObject.AdditionalItems["oidcSupportedScopes"] = scopes; swaggerUiOptions.ConfigObject.AdditionalItems["oidcDiscoveryEndpoint"] = discoveryUrl; }); - + return services .AddAbpSwaggerGen() .AddSwaggerGen( @@ -112,24 +102,15 @@ public static class AbpSwaggerGenServiceCollectionExtensions OpenIdConnectUrl = new Uri(RemoveTenantPlaceholders(discoveryUrl)) }); - options.AddSecurityRequirement(new OpenApiSecurityRequirement + options.AddSecurityRequirement(document => new OpenApiSecurityRequirement() { - { - new OpenApiSecurityScheme - { - Reference = new OpenApiReference - { - Type = ReferenceType.SecurityScheme, - Id = "oidc" - } - }, - Array.Empty() - } + [new OpenApiSecuritySchemeReference("oauth2", document)] = [] }); + setupAction?.Invoke(options); }); } - + private static string RemoveTenantPlaceholders(string url) { return url diff --git a/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleDocumentFilter.cs b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleDocumentFilter.cs index b6dc661410..8c4f06d786 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleDocumentFilter.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleDocumentFilter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using Microsoft.AspNetCore.Mvc.Abstractions; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.SwaggerGen; namespace Volo.Abp.Swashbuckle; @@ -13,7 +13,7 @@ public class AbpSwashbuckleDocumentFilter : IDocumentFilter protected virtual string[] ActionUrlPrefixes { get; set; } = new[] { "Volo." }; protected virtual string RegexConstraintPattern => @":regex\(([^()]*)\)"; - + public virtual void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context) { var actionUrls = context.ApiDescriptions @@ -28,6 +28,20 @@ public class AbpSwashbuckleDocumentFilter : IDocumentFilter swaggerDoc .Paths .RemoveAll(path => !actionUrls.Contains(path.Key)); + + var tags = new List(); + foreach (var path in swaggerDoc.Paths) + { + if (path.Value.Operations != null) + { + tags.AddRange(path.Value.Operations.SelectMany(x => + { + return x.Value.Tags?.Select(t => t.Name ?? string.Empty) ?? Array.Empty(); + })); + } + } + tags = tags.Distinct().ToList(); + swaggerDoc.Tags?.RemoveAll(tag => tag.Name == null || !tags.Contains(tag.Name)); } protected virtual string? RemoveRouteParameterConstraints(ActionDescriptor actionDescriptor) @@ -49,7 +63,7 @@ public class AbpSwashbuckleDocumentFilter : IDocumentFilter { break; } - + route = route.Remove(startIndex, (endIndex - startIndex)); } diff --git a/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleEnumSchemaFilter.cs b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleEnumSchemaFilter.cs index b6a20d2ad2..afd6a141dc 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleEnumSchemaFilter.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleEnumSchemaFilter.cs @@ -1,22 +1,22 @@ -using Microsoft.OpenApi.Any; -using Microsoft.OpenApi.Models; +using System; +using System.Text.Json.Nodes; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.SwaggerGen; -using System; namespace Volo.Abp.Swashbuckle; public class AbpSwashbuckleEnumSchemaFilter : ISchemaFilter { - public void Apply(OpenApiSchema schema, SchemaFilterContext context) + public void Apply(IOpenApiSchema schema, SchemaFilterContext context) { - if (context.Type.IsEnum) + if (schema is OpenApiSchema openApiScheme && context.Type.IsEnum) { - schema.Enum.Clear(); - schema.Type = "string"; - schema.Format = null; + openApiScheme.Enum?.Clear(); + openApiScheme.Type = JsonSchemaType.String; + openApiScheme.Format = null; foreach (var name in Enum.GetNames(context.Type)) { - schema.Enum.Add(new OpenApiString($"{name}")); + openApiScheme.Enum?.Add(JsonNode.Parse($"\"{name}\"")!); } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationPart/ApplicationPartSorter_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationPart/ApplicationPartSorter_Tests.cs index 829aa23527..c8324e466a 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationPart/ApplicationPartSorter_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationPart/ApplicationPartSorter_Tests.cs @@ -26,6 +26,13 @@ public class ApplicationPartSorter_Tests partManager.ApplicationParts.Add(new AssemblyPart(assembly)); moduleDescriptors.Add(CreateModuleDescriptor(assembly)); } + + var dumplicateAssembly = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName($"ModuleB.dll"), AssemblyBuilderAccess.Run); + partManager.ApplicationParts.Add(new AssemblyPart(dumplicateAssembly)); + partManager.ApplicationParts.Add(new AssemblyPart(dumplicateAssembly)); + moduleDescriptors.Add(CreateModuleDescriptor(dumplicateAssembly)); + moduleDescriptors.Add(CreateModuleDescriptor(dumplicateAssembly)); + var randomApplicationParts = partManager.ApplicationParts.OrderBy(x => Guid.NewGuid()).ToList(); // Shuffle the parts // Additional part @@ -44,7 +51,7 @@ public class ApplicationPartSorter_Tests ApplicationPartSorter.Sort(partManager, moduleContainer); // Act - partManager.ApplicationParts.Count.ShouldBe(13); // 10 modules + 3 additional parts + partManager.ApplicationParts.Count.ShouldBe(15); // 10 modules + 3 additional parts + 2 duplicate parts var applicationParts = partManager.ApplicationParts.Reverse().ToList(); // Reverse the order to match the expected output @@ -60,7 +67,9 @@ public class ApplicationPartSorter_Tests applicationParts[9].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA7"); applicationParts[10].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA8"); applicationParts[11].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA9"); - applicationParts[12].ShouldBeOfType().Assembly.ShouldBe(typeof(AbpVirtualFileSystemModule).Assembly); + applicationParts[12].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleB"); + applicationParts[13].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleB"); + applicationParts[14].ShouldBeOfType().Assembly.ShouldBe(typeof(AbpVirtualFileSystemModule).Assembly); } private static IModuleContainer CreateFakeModuleContainer(List moduleDescriptors) diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs index a4980a58ec..fca3d209b0 100644 --- a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs +++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs @@ -31,6 +31,8 @@ public class AbpAuthorizationTestModule : AbpModule { options.ValueProviders.Add(); options.ValueProviders.Add(); + options.ValueProviders.Add(); + options.ValueProviders.Add(); }); } } diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/PermissionChecker_Tests.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/PermissionChecker_Tests.cs index f39c48e435..c641f21e92 100644 --- a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/PermissionChecker_Tests.cs +++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/PermissionChecker_Tests.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.Authorization; public class PermissionChecker_Tests: AuthorizationTestBase { private readonly IPermissionChecker _permissionChecker; - + public PermissionChecker_Tests() { _permissionChecker = GetRequiredService(); @@ -21,6 +21,13 @@ public class PermissionChecker_Tests: AuthorizationTestBase (await _permissionChecker.IsGrantedAsync("UndefinedPermission")).ShouldBe(false); } + [Fact] + public async Task IsGranted_ProhibitedAsync() + { + (await _permissionChecker.IsGrantedAsync("MyPermission8")).ShouldBe(false); + (await _permissionChecker.IsGrantedAsync("MyPermission9")).ShouldBe(false); + } + [Fact] public async Task IsGranted_Multiple_Result_Async() { @@ -35,7 +42,7 @@ public class PermissionChecker_Tests: AuthorizationTestBase "MyPermission6", "MyPermission7" }); - + result.Result["MyPermission1"].ShouldBe(PermissionGrantResult.Undefined); result.Result["MyPermission2"].ShouldBe(PermissionGrantResult.Prohibited); result.Result["UndefinedPermission"].ShouldBe(PermissionGrantResult.Prohibited); @@ -44,6 +51,18 @@ public class PermissionChecker_Tests: AuthorizationTestBase result.Result["MyPermission5"].ShouldBe(PermissionGrantResult.Granted); result.Result["MyPermission6"].ShouldBe(PermissionGrantResult.Granted); result.Result["MyPermission7"].ShouldBe(PermissionGrantResult.Granted); - } -} \ No newline at end of file + + [Fact] + public async Task IsGranted_Multiple_Result_ProhibitedAsync() + { + var result = await _permissionChecker.IsGrantedAsync(new [] + { + "MyPermission8", + "MyPermission9" + }); + + result.Result["MyPermission8"].ShouldBe(PermissionGrantResult.Prohibited); + result.Result["MyPermission9"].ShouldBe(PermissionGrantResult.Prohibited); + } +} diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/AuthorizationTestPermissionDefinitionProvider.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/AuthorizationTestPermissionDefinitionProvider.cs index b2a9179415..7e8ed5e949 100644 --- a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/AuthorizationTestPermissionDefinitionProvider.cs +++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/AuthorizationTestPermissionDefinitionProvider.cs @@ -16,11 +16,11 @@ public class AuthorizationTestPermissionDefinitionProvider : PermissionDefinitio var group = context.AddGroup("TestGroup"); group[PermissionDefinitionContext.KnownPropertyNames.CurrentProviderName].ShouldBe(typeof(AuthorizationTestPermissionDefinitionProvider).FullName); - + var permission1 = group.AddPermission("MyAuthorizedService1"); permission1[PermissionDefinitionContext.KnownPropertyNames.CurrentProviderName].ShouldBe(typeof(AuthorizationTestPermissionDefinitionProvider).FullName); - + group.AddPermission("MyPermission1").StateCheckers.Add(new TestRequireEditionPermissionSimpleStateChecker()); group.AddPermission("MyPermission2"); group.AddPermission("MyPermission3"); @@ -28,6 +28,8 @@ public class AuthorizationTestPermissionDefinitionProvider : PermissionDefinitio group.AddPermission("MyPermission5"); group.AddPermission("MyPermission6").WithProviders(nameof(TestPermissionValueProvider1)); group.AddPermission("MyPermission7").WithProviders(nameof(TestPermissionValueProvider2)); + group.AddPermission("MyPermission8"); + group.AddPermission("MyPermission9"); group.GetPermissionOrNull("MyAuthorizedService1").ShouldNotBeNull(); diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/TestProhibitedPermissionValueProvider1.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/TestProhibitedPermissionValueProvider1.cs new file mode 100644 index 0000000000..2f667cb791 --- /dev/null +++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/TestProhibitedPermissionValueProvider1.cs @@ -0,0 +1,38 @@ +using System.Linq; +using System.Threading.Tasks; +using Volo.Abp.Authorization.Permissions; + +namespace Volo.Abp.Authorization.TestServices; + +public class TestProhibitedPermissionValueProvider1 : PermissionValueProvider +{ + public TestProhibitedPermissionValueProvider1(IPermissionStore permissionStore) : base(permissionStore) + { + } + + public override string Name => "TestProhibitedPermissionValueProvider1"; + + public override Task CheckAsync(PermissionValueCheckContext context) + { + var result = PermissionGrantResult.Undefined; + if (context.Permission.Name == "MyPermission8" || context.Permission.Name == "MyPermission9") + { + result = PermissionGrantResult.Granted; + } + + return Task.FromResult(result); + } + + public override Task CheckAsync(PermissionValuesCheckContext context) + { + var result = new MultiplePermissionGrantResult(); + foreach (var name in context.Permissions.Select(x => x.Name)) + { + result.Result.Add(name, name == "MyPermission8" || name == "MyPermission9" + ? PermissionGrantResult.Granted + : PermissionGrantResult.Undefined); + } + + return Task.FromResult(result); + } +} diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/TestProhibitedPermissionValueProvider2.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/TestProhibitedPermissionValueProvider2.cs new file mode 100644 index 0000000000..0311c19a65 --- /dev/null +++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/TestProhibitedPermissionValueProvider2.cs @@ -0,0 +1,38 @@ +using System.Linq; +using System.Threading.Tasks; +using Volo.Abp.Authorization.Permissions; + +namespace Volo.Abp.Authorization.TestServices; + +public class TestProhibitedPermissionValueProvider2 : PermissionValueProvider +{ + public TestProhibitedPermissionValueProvider2(IPermissionStore permissionStore) : base(permissionStore) + { + } + + public override string Name => "TestProhibitedPermissionValueProvider2"; + + public override Task CheckAsync(PermissionValueCheckContext context) + { + var result = PermissionGrantResult.Undefined; + if (context.Permission.Name == "MyPermission8" || context.Permission.Name == "MyPermission9") + { + result = PermissionGrantResult.Prohibited; + } + + return Task.FromResult(result); + } + + public override Task CheckAsync(PermissionValuesCheckContext context) + { + var result = new MultiplePermissionGrantResult(); + foreach (var name in context.Permissions.Select(x => x.Name)) + { + result.Result.Add(name, name == "MyPermission8" || name == "MyPermission9" + ? PermissionGrantResult.Prohibited + : PermissionGrantResult.Undefined); + } + + return Task.FromResult(result); + } +} diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperExpressionExtensions_Tests.cs b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperExpressionExtensions_Tests.cs index 10bc6a9d82..282755c0a9 100644 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperExpressionExtensions_Tests.cs +++ b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperExpressionExtensions_Tests.cs @@ -102,7 +102,7 @@ public class AutoMapperExpressionExtensions_Tests private static IMapper CreateMapper(Action configure) { - var configuration = new MapperConfiguration(configure, NullLoggerFactory.Instance); + var configuration = new MapperConfiguration(configure); configuration.AssertConfigurationIsValid(); return configuration.CreateMapper(); } diff --git a/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpJsonTestModule.cs b/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpJsonTestModule.cs index 121ec62a85..5382d3db46 100644 --- a/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpJsonTestModule.cs +++ b/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpJsonTestModule.cs @@ -19,7 +19,7 @@ public class AbpJsonSystemTextJsonTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddOptions() + context.Services.AddAbpOptions() .Configure((options, rootServiceProvider) => { if (options.JsonSerializerOptions.TypeInfoResolver != null) @@ -43,7 +43,7 @@ public class AbpJsonNewtonsoftTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddOptions() + context.Services.AddAbpOptions() .Configure((options, rootServiceProvider) => { options.JsonSerializerSettings.ContractResolver = new AbpCamelCasePropertyNamesContractResolver( diff --git a/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs index 4435f1dcf0..a2234aa14a 100644 --- a/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs +++ b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs @@ -34,7 +34,7 @@ public class AbpMemoryDbTestModule : AbpModule options.AddRepository(); }); - context.Services.AddOptions() + context.Services.AddAbpOptions() .Configure((options, rootServiceProvider) => { options.JsonSerializerOptions.Converters.Add(new EntityJsonConverter()); diff --git a/latest-versions.json b/latest-versions.json index a39a43d36b..672c81cecf 100644 --- a/latest-versions.json +++ b/latest-versions.json @@ -1,4 +1,13 @@ [ + { + "version": "10.0.0", + "releaseDate": "", + "type": "stable", + "message": "", + "leptonx": { + "version": "5.0.0" + } + }, { "version": "9.3.6", "releaseDate": "", diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json index d02c89e745..92c808c088 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json +++ b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json @@ -24,6 +24,11 @@ "declaringAssemblyName": "Volo.Abp.Emailing", "namespace": "Volo.Abp.Emailing", "name": "AbpEmailingModule" + }, + { + "declaringAssemblyName": "Volo.Abp.Mapperly", + "namespace": "Volo.Abp.Mapperly", + "name": "AbpMapperlyModule" } ], "implementingInterfaces": [ diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor index ea42414679..47ffa4cc48 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor +++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor @@ -78,7 +78,7 @@ if (!propertyInfo.Name.EndsWith("_Text")) { - if (propertyInfo.Type.IsEnum) + if (propertyInfo.IsEnum()) { } diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.analyze.json index cba964b090..843097ac3d 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.analyze.json +++ b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.analyze.json @@ -11,9 +11,9 @@ "name": "AbpAspNetCoreComponentsWebThemingModule" }, { - "declaringAssemblyName": "Volo.Abp.AutoMapper", - "namespace": "Volo.Abp.AutoMapper", - "name": "AbpAutoMapperModule" + "declaringAssemblyName": "Volo.Abp.Mapperly", + "namespace": "Volo.Abp.Mapperly", + "name": "AbpMapperlyModule" }, { "declaringAssemblyName": "Volo.Abp.Account.Application.Contracts", diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/Default.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/Default.cshtml index 025aa11142..aab9048d96 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/Default.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/Default.cshtml @@ -60,13 +60,14 @@ if (!propertyInfo.Name.EndsWith("_Text")) { - if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty()) + if (propertyInfo.IsEnum() || !propertyInfo.Lookup.Url.IsNullOrEmpty()) { - if (propertyInfo.Type.IsEnum) + if (propertyInfo.IsEnum()) { Model.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type); } =10.0.0-rc.3", - "@abp/ng.theme.shared": ">=10.0.0-rc.3" + "@abp/ng.core": ">=10.0.1", + "@abp/ng.theme.shared": ">=10.0.1" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs index 1f451f58d9..bfc910c7c6 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.Hosting; using Volo.CmsKit.EntityFrameworkCore; using Volo.CmsKit.MultiTenancy; using StackExchange.Redis; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs index 623b417bc7..933dc8f50b 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Volo.CmsKit.MultiTenancy; using StackExchange.Redis; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account; diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 3fa8f57443..587b80af76 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": "~10.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 2de8821c44..bbe4b5c934 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,185 +2,185 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.0-rc.3.tgz#d2784a3779500b0f22149a35eb81f0456b732239" - integrity sha512-6fYmDHPbaZGzDZgNz6/UzStP3DM4icxscY/IrqyJ0Mhzq00j/4nuG7zuc9hogUxqifwrBAa/oiiUtdkG1tr4uQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.1.tgz#3db3ac9291915c0b129fe90fd9a72ef1703c4b4d" + integrity sha512-D0Nv7VjNk03xF2Ii7pFEKSGzrggS5Y7NVApgOeFXbLhU/XZSfbR1A2wocLy6K+cKInH6+xhEyMdwTjwlUMx/Vw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.1" -"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.0-rc.3.tgz#a68d95a189e79dccb7bc50460565e03777e3823c" - integrity sha512-QvMZy5gVSksLYiGE8VvDQ7n5GKWCyuJF9Y7Kx6/bw+weWKvEk6kiqw5glTMzUOnpkM4kH7bIb8PoJSAycDlvRg== +"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.1.tgz#3c525bbc0da2b4e603b609289af623a030953f6d" + integrity sha512-euCjtPG2AjZ9AFbRQNh9649f40rQRfq58ZLvjUCfCvotbe7Fl+FaZgyIukpxXqKgd14NtCd2xPbvRM6/3Wj6IQ== dependencies: - "@abp/aspnetcore.mvc.ui" "~10.0.0-rc.3" - "@abp/bootstrap" "~10.0.0-rc.3" - "@abp/bootstrap-datepicker" "~10.0.0-rc.3" - "@abp/bootstrap-daterangepicker" "~10.0.0-rc.3" - "@abp/datatables.net-bs5" "~10.0.0-rc.3" - "@abp/font-awesome" "~10.0.0-rc.3" - "@abp/jquery-form" "~10.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~10.0.0-rc.3" - "@abp/lodash" "~10.0.0-rc.3" - "@abp/luxon" "~10.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~10.0.0-rc.3" - "@abp/moment" "~10.0.0-rc.3" - "@abp/select2" "~10.0.0-rc.3" - "@abp/sweetalert2" "~10.0.0-rc.3" - "@abp/timeago" "~10.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.0-rc.3.tgz#8d3cbec33ff9efe7789e5cafb86c39e2488304ca" - integrity sha512-HqbleKwVFVRK0Xxd0XkeyCfX4+JPouEMYvQCL+zo0RDOMfPViPua5ketfU9DDhCCyMfCwy7iW0GeX9NuqEjXwg== + "@abp/aspnetcore.mvc.ui" "~10.0.1" + "@abp/bootstrap" "~10.0.1" + "@abp/bootstrap-datepicker" "~10.0.1" + "@abp/bootstrap-daterangepicker" "~10.0.1" + "@abp/datatables.net-bs5" "~10.0.1" + "@abp/font-awesome" "~10.0.1" + "@abp/jquery-form" "~10.0.1" + "@abp/jquery-validation-unobtrusive" "~10.0.1" + "@abp/lodash" "~10.0.1" + "@abp/luxon" "~10.0.1" + "@abp/malihu-custom-scrollbar-plugin" "~10.0.1" + "@abp/moment" "~10.0.1" + "@abp/select2" "~10.0.1" + "@abp/sweetalert2" "~10.0.1" + "@abp/timeago" "~10.0.1" + +"@abp/aspnetcore.mvc.ui@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.1.tgz#b004dc6313b9320b05f465eeb9e74877766ea0f0" + integrity sha512-IEiLfdpDwtrGek/z7iBlgKlZdCvgaL2q9/GGLySrLknnVtv/qONzYburveZsKw8LT7PbZWRQRBh2n7v6TT7M9w== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.0-rc.3.tgz#6d7528d9275cede4bf91b929dd407c744e513014" - integrity sha512-zBLJ9hQXucXOM0GpRyJCMHxdi+C5gaGQtYzguFFGDw+jW5Ht7paoAU+HYS8Dy29zHJHMk+VdO5vJovVIXhfuPg== +"@abp/bootstrap-datepicker@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.1.tgz#5d58e5039e39d84b179a0c343d616ab0fc7c38d4" + integrity sha512-hwpSDUTM/A/Rn+3Hjjt3xG7QdhmFruM7fGEEU8kd7Qowimx2XVNIM5Ua5obt5bGTyBmsaAx4HnurjJJn1oh4ng== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.0-rc.3.tgz#85b09ce28da96e84a9ad448cee5b73d581056041" - integrity sha512-VyAZqPZyx/sjGcYYqDPStwUMeQ+nMwud1pEmDgpPWWsRoQBPOVB3PS8KGgW4Fb2oax9i2v6wF5qqLEQkD3CDmA== +"@abp/bootstrap-daterangepicker@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.1.tgz#8ff88aed898e46c36a3e9601a791cb0fa1134f28" + integrity sha512-a1hhaSk+SffutUI0CxUgAG6Zmx/Y4L7i1LEsQff4OEq0j8ipaHT+5UHMXf2DbCMo7yoZh2yUXQAATO0A/O2V+A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.0-rc.3.tgz#9daacf0ab7b3967dedad7f8792b9125c439f9022" - integrity sha512-Rl5DFxazgWZrioVjO6MLgnZW9YBsXN0DoWX3rprBp6qsLdBSNduIdM6J8DqB2y/UadoJwZRduykRZRVPgka3HQ== +"@abp/bootstrap@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.1.tgz#cb857f21814097522fbd7e5c1a36cb22182e9f3e" + integrity sha512-AK/8ykw4SYjLgFgJE1zb2Mevn6ypqXqETbndN887JSny1QRrLUBVOKy6g+pnPUqI45/4wPfas7H9WgjFINiK2g== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" bootstrap "^5.3.8" -"@abp/core@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.0-rc.3.tgz#7c74ed023ee91fa18d92dc33a64c11d279eb2414" - integrity sha512-z6QKxlAsiXcCwvn3BvNouLa7UsxQmQSlZ2yleTcJ7uEDSwUzbhzCiUQ5WwHTqoOACPQ71/wasSaxEyeRQBcE8w== +"@abp/core@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.1.tgz#c96563310d28137b0ac24efff74a969fa13aa7bb" + integrity sha512-mc/Wve/fl/B3cLqQ18IXO0lw1QCi3kCbi8PxRoLowD8NZEguezNglFjNqdvHNvBaWpZpMgJc2U+B15giB0946w== dependencies: - "@abp/utils" "~10.0.0-rc.3" + "@abp/utils" "~10.0.1" -"@abp/datatables.net-bs5@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.0-rc.3.tgz#13a533e454c60702ab10eb41faa5643a7d6f6cce" - integrity sha512-a6O+iLX/LdLZTCbLfR7HJlr+z8KlIxih/PFBqaf5lLmTnyS0aJii+KMHjD7nRJy5/TWI+ALiT7gWRbjiHxOuFQ== +"@abp/datatables.net-bs5@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.1.tgz#1b33c14e9dabd0b29cc4d6f05120607a14313d55" + integrity sha512-0ww7HZ9m/OZWRQ2/9gNNgd59FpfvWSdw21onCBgJ7eaLd6KQeeFqbXm4eYjHoLgyRwk8c6u/F9ciir3EeTivhw== dependencies: - "@abp/datatables.net" "~10.0.0-rc.3" + "@abp/datatables.net" "~10.0.1" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.0-rc.3.tgz#ae97a33f1695b6cab1658ff476a984c7ab9d51a6" - integrity sha512-1gHnOKNJxELYHY7eeO32aFm5+YA2YSEeOO6HrY4HZLRDr5rOHDAswH2OwFtn/qVPGR1fVbUr1TA9uqPOtxsJXA== +"@abp/datatables.net@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.1.tgz#ed45edcb4ee6832f38d4f1a56b5c0e1b126e8b82" + integrity sha512-DR53PGhHbW0ZdzeT7PWvBSfZrSyF2eWo1zAzCXsG+MsVRIiNzUNjipeq1igmd0PtXi2FHb76xS2utgAfgZEZ1A== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" datatables.net "^2.3.4" -"@abp/font-awesome@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.0-rc.3.tgz#a5b619452416af76203ef1bab18399abf8b8fa96" - integrity sha512-6FoA/2odS1kdV1EJ91YgIjMQiQdblUfqtDx72fDG7+qnqRyZ+Df/KWOqramEe9791zbXByZL4SjpqoisZgFNzQ== +"@abp/font-awesome@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.1.tgz#8c75feda6e394143f7e1cbe1ac8fc12b275bafed" + integrity sha512-2DDjc+EJcHDPUm/LHzbVjVMmChIaiEqMasKQ7qhxDq6yL102wMibPz0JR6Q9EYmYWro+Blf3Q0/0ECYLa8BgnQ== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.0-rc.3.tgz#24eefc512942dca37bdeb3fc1753cc3651e2872a" - integrity sha512-RRcGjt3blqH2R4uwrbrO+p1Kv6e7i1oJ9Wf6xrZK2upVfUvToUbif15HlC24FhNPX3BEUyL52s5HKcVBU5/1iw== +"@abp/jquery-form@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.1.tgz#e19c89863e2175a5e5db638ab95f648d2ee18ab3" + integrity sha512-nVZwEv0VeIP+xQZk7bz8S2RbKhkOUTKSf6mkdkLlna+8TNW0Ry8tBns79n/I0wYUh5007hxQbqb3L5TG4kq4+Q== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.0-rc.3.tgz#20c8647e006954887eebe86e17ef39a336f47a30" - integrity sha512-6DVIIEVyqyeKMrZHNOTfW3/xuw7rkjqTMKXT6Z1wrDpt9Erseuz8CjbPpcS+RwpXn6va5ShrkJlwwyScFOKvkQ== +"@abp/jquery-validation-unobtrusive@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.1.tgz#35d43938c05ed3f6aab67bfd574c82f5e83a277f" + integrity sha512-jch+haMxPqMcN7CrFoEnULXHSdP43E+CdwDkCYJnTjEydISMyr2CwW4cIA/ab4kjNXs1DloW+r8+unRnOzClWQ== dependencies: - "@abp/jquery-validation" "~10.0.0-rc.3" + "@abp/jquery-validation" "~10.0.1" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.0-rc.3.tgz#2e562ad5ca7c5bef389a0b24293a3193fa9823ef" - integrity sha512-xLJVvCkUrNnVeQbdsKfBj7zh3cSaPJC3eWKm2NoVy9KimEhF4zeSJEkciFmS0cckSal+AO2xC8W8ot3FqpkCHQ== +"@abp/jquery-validation@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.1.tgz#20c4c313d9ec73b4dc242729ab3250f747b76b66" + integrity sha512-cUGUCOuwKc1TR1R8GHpjN9HokWK6p6ElM4sN/J3yY/Nef9wKn4zY98Q3hmFLsCDeV+9Sjex1xcqNjqU3ZOiZSg== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" jquery-validation "^1.21.0" -"@abp/jquery@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.0-rc.3.tgz#3400f1b8c6966e2d71fceb5349f05b88aeb2bb88" - integrity sha512-liz3FITKdESLGomITjUqcOZYvV0rs61vYMxSbaCDoCKIQj4Ne9mN+HJ/KOpD6GOhqVsjmYOxDuSoecjiFLjVxA== +"@abp/jquery@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.1.tgz#fc6fb5fed08e6ab113e0096cd6c00ad10461fef4" + integrity sha512-hIQkMc9ouQz4QKaEJSVzZqQMyWdF7tmzZ8WlVN6EeWEDUKPLyuibhwTvTEO6u+17ZP7GhlldONHsRwTdc0zlJA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" jquery "~3.7.1" -"@abp/lodash@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.0-rc.3.tgz#738baf7394d466112dc5a2380f2c549053621505" - integrity sha512-5PYQks4sJPdiz9zfZD1bfrCkmQ+ZMfWg2xyjbHoQzJdqu9rb2SRzkQ5MAWvqQPVTdLY6Bnutwxuq6mjkfcthcQ== +"@abp/lodash@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.1.tgz#41df6cc6d375ea1e6a5a27745b68b0964bcbc295" + integrity sha512-15uv5kNtXBb+3hm7Qorh95mLhSIJkIbGa2bp3Tyw4jEdXTFPsb1v5FCC2m7LEaEUNuNgzXFJGT818Xi58AI0Rw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" lodash "^4.17.21" -"@abp/luxon@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.0-rc.3.tgz#bfb0c5fbf4a321e4531ec5b34dcdee47b486afe8" - integrity sha512-PCifbFy7t1h4L+FKJAo5Xr7v5hTvlelwuCsOVGfG8HVWmbOTKiQJywtxvSnARbsJ6SghUEzbqMzeX6nyHZ4Zuw== +"@abp/luxon@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.1.tgz#97c920867775def2bb1628b47507e45388179e40" + integrity sha512-LL/J4oyA+o9res57cq/+qsilTvo7ikxtCdpxGSIEjkvNTmYzcChv1ixmDMvqqMvJFELJ9R+1V7NeZhXBAiR6Lw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.0-rc.3.tgz#03bf7a8b2e71ec463794260e7fe5e6bfeb526f8e" - integrity sha512-aHOZnr4iPS6QqV07cXyWpQVl6zAaQXuct1yTeIUqcAqxsSt63K6Y27nBR8cU/m6BHhjaxSLn1kynOeccmx7lDA== +"@abp/malihu-custom-scrollbar-plugin@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.1.tgz#53dc824537110f155d00c46b1ffe7c6eff060040" + integrity sha512-S4zKvlTMvhkFCBhakql1bLB/lHlRjPy8An0KB2pBKvxfIvzUQn8YmiBSK51Hq/Hf6ZnnSJkNr35cb9TcHUwkNA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.0-rc.3.tgz#1d2c8081b9f7f2716b250d16b41021e74c093fb0" - integrity sha512-VKDVY3ml3bhPh2rUsUN1F7zH5Myi+jRYxQYC/OuOsa1P4x9+cKs1lsS68NYAq+JyMlwwuJcAx63nqkxArz+VEw== +"@abp/moment@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.1.tgz#dce2c26602ac9c77ea0209e6a3727a7e9f04f4c4" + integrity sha512-fRrMLQhYzOSATSM4hWdr7Y5ggbMd23ffivpDB4O2BDYUXTcfiWyVVKDd+5uLZi+znkWz29bNN4WswileuHvaGw== dependencies: moment "^2.30.1" -"@abp/select2@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.0-rc.3.tgz#216403f1207a2556b0317fb973ed874c34c7fb73" - integrity sha512-6t/ZZl9xo0G86dX8zmEv82/64dOxCTgcQvjRGTb5Xwzh05nKHKpFFhJm6juVvpJcYqUj6Weks66SVjr6Wi2kQQ== +"@abp/select2@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.1.tgz#df92daf67f46aa2fc884ef84f9da68b1fb8e63d7" + integrity sha512-VQxYH0Uqa7EN+F6XBkDMz3yy8yTM6xcZ6593WtZupl9UbiHToGElsem3ibnZueoyMHcd3ByYw968uvJX7zudNw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" select2 "^4.0.13" -"@abp/sweetalert2@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.0-rc.3.tgz#401dc08eb4607d3a575a5288296f6c703b18df8a" - integrity sha512-2nB9I+GxK7UeIjvdUJtAH9GqIL/HloQ+7WC/ZWUNLCBqI5Owx30La2wxj5e9MlDNcLvYs3A2EJP0Llo4Gdefsg== +"@abp/sweetalert2@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.1.tgz#a26874fd51ddffeba60f4506eb1a5c914ae3efae" + integrity sha512-4USaGSA5+7O6D+5a4YhluYPKUyOAassUUuKJATP8IqLRtpkh16P4tJ/7+QWvnFDIgJLURpbjmOiN2xhVzhpxvw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" sweetalert2 "^11.23.0" -"@abp/timeago@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.0-rc.3.tgz#6fc8f16107171ae6f6afbbd3dc7e844651ffcf77" - integrity sha512-JYhSRbz06IObwA32GutyV+yo4p5PdAmGtlaApDLCpSFccHsel/A3jrN+ykovKy4chWYcbOhxhgjWw6ZaIZMvJg== +"@abp/timeago@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.1.tgz#6bc36ab7dd3deea114ff1d68dbda908202837cf6" + integrity sha512-Wd2KY8B95ycsRDn5ouY3l3U+niBMEd+XCgZs6CoaMtiQ1AxkT7/iPqNCMJMKjeIjBQ/A1CSmKL7MI+BGw1bxBA== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" timeago "^1.6.7" -"@abp/utils@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.0-rc.3.tgz#d6a07146ba627bcfa0cadd5c7c56601609b24d57" - integrity sha512-bA/WPuosvedfQr+5cJBwKXrhd6b8fDG7LWp4PuZFMdti8nSXgOheLeZ8PcRvut94ENIXS7jzSsqapLHRj5E6zQ== +"@abp/utils@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.1.tgz#0db8713481cb781c3c4d07a150b7f45a65466b50" + integrity sha512-YGXgco/qYSxGaQfNTHDIMU1MyEuVDe3FayIZWPW5+p+elwp4DPFD4rvD+6ZLM0Jr30k5UdKT4IFAsw7wduQWrw== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostModule.cs index 522771c77b..7054a6f1fe 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostModule.cs @@ -2,7 +2,7 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using System.IO; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; 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 bc28d12fcd..a963ff1451 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": "~10.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.1" } } 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 2de8821c44..bbe4b5c934 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,185 +2,185 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.0-rc.3.tgz#d2784a3779500b0f22149a35eb81f0456b732239" - integrity sha512-6fYmDHPbaZGzDZgNz6/UzStP3DM4icxscY/IrqyJ0Mhzq00j/4nuG7zuc9hogUxqifwrBAa/oiiUtdkG1tr4uQ== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.1.tgz#3db3ac9291915c0b129fe90fd9a72ef1703c4b4d" + integrity sha512-D0Nv7VjNk03xF2Ii7pFEKSGzrggS5Y7NVApgOeFXbLhU/XZSfbR1A2wocLy6K+cKInH6+xhEyMdwTjwlUMx/Vw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.1" -"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.0-rc.3.tgz#a68d95a189e79dccb7bc50460565e03777e3823c" - integrity sha512-QvMZy5gVSksLYiGE8VvDQ7n5GKWCyuJF9Y7Kx6/bw+weWKvEk6kiqw5glTMzUOnpkM4kH7bIb8PoJSAycDlvRg== +"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.1.tgz#3c525bbc0da2b4e603b609289af623a030953f6d" + integrity sha512-euCjtPG2AjZ9AFbRQNh9649f40rQRfq58ZLvjUCfCvotbe7Fl+FaZgyIukpxXqKgd14NtCd2xPbvRM6/3Wj6IQ== dependencies: - "@abp/aspnetcore.mvc.ui" "~10.0.0-rc.3" - "@abp/bootstrap" "~10.0.0-rc.3" - "@abp/bootstrap-datepicker" "~10.0.0-rc.3" - "@abp/bootstrap-daterangepicker" "~10.0.0-rc.3" - "@abp/datatables.net-bs5" "~10.0.0-rc.3" - "@abp/font-awesome" "~10.0.0-rc.3" - "@abp/jquery-form" "~10.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~10.0.0-rc.3" - "@abp/lodash" "~10.0.0-rc.3" - "@abp/luxon" "~10.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~10.0.0-rc.3" - "@abp/moment" "~10.0.0-rc.3" - "@abp/select2" "~10.0.0-rc.3" - "@abp/sweetalert2" "~10.0.0-rc.3" - "@abp/timeago" "~10.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.0-rc.3.tgz#8d3cbec33ff9efe7789e5cafb86c39e2488304ca" - integrity sha512-HqbleKwVFVRK0Xxd0XkeyCfX4+JPouEMYvQCL+zo0RDOMfPViPua5ketfU9DDhCCyMfCwy7iW0GeX9NuqEjXwg== + "@abp/aspnetcore.mvc.ui" "~10.0.1" + "@abp/bootstrap" "~10.0.1" + "@abp/bootstrap-datepicker" "~10.0.1" + "@abp/bootstrap-daterangepicker" "~10.0.1" + "@abp/datatables.net-bs5" "~10.0.1" + "@abp/font-awesome" "~10.0.1" + "@abp/jquery-form" "~10.0.1" + "@abp/jquery-validation-unobtrusive" "~10.0.1" + "@abp/lodash" "~10.0.1" + "@abp/luxon" "~10.0.1" + "@abp/malihu-custom-scrollbar-plugin" "~10.0.1" + "@abp/moment" "~10.0.1" + "@abp/select2" "~10.0.1" + "@abp/sweetalert2" "~10.0.1" + "@abp/timeago" "~10.0.1" + +"@abp/aspnetcore.mvc.ui@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.1.tgz#b004dc6313b9320b05f465eeb9e74877766ea0f0" + integrity sha512-IEiLfdpDwtrGek/z7iBlgKlZdCvgaL2q9/GGLySrLknnVtv/qONzYburveZsKw8LT7PbZWRQRBh2n7v6TT7M9w== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.0-rc.3.tgz#6d7528d9275cede4bf91b929dd407c744e513014" - integrity sha512-zBLJ9hQXucXOM0GpRyJCMHxdi+C5gaGQtYzguFFGDw+jW5Ht7paoAU+HYS8Dy29zHJHMk+VdO5vJovVIXhfuPg== +"@abp/bootstrap-datepicker@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.1.tgz#5d58e5039e39d84b179a0c343d616ab0fc7c38d4" + integrity sha512-hwpSDUTM/A/Rn+3Hjjt3xG7QdhmFruM7fGEEU8kd7Qowimx2XVNIM5Ua5obt5bGTyBmsaAx4HnurjJJn1oh4ng== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.0-rc.3.tgz#85b09ce28da96e84a9ad448cee5b73d581056041" - integrity sha512-VyAZqPZyx/sjGcYYqDPStwUMeQ+nMwud1pEmDgpPWWsRoQBPOVB3PS8KGgW4Fb2oax9i2v6wF5qqLEQkD3CDmA== +"@abp/bootstrap-daterangepicker@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.1.tgz#8ff88aed898e46c36a3e9601a791cb0fa1134f28" + integrity sha512-a1hhaSk+SffutUI0CxUgAG6Zmx/Y4L7i1LEsQff4OEq0j8ipaHT+5UHMXf2DbCMo7yoZh2yUXQAATO0A/O2V+A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.0-rc.3.tgz#9daacf0ab7b3967dedad7f8792b9125c439f9022" - integrity sha512-Rl5DFxazgWZrioVjO6MLgnZW9YBsXN0DoWX3rprBp6qsLdBSNduIdM6J8DqB2y/UadoJwZRduykRZRVPgka3HQ== +"@abp/bootstrap@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.1.tgz#cb857f21814097522fbd7e5c1a36cb22182e9f3e" + integrity sha512-AK/8ykw4SYjLgFgJE1zb2Mevn6ypqXqETbndN887JSny1QRrLUBVOKy6g+pnPUqI45/4wPfas7H9WgjFINiK2g== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" bootstrap "^5.3.8" -"@abp/core@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.0-rc.3.tgz#7c74ed023ee91fa18d92dc33a64c11d279eb2414" - integrity sha512-z6QKxlAsiXcCwvn3BvNouLa7UsxQmQSlZ2yleTcJ7uEDSwUzbhzCiUQ5WwHTqoOACPQ71/wasSaxEyeRQBcE8w== +"@abp/core@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.1.tgz#c96563310d28137b0ac24efff74a969fa13aa7bb" + integrity sha512-mc/Wve/fl/B3cLqQ18IXO0lw1QCi3kCbi8PxRoLowD8NZEguezNglFjNqdvHNvBaWpZpMgJc2U+B15giB0946w== dependencies: - "@abp/utils" "~10.0.0-rc.3" + "@abp/utils" "~10.0.1" -"@abp/datatables.net-bs5@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.0-rc.3.tgz#13a533e454c60702ab10eb41faa5643a7d6f6cce" - integrity sha512-a6O+iLX/LdLZTCbLfR7HJlr+z8KlIxih/PFBqaf5lLmTnyS0aJii+KMHjD7nRJy5/TWI+ALiT7gWRbjiHxOuFQ== +"@abp/datatables.net-bs5@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.1.tgz#1b33c14e9dabd0b29cc4d6f05120607a14313d55" + integrity sha512-0ww7HZ9m/OZWRQ2/9gNNgd59FpfvWSdw21onCBgJ7eaLd6KQeeFqbXm4eYjHoLgyRwk8c6u/F9ciir3EeTivhw== dependencies: - "@abp/datatables.net" "~10.0.0-rc.3" + "@abp/datatables.net" "~10.0.1" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.0-rc.3.tgz#ae97a33f1695b6cab1658ff476a984c7ab9d51a6" - integrity sha512-1gHnOKNJxELYHY7eeO32aFm5+YA2YSEeOO6HrY4HZLRDr5rOHDAswH2OwFtn/qVPGR1fVbUr1TA9uqPOtxsJXA== +"@abp/datatables.net@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.1.tgz#ed45edcb4ee6832f38d4f1a56b5c0e1b126e8b82" + integrity sha512-DR53PGhHbW0ZdzeT7PWvBSfZrSyF2eWo1zAzCXsG+MsVRIiNzUNjipeq1igmd0PtXi2FHb76xS2utgAfgZEZ1A== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" datatables.net "^2.3.4" -"@abp/font-awesome@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.0-rc.3.tgz#a5b619452416af76203ef1bab18399abf8b8fa96" - integrity sha512-6FoA/2odS1kdV1EJ91YgIjMQiQdblUfqtDx72fDG7+qnqRyZ+Df/KWOqramEe9791zbXByZL4SjpqoisZgFNzQ== +"@abp/font-awesome@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.1.tgz#8c75feda6e394143f7e1cbe1ac8fc12b275bafed" + integrity sha512-2DDjc+EJcHDPUm/LHzbVjVMmChIaiEqMasKQ7qhxDq6yL102wMibPz0JR6Q9EYmYWro+Blf3Q0/0ECYLa8BgnQ== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.0-rc.3.tgz#24eefc512942dca37bdeb3fc1753cc3651e2872a" - integrity sha512-RRcGjt3blqH2R4uwrbrO+p1Kv6e7i1oJ9Wf6xrZK2upVfUvToUbif15HlC24FhNPX3BEUyL52s5HKcVBU5/1iw== +"@abp/jquery-form@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.1.tgz#e19c89863e2175a5e5db638ab95f648d2ee18ab3" + integrity sha512-nVZwEv0VeIP+xQZk7bz8S2RbKhkOUTKSf6mkdkLlna+8TNW0Ry8tBns79n/I0wYUh5007hxQbqb3L5TG4kq4+Q== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.0-rc.3.tgz#20c8647e006954887eebe86e17ef39a336f47a30" - integrity sha512-6DVIIEVyqyeKMrZHNOTfW3/xuw7rkjqTMKXT6Z1wrDpt9Erseuz8CjbPpcS+RwpXn6va5ShrkJlwwyScFOKvkQ== +"@abp/jquery-validation-unobtrusive@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.1.tgz#35d43938c05ed3f6aab67bfd574c82f5e83a277f" + integrity sha512-jch+haMxPqMcN7CrFoEnULXHSdP43E+CdwDkCYJnTjEydISMyr2CwW4cIA/ab4kjNXs1DloW+r8+unRnOzClWQ== dependencies: - "@abp/jquery-validation" "~10.0.0-rc.3" + "@abp/jquery-validation" "~10.0.1" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.0-rc.3.tgz#2e562ad5ca7c5bef389a0b24293a3193fa9823ef" - integrity sha512-xLJVvCkUrNnVeQbdsKfBj7zh3cSaPJC3eWKm2NoVy9KimEhF4zeSJEkciFmS0cckSal+AO2xC8W8ot3FqpkCHQ== +"@abp/jquery-validation@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.1.tgz#20c4c313d9ec73b4dc242729ab3250f747b76b66" + integrity sha512-cUGUCOuwKc1TR1R8GHpjN9HokWK6p6ElM4sN/J3yY/Nef9wKn4zY98Q3hmFLsCDeV+9Sjex1xcqNjqU3ZOiZSg== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" jquery-validation "^1.21.0" -"@abp/jquery@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.0-rc.3.tgz#3400f1b8c6966e2d71fceb5349f05b88aeb2bb88" - integrity sha512-liz3FITKdESLGomITjUqcOZYvV0rs61vYMxSbaCDoCKIQj4Ne9mN+HJ/KOpD6GOhqVsjmYOxDuSoecjiFLjVxA== +"@abp/jquery@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.1.tgz#fc6fb5fed08e6ab113e0096cd6c00ad10461fef4" + integrity sha512-hIQkMc9ouQz4QKaEJSVzZqQMyWdF7tmzZ8WlVN6EeWEDUKPLyuibhwTvTEO6u+17ZP7GhlldONHsRwTdc0zlJA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" jquery "~3.7.1" -"@abp/lodash@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.0-rc.3.tgz#738baf7394d466112dc5a2380f2c549053621505" - integrity sha512-5PYQks4sJPdiz9zfZD1bfrCkmQ+ZMfWg2xyjbHoQzJdqu9rb2SRzkQ5MAWvqQPVTdLY6Bnutwxuq6mjkfcthcQ== +"@abp/lodash@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.1.tgz#41df6cc6d375ea1e6a5a27745b68b0964bcbc295" + integrity sha512-15uv5kNtXBb+3hm7Qorh95mLhSIJkIbGa2bp3Tyw4jEdXTFPsb1v5FCC2m7LEaEUNuNgzXFJGT818Xi58AI0Rw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" lodash "^4.17.21" -"@abp/luxon@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.0-rc.3.tgz#bfb0c5fbf4a321e4531ec5b34dcdee47b486afe8" - integrity sha512-PCifbFy7t1h4L+FKJAo5Xr7v5hTvlelwuCsOVGfG8HVWmbOTKiQJywtxvSnARbsJ6SghUEzbqMzeX6nyHZ4Zuw== +"@abp/luxon@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.1.tgz#97c920867775def2bb1628b47507e45388179e40" + integrity sha512-LL/J4oyA+o9res57cq/+qsilTvo7ikxtCdpxGSIEjkvNTmYzcChv1ixmDMvqqMvJFELJ9R+1V7NeZhXBAiR6Lw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.0-rc.3.tgz#03bf7a8b2e71ec463794260e7fe5e6bfeb526f8e" - integrity sha512-aHOZnr4iPS6QqV07cXyWpQVl6zAaQXuct1yTeIUqcAqxsSt63K6Y27nBR8cU/m6BHhjaxSLn1kynOeccmx7lDA== +"@abp/malihu-custom-scrollbar-plugin@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.1.tgz#53dc824537110f155d00c46b1ffe7c6eff060040" + integrity sha512-S4zKvlTMvhkFCBhakql1bLB/lHlRjPy8An0KB2pBKvxfIvzUQn8YmiBSK51Hq/Hf6ZnnSJkNr35cb9TcHUwkNA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.0-rc.3.tgz#1d2c8081b9f7f2716b250d16b41021e74c093fb0" - integrity sha512-VKDVY3ml3bhPh2rUsUN1F7zH5Myi+jRYxQYC/OuOsa1P4x9+cKs1lsS68NYAq+JyMlwwuJcAx63nqkxArz+VEw== +"@abp/moment@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.1.tgz#dce2c26602ac9c77ea0209e6a3727a7e9f04f4c4" + integrity sha512-fRrMLQhYzOSATSM4hWdr7Y5ggbMd23ffivpDB4O2BDYUXTcfiWyVVKDd+5uLZi+znkWz29bNN4WswileuHvaGw== dependencies: moment "^2.30.1" -"@abp/select2@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.0-rc.3.tgz#216403f1207a2556b0317fb973ed874c34c7fb73" - integrity sha512-6t/ZZl9xo0G86dX8zmEv82/64dOxCTgcQvjRGTb5Xwzh05nKHKpFFhJm6juVvpJcYqUj6Weks66SVjr6Wi2kQQ== +"@abp/select2@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.1.tgz#df92daf67f46aa2fc884ef84f9da68b1fb8e63d7" + integrity sha512-VQxYH0Uqa7EN+F6XBkDMz3yy8yTM6xcZ6593WtZupl9UbiHToGElsem3ibnZueoyMHcd3ByYw968uvJX7zudNw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" select2 "^4.0.13" -"@abp/sweetalert2@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.0-rc.3.tgz#401dc08eb4607d3a575a5288296f6c703b18df8a" - integrity sha512-2nB9I+GxK7UeIjvdUJtAH9GqIL/HloQ+7WC/ZWUNLCBqI5Owx30La2wxj5e9MlDNcLvYs3A2EJP0Llo4Gdefsg== +"@abp/sweetalert2@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.1.tgz#a26874fd51ddffeba60f4506eb1a5c914ae3efae" + integrity sha512-4USaGSA5+7O6D+5a4YhluYPKUyOAassUUuKJATP8IqLRtpkh16P4tJ/7+QWvnFDIgJLURpbjmOiN2xhVzhpxvw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" sweetalert2 "^11.23.0" -"@abp/timeago@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.0-rc.3.tgz#6fc8f16107171ae6f6afbbd3dc7e844651ffcf77" - integrity sha512-JYhSRbz06IObwA32GutyV+yo4p5PdAmGtlaApDLCpSFccHsel/A3jrN+ykovKy4chWYcbOhxhgjWw6ZaIZMvJg== +"@abp/timeago@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.1.tgz#6bc36ab7dd3deea114ff1d68dbda908202837cf6" + integrity sha512-Wd2KY8B95ycsRDn5ouY3l3U+niBMEd+XCgZs6CoaMtiQ1AxkT7/iPqNCMJMKjeIjBQ/A1CSmKL7MI+BGw1bxBA== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" timeago "^1.6.7" -"@abp/utils@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.0-rc.3.tgz#d6a07146ba627bcfa0cadd5c7c56601609b24d57" - integrity sha512-bA/WPuosvedfQr+5cJBwKXrhd6b8fDG7LWp4PuZFMdti8nSXgOheLeZ8PcRvut94ENIXS7jzSsqapLHRj5E6zQ== +"@abp/utils@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.1.tgz#0db8713481cb781c3c4d07a150b7f45a65466b50" + integrity sha512-YGXgco/qYSxGaQfNTHDIMU1MyEuVDe3FayIZWPW5+p+elwp4DPFD4rvD+6ZLM0Jr30k5UdKT4IFAsw7wduQWrw== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index c216a6ba38..e8169fbfef 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -3,7 +3,7 @@ using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; 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 0277a0b878..c59f4fd76c 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,10 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.3", - "@abp/cms-kit": "10.0.0-rc.3" - }, - "resolutions": { - "codemirror": "^5.65.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.1", + "@abp/cms-kit": "10.0.1" } } 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 b6ff9f5f84..7ed7ff1d59 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,293 +2,293 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.0-rc.3.tgz#d2784a3779500b0f22149a35eb81f0456b732239" - integrity sha512-6fYmDHPbaZGzDZgNz6/UzStP3DM4icxscY/IrqyJ0Mhzq00j/4nuG7zuc9hogUxqifwrBAa/oiiUtdkG1tr4uQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.0-rc.3.tgz#a68d95a189e79dccb7bc50460565e03777e3823c" - integrity sha512-QvMZy5gVSksLYiGE8VvDQ7n5GKWCyuJF9Y7Kx6/bw+weWKvEk6kiqw5glTMzUOnpkM4kH7bIb8PoJSAycDlvRg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~10.0.0-rc.3" - "@abp/bootstrap" "~10.0.0-rc.3" - "@abp/bootstrap-datepicker" "~10.0.0-rc.3" - "@abp/bootstrap-daterangepicker" "~10.0.0-rc.3" - "@abp/datatables.net-bs5" "~10.0.0-rc.3" - "@abp/font-awesome" "~10.0.0-rc.3" - "@abp/jquery-form" "~10.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~10.0.0-rc.3" - "@abp/lodash" "~10.0.0-rc.3" - "@abp/luxon" "~10.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~10.0.0-rc.3" - "@abp/moment" "~10.0.0-rc.3" - "@abp/select2" "~10.0.0-rc.3" - "@abp/sweetalert2" "~10.0.0-rc.3" - "@abp/timeago" "~10.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.0-rc.3.tgz#8d3cbec33ff9efe7789e5cafb86c39e2488304ca" - integrity sha512-HqbleKwVFVRK0Xxd0XkeyCfX4+JPouEMYvQCL+zo0RDOMfPViPua5ketfU9DDhCCyMfCwy7iW0GeX9NuqEjXwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.1.tgz#3db3ac9291915c0b129fe90fd9a72ef1703c4b4d" + integrity sha512-D0Nv7VjNk03xF2Ii7pFEKSGzrggS5Y7NVApgOeFXbLhU/XZSfbR1A2wocLy6K+cKInH6+xhEyMdwTjwlUMx/Vw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.1.tgz#3c525bbc0da2b4e603b609289af623a030953f6d" + integrity sha512-euCjtPG2AjZ9AFbRQNh9649f40rQRfq58ZLvjUCfCvotbe7Fl+FaZgyIukpxXqKgd14NtCd2xPbvRM6/3Wj6IQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~10.0.1" + "@abp/bootstrap" "~10.0.1" + "@abp/bootstrap-datepicker" "~10.0.1" + "@abp/bootstrap-daterangepicker" "~10.0.1" + "@abp/datatables.net-bs5" "~10.0.1" + "@abp/font-awesome" "~10.0.1" + "@abp/jquery-form" "~10.0.1" + "@abp/jquery-validation-unobtrusive" "~10.0.1" + "@abp/lodash" "~10.0.1" + "@abp/luxon" "~10.0.1" + "@abp/malihu-custom-scrollbar-plugin" "~10.0.1" + "@abp/moment" "~10.0.1" + "@abp/select2" "~10.0.1" + "@abp/sweetalert2" "~10.0.1" + "@abp/timeago" "~10.0.1" + +"@abp/aspnetcore.mvc.ui@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.1.tgz#b004dc6313b9320b05f465eeb9e74877766ea0f0" + integrity sha512-IEiLfdpDwtrGek/z7iBlgKlZdCvgaL2q9/GGLySrLknnVtv/qONzYburveZsKw8LT7PbZWRQRBh2n7v6TT7M9w== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.0-rc.3.tgz#6d7528d9275cede4bf91b929dd407c744e513014" - integrity sha512-zBLJ9hQXucXOM0GpRyJCMHxdi+C5gaGQtYzguFFGDw+jW5Ht7paoAU+HYS8Dy29zHJHMk+VdO5vJovVIXhfuPg== +"@abp/bootstrap-datepicker@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.1.tgz#5d58e5039e39d84b179a0c343d616ab0fc7c38d4" + integrity sha512-hwpSDUTM/A/Rn+3Hjjt3xG7QdhmFruM7fGEEU8kd7Qowimx2XVNIM5Ua5obt5bGTyBmsaAx4HnurjJJn1oh4ng== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.0-rc.3.tgz#85b09ce28da96e84a9ad448cee5b73d581056041" - integrity sha512-VyAZqPZyx/sjGcYYqDPStwUMeQ+nMwud1pEmDgpPWWsRoQBPOVB3PS8KGgW4Fb2oax9i2v6wF5qqLEQkD3CDmA== +"@abp/bootstrap-daterangepicker@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.1.tgz#8ff88aed898e46c36a3e9601a791cb0fa1134f28" + integrity sha512-a1hhaSk+SffutUI0CxUgAG6Zmx/Y4L7i1LEsQff4OEq0j8ipaHT+5UHMXf2DbCMo7yoZh2yUXQAATO0A/O2V+A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.0-rc.3.tgz#9daacf0ab7b3967dedad7f8792b9125c439f9022" - integrity sha512-Rl5DFxazgWZrioVjO6MLgnZW9YBsXN0DoWX3rprBp6qsLdBSNduIdM6J8DqB2y/UadoJwZRduykRZRVPgka3HQ== +"@abp/bootstrap@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.1.tgz#cb857f21814097522fbd7e5c1a36cb22182e9f3e" + integrity sha512-AK/8ykw4SYjLgFgJE1zb2Mevn6ypqXqETbndN887JSny1QRrLUBVOKy6g+pnPUqI45/4wPfas7H9WgjFINiK2g== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" bootstrap "^5.3.8" -"@abp/clipboard@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.0.0-rc.3.tgz#43f7989809da0df90eecbdda999351defa9f3eec" - integrity sha512-KXvgt91WX4GDOLZsT8OpTBwWdN93/adX+b5OuNxzgASdxKWXI+cj2ZU2PIyKQjPvU7A6tqsBqglVe4DKlGDCiQ== +"@abp/clipboard@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.0.1.tgz#fc120857770a16c17f2d029a7920243357cda456" + integrity sha512-iMACbeAq6gSZ2/EUhwd1h/7gctRokSCMNuyE7hh7y2Rb0s4JeW5dbMx9QIc9oywPauRz4yCAJSFi7PJfObFL9w== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" clipboard "^2.0.11" -"@abp/cms-kit.admin@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-10.0.0-rc.3.tgz#260e7c6409c7004f9aee28b927b7d96c7dbcd545" - integrity sha512-5CAsTDzyJYuG1Ww+ucAOGm58nCRtavovkqMh18VuIEwrIuxFtliz5TS587kMl3XGug1MtsodFSZYHqqhzIvPVA== +"@abp/cms-kit.admin@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-10.0.1.tgz#98ac41348454728638c3b39ddb6d40cf138cd554" + integrity sha512-klgJYE6+fvJUb5R0yJlgbalcXBjrSLXVIe1V/NSPRYhBceHX71ZUIDcYYV5EQUs0FY/xEYiuIDR/M6mYcHYLeg== dependencies: - "@abp/codemirror" "~10.0.0-rc.3" - "@abp/jstree" "~10.0.0-rc.3" - "@abp/markdown-it" "~10.0.0-rc.3" - "@abp/slugify" "~10.0.0-rc.3" - "@abp/tui-editor" "~10.0.0-rc.3" - "@abp/uppy" "~10.0.0-rc.3" + "@abp/codemirror" "~10.0.1" + "@abp/jstree" "~10.0.1" + "@abp/markdown-it" "~10.0.1" + "@abp/slugify" "~10.0.1" + "@abp/tui-editor" "~10.0.1" + "@abp/uppy" "~10.0.1" -"@abp/cms-kit.public@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-10.0.0-rc.3.tgz#6c80384e979d7f00590ff42b599d0a9fce2909bb" - integrity sha512-u8aTT8p8kdhlqbEYVwXyW4CyHGpKbe5IFO9XpKFckVs7OzabbrZtFWzkVx8/kxStlLnM4DgvUo56+3ipNISMGQ== +"@abp/cms-kit.public@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-10.0.1.tgz#aab1d7ba0d34efc1733578e13730fb91cfe65c84" + integrity sha512-RwHusSvwYRZ9GIW4rvrLyPdbEwY75D/gBeABftumRYi9TYuMcrQxHfnQ0dByFiV98lq5V6sB/pvBPVyPcy6g3w== dependencies: - "@abp/highlight.js" "~10.0.0-rc.3" - "@abp/star-rating-svg" "~10.0.0-rc.3" + "@abp/highlight.js" "~10.0.1" + "@abp/star-rating-svg" "~10.0.1" -"@abp/cms-kit@10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-10.0.0-rc.3.tgz#2cb1bb682008db7ffb295cf4c529138f0c3681a1" - integrity sha512-y1ifTW2wGevW+zo42QndzcCihPf/q58512mVsmfXxJsXelFg/3f7Q3Kxndd4C4t1SLD3eygL0b69ny975v8K0g== +"@abp/cms-kit@10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-10.0.1.tgz#9c50225de5a7b6e1a80567ab912a4b81faec3e16" + integrity sha512-LxGWXbXUeXRzrd91NuTYM0wIRlIEdkTA1tOfTpZapNDO1MwSyadjt1DrtMvlRXo0xHlzE9PRw0KI8EUOGpi49A== dependencies: - "@abp/cms-kit.admin" "~10.0.0-rc.3" - "@abp/cms-kit.public" "~10.0.0-rc.3" + "@abp/cms-kit.admin" "~10.0.1" + "@abp/cms-kit.public" "~10.0.1" -"@abp/codemirror@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-10.0.0-rc.3.tgz#e5dc9fe9da5971aaad534571a4917f9008755ac4" - integrity sha512-CL0cjUTGC8R9+AV85C0v6lE4n2b1yc81pCVwgYCZB5mVDw0zLFtf0F3bnvT48UdjJ3TcHYrtiIs77oJXKAdvRA== +"@abp/codemirror@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-10.0.1.tgz#4b1b0feab9b711809d5115eb359c5ffe77e90056" + integrity sha512-Buj11XuJuDJnEKvSE+HCD846ynqctn76xhLoYwKD6mnRzdvVKw57MpU1TQVjXfqd8hiD418oE7uEaTW/zm7RvA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" codemirror "^5.65.1" -"@abp/core@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.0-rc.3.tgz#7c74ed023ee91fa18d92dc33a64c11d279eb2414" - integrity sha512-z6QKxlAsiXcCwvn3BvNouLa7UsxQmQSlZ2yleTcJ7uEDSwUzbhzCiUQ5WwHTqoOACPQ71/wasSaxEyeRQBcE8w== +"@abp/core@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.1.tgz#c96563310d28137b0ac24efff74a969fa13aa7bb" + integrity sha512-mc/Wve/fl/B3cLqQ18IXO0lw1QCi3kCbi8PxRoLowD8NZEguezNglFjNqdvHNvBaWpZpMgJc2U+B15giB0946w== dependencies: - "@abp/utils" "~10.0.0-rc.3" + "@abp/utils" "~10.0.1" -"@abp/datatables.net-bs5@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.0-rc.3.tgz#13a533e454c60702ab10eb41faa5643a7d6f6cce" - integrity sha512-a6O+iLX/LdLZTCbLfR7HJlr+z8KlIxih/PFBqaf5lLmTnyS0aJii+KMHjD7nRJy5/TWI+ALiT7gWRbjiHxOuFQ== +"@abp/datatables.net-bs5@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.1.tgz#1b33c14e9dabd0b29cc4d6f05120607a14313d55" + integrity sha512-0ww7HZ9m/OZWRQ2/9gNNgd59FpfvWSdw21onCBgJ7eaLd6KQeeFqbXm4eYjHoLgyRwk8c6u/F9ciir3EeTivhw== dependencies: - "@abp/datatables.net" "~10.0.0-rc.3" + "@abp/datatables.net" "~10.0.1" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.0-rc.3.tgz#ae97a33f1695b6cab1658ff476a984c7ab9d51a6" - integrity sha512-1gHnOKNJxELYHY7eeO32aFm5+YA2YSEeOO6HrY4HZLRDr5rOHDAswH2OwFtn/qVPGR1fVbUr1TA9uqPOtxsJXA== +"@abp/datatables.net@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.1.tgz#ed45edcb4ee6832f38d4f1a56b5c0e1b126e8b82" + integrity sha512-DR53PGhHbW0ZdzeT7PWvBSfZrSyF2eWo1zAzCXsG+MsVRIiNzUNjipeq1igmd0PtXi2FHb76xS2utgAfgZEZ1A== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" datatables.net "^2.3.4" -"@abp/font-awesome@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.0-rc.3.tgz#a5b619452416af76203ef1bab18399abf8b8fa96" - integrity sha512-6FoA/2odS1kdV1EJ91YgIjMQiQdblUfqtDx72fDG7+qnqRyZ+Df/KWOqramEe9791zbXByZL4SjpqoisZgFNzQ== +"@abp/font-awesome@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.1.tgz#8c75feda6e394143f7e1cbe1ac8fc12b275bafed" + integrity sha512-2DDjc+EJcHDPUm/LHzbVjVMmChIaiEqMasKQ7qhxDq6yL102wMibPz0JR6Q9EYmYWro+Blf3Q0/0ECYLa8BgnQ== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/highlight.js@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-10.0.0-rc.3.tgz#b72dfecd68208e5c9125fc3f03390761c1b1b784" - integrity sha512-dNzuKfm66N7lFiDCkiDBoJNbLerbpK6XRNowVRuVIb/rgGTdMmzk7CatV0n04OJQgMqm/cq+cZSV0Lp0f7v1YA== +"@abp/highlight.js@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-10.0.1.tgz#abdc2033d70c8701453186cd543458154b448961" + integrity sha512-a5Jp9gvS78pK3GxMxqkpN5nBxIGUtTrrr05zLmjh3ohzo/u7p+P1QQpZlOythEEjAgF6V+1PEMl/RRaDKmqllA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" "@highlightjs/cdn-assets" "~11.11.1" -"@abp/jquery-form@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.0-rc.3.tgz#24eefc512942dca37bdeb3fc1753cc3651e2872a" - integrity sha512-RRcGjt3blqH2R4uwrbrO+p1Kv6e7i1oJ9Wf6xrZK2upVfUvToUbif15HlC24FhNPX3BEUyL52s5HKcVBU5/1iw== +"@abp/jquery-form@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.1.tgz#e19c89863e2175a5e5db638ab95f648d2ee18ab3" + integrity sha512-nVZwEv0VeIP+xQZk7bz8S2RbKhkOUTKSf6mkdkLlna+8TNW0Ry8tBns79n/I0wYUh5007hxQbqb3L5TG4kq4+Q== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.0-rc.3.tgz#20c8647e006954887eebe86e17ef39a336f47a30" - integrity sha512-6DVIIEVyqyeKMrZHNOTfW3/xuw7rkjqTMKXT6Z1wrDpt9Erseuz8CjbPpcS+RwpXn6va5ShrkJlwwyScFOKvkQ== +"@abp/jquery-validation-unobtrusive@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.1.tgz#35d43938c05ed3f6aab67bfd574c82f5e83a277f" + integrity sha512-jch+haMxPqMcN7CrFoEnULXHSdP43E+CdwDkCYJnTjEydISMyr2CwW4cIA/ab4kjNXs1DloW+r8+unRnOzClWQ== dependencies: - "@abp/jquery-validation" "~10.0.0-rc.3" + "@abp/jquery-validation" "~10.0.1" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.0-rc.3.tgz#2e562ad5ca7c5bef389a0b24293a3193fa9823ef" - integrity sha512-xLJVvCkUrNnVeQbdsKfBj7zh3cSaPJC3eWKm2NoVy9KimEhF4zeSJEkciFmS0cckSal+AO2xC8W8ot3FqpkCHQ== +"@abp/jquery-validation@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.1.tgz#20c4c313d9ec73b4dc242729ab3250f747b76b66" + integrity sha512-cUGUCOuwKc1TR1R8GHpjN9HokWK6p6ElM4sN/J3yY/Nef9wKn4zY98Q3hmFLsCDeV+9Sjex1xcqNjqU3ZOiZSg== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" jquery-validation "^1.21.0" -"@abp/jquery@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.0-rc.3.tgz#3400f1b8c6966e2d71fceb5349f05b88aeb2bb88" - integrity sha512-liz3FITKdESLGomITjUqcOZYvV0rs61vYMxSbaCDoCKIQj4Ne9mN+HJ/KOpD6GOhqVsjmYOxDuSoecjiFLjVxA== +"@abp/jquery@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.1.tgz#fc6fb5fed08e6ab113e0096cd6c00ad10461fef4" + integrity sha512-hIQkMc9ouQz4QKaEJSVzZqQMyWdF7tmzZ8WlVN6EeWEDUKPLyuibhwTvTEO6u+17ZP7GhlldONHsRwTdc0zlJA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" jquery "~3.7.1" -"@abp/jstree@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-10.0.0-rc.3.tgz#2fa742149d42ac9d9758eb6a5c2ee309003caf39" - integrity sha512-QvMimaaMTokfEuhEd0OeJVAoTTYJyhb+7frPd52a1HraPF2d7aiht4bdHcOyeJxVYi2KiRmAgzIHHIX9AeIy8g== +"@abp/jstree@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-10.0.1.tgz#10db9cc5b9fba61424a202cf3ae15d7f26e651d6" + integrity sha512-V98/Bt++JQQjsPkcE81GAN7Sz6M5heq+t2uHn5gvqeUwkdX1OsutxKp1oSeXVrYItxeI7avWB9iTJGfsq0RhBQ== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" jstree "^3.3.17" -"@abp/lodash@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.0-rc.3.tgz#738baf7394d466112dc5a2380f2c549053621505" - integrity sha512-5PYQks4sJPdiz9zfZD1bfrCkmQ+ZMfWg2xyjbHoQzJdqu9rb2SRzkQ5MAWvqQPVTdLY6Bnutwxuq6mjkfcthcQ== +"@abp/lodash@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.1.tgz#41df6cc6d375ea1e6a5a27745b68b0964bcbc295" + integrity sha512-15uv5kNtXBb+3hm7Qorh95mLhSIJkIbGa2bp3Tyw4jEdXTFPsb1v5FCC2m7LEaEUNuNgzXFJGT818Xi58AI0Rw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" lodash "^4.17.21" -"@abp/luxon@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.0-rc.3.tgz#bfb0c5fbf4a321e4531ec5b34dcdee47b486afe8" - integrity sha512-PCifbFy7t1h4L+FKJAo5Xr7v5hTvlelwuCsOVGfG8HVWmbOTKiQJywtxvSnARbsJ6SghUEzbqMzeX6nyHZ4Zuw== +"@abp/luxon@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.1.tgz#97c920867775def2bb1628b47507e45388179e40" + integrity sha512-LL/J4oyA+o9res57cq/+qsilTvo7ikxtCdpxGSIEjkvNTmYzcChv1ixmDMvqqMvJFELJ9R+1V7NeZhXBAiR6Lw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.0-rc.3.tgz#03bf7a8b2e71ec463794260e7fe5e6bfeb526f8e" - integrity sha512-aHOZnr4iPS6QqV07cXyWpQVl6zAaQXuct1yTeIUqcAqxsSt63K6Y27nBR8cU/m6BHhjaxSLn1kynOeccmx7lDA== +"@abp/malihu-custom-scrollbar-plugin@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.1.tgz#53dc824537110f155d00c46b1ffe7c6eff060040" + integrity sha512-S4zKvlTMvhkFCBhakql1bLB/lHlRjPy8An0KB2pBKvxfIvzUQn8YmiBSK51Hq/Hf6ZnnSJkNr35cb9TcHUwkNA== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/markdown-it@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-10.0.0-rc.3.tgz#01f29a09fa8f87a928088ddab4ed73e5e06fa7f2" - integrity sha512-eVenb0mKVxZlvfDVoebt8fJrhvHzqM3y7Fc32FwQcd/0ExP09OT5/VlPbv6p88s59nvdznxtXCETQFjwZ9DkqQ== +"@abp/markdown-it@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-10.0.1.tgz#c8266ae68fb1603dd210563f55a2d69050687b46" + integrity sha512-mDe5ZXfaSBIHe1AKV9UgebjuxhDamb63/P6GdZ43hjuUXX42UgPCDO73Y7XuxDJbKZudxVecFoXMZ5mCzeKsLg== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" markdown-it "^14.1.0" -"@abp/moment@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.0-rc.3.tgz#1d2c8081b9f7f2716b250d16b41021e74c093fb0" - integrity sha512-VKDVY3ml3bhPh2rUsUN1F7zH5Myi+jRYxQYC/OuOsa1P4x9+cKs1lsS68NYAq+JyMlwwuJcAx63nqkxArz+VEw== +"@abp/moment@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.1.tgz#dce2c26602ac9c77ea0209e6a3727a7e9f04f4c4" + integrity sha512-fRrMLQhYzOSATSM4hWdr7Y5ggbMd23ffivpDB4O2BDYUXTcfiWyVVKDd+5uLZi+znkWz29bNN4WswileuHvaGw== dependencies: moment "^2.30.1" -"@abp/prismjs@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.0.0-rc.3.tgz#d7342b793fc7baf205726e8a088de88778fc24b1" - integrity sha512-cafgH3lrlT+jOuQKtBVeORbBkJKCG2DqnVF0blaD75ww32R5TJS+LH8gOufezdTfASG14ZlpzqNLl1Xu67Wh4Q== +"@abp/prismjs@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.0.1.tgz#dcd4c55e8fed9aa19712517c6f7a86c667269753" + integrity sha512-WdZLCL2UYFVqJnFYuSO4geAi5sdfgxITqI9BhEZdFuJzdfp89PZ4cnK7DYxnYBrgW/yh38xwzv+HVclK3xgPNA== dependencies: - "@abp/clipboard" "~10.0.0-rc.3" - "@abp/core" "~10.0.0-rc.3" + "@abp/clipboard" "~10.0.1" + "@abp/core" "~10.0.1" prismjs "^1.30.0" -"@abp/select2@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.0-rc.3.tgz#216403f1207a2556b0317fb973ed874c34c7fb73" - integrity sha512-6t/ZZl9xo0G86dX8zmEv82/64dOxCTgcQvjRGTb5Xwzh05nKHKpFFhJm6juVvpJcYqUj6Weks66SVjr6Wi2kQQ== +"@abp/select2@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.1.tgz#df92daf67f46aa2fc884ef84f9da68b1fb8e63d7" + integrity sha512-VQxYH0Uqa7EN+F6XBkDMz3yy8yTM6xcZ6593WtZupl9UbiHToGElsem3ibnZueoyMHcd3ByYw968uvJX7zudNw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" select2 "^4.0.13" -"@abp/slugify@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-10.0.0-rc.3.tgz#423502a7dacd960ee65f4ad3e7079ef56bb50b07" - integrity sha512-PAPutBCzD7TMijGXuiREpNBa4JLfW7Y7f2GDxJhKMqJ4WZ5yjMl+QWpAmrndeLyKi2w+HxnHocKTqnW/F8X5nA== +"@abp/slugify@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-10.0.1.tgz#47d8ffa59e4d57b61573e22167cecaaec257d81c" + integrity sha512-fIX4w+96Qdpa/UFq5jc6alSioilNp7LwqKum9G7LRDqjJoOPHRhG0IkPayY9v/oqJeDKoqlXMkD9s4b5MGQYPw== dependencies: slugify "^1.6.6" -"@abp/star-rating-svg@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-10.0.0-rc.3.tgz#672b4138c86c8502b0100c35b7dc471762e1454c" - integrity sha512-/DKDPhhfZBK+madBkYPWD2WxN2gPpxwFVXBaDR/esx9dZ8NuXZPkQ05RasEpwizz5RdK+yl9xF7JoH6ieYcqsw== +"@abp/star-rating-svg@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-10.0.1.tgz#3de67008012d080751cf671cf2bdede88906ca55" + integrity sha512-3vSxBayzdzMTKUeQaCrnFgJBO2V95L4GNUlYtV5txGPtziQd+VTPBL4mxVJ5F/6sizGUlmbXe4fMX33+DSfqbA== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.0-rc.3.tgz#401dc08eb4607d3a575a5288296f6c703b18df8a" - integrity sha512-2nB9I+GxK7UeIjvdUJtAH9GqIL/HloQ+7WC/ZWUNLCBqI5Owx30La2wxj5e9MlDNcLvYs3A2EJP0Llo4Gdefsg== +"@abp/sweetalert2@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.1.tgz#a26874fd51ddffeba60f4506eb1a5c914ae3efae" + integrity sha512-4USaGSA5+7O6D+5a4YhluYPKUyOAassUUuKJATP8IqLRtpkh16P4tJ/7+QWvnFDIgJLURpbjmOiN2xhVzhpxvw== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" sweetalert2 "^11.23.0" -"@abp/timeago@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.0-rc.3.tgz#6fc8f16107171ae6f6afbbd3dc7e844651ffcf77" - integrity sha512-JYhSRbz06IObwA32GutyV+yo4p5PdAmGtlaApDLCpSFccHsel/A3jrN+ykovKy4chWYcbOhxhgjWw6ZaIZMvJg== +"@abp/timeago@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.1.tgz#6bc36ab7dd3deea114ff1d68dbda908202837cf6" + integrity sha512-Wd2KY8B95ycsRDn5ouY3l3U+niBMEd+XCgZs6CoaMtiQ1AxkT7/iPqNCMJMKjeIjBQ/A1CSmKL7MI+BGw1bxBA== dependencies: - "@abp/jquery" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" timeago "^1.6.7" -"@abp/tui-editor@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-10.0.0-rc.3.tgz#0a196dcfd7eb30223b808e1c192942e6135e1715" - integrity sha512-IaaI1/KNkwYVmEadIoYvuXbdkpwk7CwYA+3Sp64Ow2cbQB6IatW9h4BPHLmQqRmaP1xTLwTLVWenThEpo2CIAQ== +"@abp/tui-editor@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-10.0.1.tgz#551720cf5ce65c5c1087afae2c8f7ee3079d4ed9" + integrity sha512-D9Pe+dP9huGLiH176WM2klodENrdI9fLjbX7Pg9rD0FeeydpKREDbgcFs3iJdECrhLU2nV1xTR3gntu9pql65g== dependencies: - "@abp/jquery" "~10.0.0-rc.3" - "@abp/prismjs" "~10.0.0-rc.3" + "@abp/jquery" "~10.0.1" + "@abp/prismjs" "~10.0.1" -"@abp/uppy@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-10.0.0-rc.3.tgz#ef15186cfb9f06a4eba6ed50b01815d1f8de7eae" - integrity sha512-MAlRdHXn9rWQeCnOKAMKk7DOqPnUj+ffnSByaFsnzmxoawl5ZMmUfhFq5eOT+QbYW02GWVWx1K9cG7wNq+6k+Q== +"@abp/uppy@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-10.0.1.tgz#5a5df3ac9239ecaeb3ff3bf41868c25dda7e4f59" + integrity sha512-lcERKrPp3cvYplJR0qFi6BJEwWy4jaewmZjtuMV4Vy5su0T1IKadyDNAtw6WLAQae+HGu4tMIZI8kc65AQshjQ== dependencies: - "@abp/core" "~10.0.0-rc.3" + "@abp/core" "~10.0.1" uppy "^5.1.2" -"@abp/utils@~10.0.0-rc.3": - version "10.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.0-rc.3.tgz#d6a07146ba627bcfa0cadd5c7c56601609b24d57" - integrity sha512-bA/WPuosvedfQr+5cJBwKXrhd6b8fDG7LWp4PuZFMdti8nSXgOheLeZ8PcRvut94ENIXS7jzSsqapLHRj5E6zQ== +"@abp/utils@~10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.1.tgz#0db8713481cb781c3c4d07a150b7f45a65466b50" + integrity sha512-YGXgco/qYSxGaQfNTHDIMU1MyEuVDe3FayIZWPW5+p+elwp4DPFD4rvD+6ZLM0Jr30k5UdKT4IFAsw7wduQWrw== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json index ce5b9fcead..f2cd1dfe77 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json @@ -955,10 +955,10 @@ { "namespace": "Volo.CmsKit.Admin.GlobalResources", "baseClass": { - "name": "ApplicationService", - "namespace": "Volo.Abp.Application.Services", - "declaringAssemblyName": "Volo.Abp.Ddd.Application", - "fullName": "Volo.Abp.Application.Services.ApplicationService" + "name": "CmsKitAdminAppServiceBase", + "namespace": "Volo.CmsKit.Admin", + "declaringAssemblyName": "Volo.CmsKit.Admin.Application", + "fullName": "Volo.CmsKit.Admin.CmsKitAdminAppServiceBase" }, "implementingInterfaces": [ { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml index 4ed695dfa8..39c4f4e191 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml @@ -91,13 +91,14 @@ { if (!propertyInfo.Name.EndsWith("_Text")) { - if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty()) + if (propertyInfo.IsEnum() || !propertyInfo.Lookup.Url.IsNullOrEmpty()) { - if (propertyInfo.Type.IsEnum) + if (propertyInfo.IsEnum()) { Model.ViewModel.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type); } >, ITransientDependency { + protected IFeatureChecker FeatureChecker { get; set; } protected IMenuItemRepository MenuRepository { get; } protected MenuItemManager MenuManager { get; } public PageChangedHandler( + IFeatureChecker featureChecker, IMenuItemRepository menuRepository, MenuItemManager menuManager) { + FeatureChecker = featureChecker; MenuRepository = menuRepository; MenuManager = menuManager; } public async Task HandleEventAsync(EntityUpdatedEventData eventData) { + if(!GlobalFeatureManager.Instance.IsEnabled()) + { + return; + } + + if(!await FeatureChecker.IsEnabledAsync(CmsKitFeatures.MenuEnable)) + { + return; + } + // TODO: Write a repository query. var allMenuItems = await MenuRepository.GetListAsync(); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json index 8e10e6ce08..3fafe1ced4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json @@ -710,10 +710,10 @@ { "namespace": "Volo.CmsKit.Public.GlobalResources", "baseClass": { - "name": "ApplicationService", - "namespace": "Volo.Abp.Application.Services", - "declaringAssemblyName": "Volo.Abp.Ddd.Application", - "fullName": "Volo.Abp.Application.Services.ApplicationService" + "name": "CmsKitPublicAppServiceBase", + "namespace": "Volo.CmsKit.Public", + "declaringAssemblyName": "Volo.CmsKit.Public.Application", + "fullName": "Volo.CmsKit.Public.CmsKitPublicAppServiceBase" }, "implementingInterfaces": [ { diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml index 95879128a7..0c0a1dc8f5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml @@ -5,32 +5,37 @@ @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating.RatingViewModel @inject IHtmlLocalizer L +@{ + var modalId = "ratingDetail_" + Model.EntityType + "_" + Model.EntityId; + modalId = modalId.Replace(".", "-").Replace(":", "-").Replace("/", "-").Replace(" ", "-"); + var modalLabelId = modalId + "_label"; +} +
@if (CurrentUser.IsAuthenticated) { - @if (!Model.IsReadOnly && Model.CurrentRating != null) + @if (Model.Ratings != null) { - - @L["Undo"] - - } - if (Model.Ratings != null) - { - + -