@@ -146,12 +146,13 @@ import { ChangeDetectionStrategy, Component } from "@angular/core";
selector: "app-validation-error",
imports:[CommonModule, LocalizationPipe],
template: `
-
{%{{{ 'AbpPermissionManagement::Permissions' | abpLocalization }}}%} -
@@ -360,19 +360,22 @@ Open the generated `permission-management.component.html` in `src/app/permission
@@ -393,34 +396,36 @@ Open the generated `permission-management.component.html` in `src/app/permission
}}}%}
-
-
-
-
+ @for (permission of selectedGroupPermissions; track permission.name; let i = $index) {
+
+
+
+
+ }
@@ -433,7 +438,7 @@ Open the generated `permission-management.component.html` in `src/app/permission
'AbpIdentity::Save' | abpLocalization
}}}%}
@@ -393,34 +396,36 @@ Open the generated `permission-management.component.html` in `src/app/permission
}}}%}
-
-
-
-
+ @for (permission of selectedGroupPermissions; track permission.name; let i = $index) {
+
+
+
+
+ }
-You may modify the behavior of the **start script** (in the package.json file) by changing the parameters passed to the `ng serve` command. For instance, if you do not want a browser window to open next time you run the script, remove `--open` from the end of it. Please check [ng serve documentation](https://angular.io/cli/serve) for all available options.
+You may modify the behavior of the **start script** (in the package.json file) by changing the parameters passed to the `ng serve` command. For instance, if you do not want a browser window to open next time you run the script, remove `--open` from the end of it. Please check [ng serve documentation](https://angular.dev/cli/serve) for all available options.
### Angular Live Development Server
-The development server of Angular is based on [Webpack DevServer](https://webpack.js.org/configuration/dev-server/). It tracks changes to source files and syncs the browser window after an incremental re-compilation every time [2](#f-dev-server) you make one. Your experience will be like this:
+The development server runs via Angular's Application Builder and uses a fast, modern dev server under the hood. It tracks changes to source files and refreshes the browser after an incremental compilation every time [2](#f-dev-server) you make one. Your experience will be like this:
@@ -122,13 +122,13 @@ Please keep in mind that you should not use this server in production. To provid
1 _If you see the error above when you run the Angular app, your browser might be blocking access to the API because of the self-signed certificate. Visit that address and allow access to it (once). When you see the Swagger interface, you are good to go._ [↩](#a-certificate-error)
-2 _Sometimes, depending on the file changed, Webpack may miss the change and cannot reflect it in the browser. For example, tsconfig files are not being tracked. In such a case, please restart the development server._ [↩](#a-dev-server)
+2 _Sometimes, depending on the file changed, the development server may not pick up the change (for example, certain configuration files like tsconfig are not watched). In such a case, please restart the development server._ [↩](#a-dev-server)
---
## How to Build the Angular Application
-An Angular application can have multiple [build targets](https://angular.io/guide/glossary#target), i.e. **configurations in angular.json** which define how [Architect](https://angular.io/guide/glossary#architect) will build applications and libraries. Usually, each build configuration has a separate environment variable file. Currently, the project has two: One for development and one for production.
+An Angular application can have multiple build targets, i.e. **configurations in angular.json** which define how [Architect](https://angular.dev/reference/configs/workspace-config) will build applications and libraries. Usually, each build configuration has a separate environment variable file. Currently, the project has two: One for development and one for production.
```js
// this is what environment variables look like
@@ -161,7 +161,7 @@ export const environment = {
} as Config.Environment;
```
-When you run the development server, variables defined in _environment.ts_ take effect. Similarly, in production mode, the default environment is replaced by _environment.prod.ts_ and completely different variables become effective. You may even [create a new build configuration](https://angular.dev/reference/configs/workspace-config#alternate-build-configurations) and set [file replacements](https://angular.io/guide/build#configure-target-specific-file-replacements) to use a completely new environment. For now, we will start a production build:
+When you run the development server, variables defined in _environment.ts_ take effect. Similarly, in production mode, the default environment is replaced by _environment.prod.ts_ and completely different variables become effective. You may even [create a new build configuration](https://angular.dev/reference/configs/workspace-config#alternate-build-configurations) and set [file replacements](https://angular.dev/tools/cli/environments) to use a completely new environment. For now, we will start a production build:
1. Open your terminal and navigate to the root Angular folder.
2. Run `yarn` or `npm install` if you have not installed dependencies already.
@@ -180,18 +180,18 @@ Angular web applications run on the browser and require no server except for a [
```shell
# please replace MyProjectName with your project name
-npx servor dist/MyProjectName index.html 4200 --browse
+npx servor dist/MyProjectName/browser index.html 4200 --browse
```
This command will download and start a simple static server, a browser window at `http://localhost:4200` will open, and the compiled output of your project will be served.
Of course, you need your application to run on an optimized web server and become available to everyone. This is quite straight-forward:
-1. Create a new static web server instance. You can use a service like [Azure App Service](https://azure.microsoft.com/en-us/services/app-service/web/), [Firebase](https://firebase.google.com/docs/hosting), [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), or even [GitHub Pages](https://angular.io/guide/deployment#deploy-to-github-pages). Another option is maintaining own web server with [NGINX](https://www.nginx.com/), [IIS](https://www.iis.net/), [Apache HTTP Server](https://httpd.apache.org/), or equivalent.
+1. Create a new static web server instance. You can use a service like [Azure App Service](https://azure.microsoft.com/en-us/services/app-service/web/), [Firebase](https://firebase.google.com/docs/hosting), [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), or even [GitHub Pages](https://angular.dev/tools/cli/deployment). Another option is maintaining own web server with [NGINX](https://www.nginx.com/), [IIS](https://www.iis.net/), [Apache HTTP Server](https://httpd.apache.org/), or equivalent.
2. Copy the files from `dist/MyProjectName` [1](#f-dist-folder-name) to a publicly served destination on the server via CLI of the service provider, SSH, or FTP (whichever is available). This step would be defined as a job if you have a CI/CD flow.
-3. [Configure the server](https://angular.io/guide/deployment#server-configuration) to redirect all requests to the _index.html_ file. Some services do that automatically. Others require you [to add a file to the bundle via assets](https://angular.io/guide/workspace-config#assets-configuration) which describes the server how to do the redirections. Occasionally, you may need to do manual configuration.
+3. [Configure the server](https://angular.dev/tools/cli/deployment#server-configuration) to redirect all requests to the _index.html_ file. Some services do that automatically. Others require you [to add a file to the bundle via assets](https://angular.dev/reference/configs/workspace-config) which describes the server how to do the redirections. Occasionally, you may need to do manual configuration.
-In addition, you can [deploy your application to certain targets using the Angular CLI](https://angular.io/guide/deployment#automatic-deployment-with-the-cli). Here are some deploy targets:
+In addition, you can [deploy your application to certain targets using the Angular CLI](https://angular.dev/tools/cli/deployment#automatic-deployment-with-the-cli). Here are some deploy targets:
- [Azure](https://github.com/Azure/ng-deploy-azure#readme)
- [Firebase](https://github.com/angular/angularfire#readme)
diff --git a/docs/en/framework/ui/angular/router-events.md b/docs/en/framework/ui/angular/router-events.md
index b7b760ae3f..5185c9c922 100644
--- a/docs/en/framework/ui/angular/router-events.md
+++ b/docs/en/framework/ui/angular/router-events.md
@@ -7,7 +7,7 @@
# Router Events Simplified
-`RouterEvents` is a utility service for filtering specific router events and reacting to them. Please see [this page in Angular docs](https://angular.io/api/router/Event) for available router events.
+`RouterEvents` is a utility service for filtering specific router events and reacting to them. Please see [this page in Angular docs](https://angular.dev/api/router/Event) for available router events.
## Benefit
diff --git a/docs/en/framework/ui/angular/service-proxies.md b/docs/en/framework/ui/angular/service-proxies.md
index 51a6c4f5b4..c816158f77 100644
--- a/docs/en/framework/ui/angular/service-proxies.md
+++ b/docs/en/framework/ui/angular/service-proxies.md
@@ -114,7 +114,7 @@ export class BookComponent implements OnInit {
}
```
-The Angular compiler removes the services that have not been injected anywhere from the final output. See the [tree-shakable providers documentation](https://angular.io/guide/dependency-injection-providers#tree-shakable-providers).
+The Angular compiler removes the services that have not been injected anywhere from the final output. See the [tree-shakable providers documentation](https://angular.dev/guide/di/defining-dependency-providers).
### Models
@@ -152,9 +152,11 @@ export class BookComponent implements OnInit {
```
diff --git a/docs/en/framework/ui/angular/ssr-configuration.md b/docs/en/framework/ui/angular/ssr-configuration.md
new file mode 100644
index 0000000000..258fce99b4
--- /dev/null
+++ b/docs/en/framework/ui/angular/ssr-configuration.md
@@ -0,0 +1,280 @@
+```json
+//[doc-seo]
+{
+ "Description": "Learn how to configure Server-Side Rendering (SSR) for your Angular application in the ABP Framework to improve performance and SEO."
+}
+```
+
+# SSR Configuration
+
+[Server-Side Rendering (SSR)](https://angular.io/guide/ssr) is a process that involves rendering pages on the server, resulting in initial HTML content that contains the page state. This allows the browser to show the page to the user immediately, before the JavaScript bundles are downloaded and executed.
+
+SSR improves the **performance** (First Contentful Paint) and **SEO** (Search Engine Optimization) of your application.
+
+## 1. Install ABP Angular SSR
+
+The ABP Framework provides a schematic to easily add SSR support to your Angular application.
+
+Run the following command in the root folder of your Angular application:
+
+```shell
+yarn ng generate @abp/ng.schematics:ssr-add
+```
+
+Alternatively, you can specify the project name if you have a multi-project workspace:
+
+```shell
+yarn ng generate @abp/ng.schematics:ssr-add --project MyProjectName
+```
+
+This command automates the setup process by installing necessary dependencies, creating server-side entry points, and updating your configuration files.
+
+## 2. What Changes?
+
+When you run the schematic, it performs the following actions:
+
+### 2.1. Dependencies
+
+It adds the following packages to your `package.json`:
+
+- **express**: A minimal and flexible Node.js web application framework.
+- **@types/express**: Type definitions for Express.
+- **openid-client**: A library for OpenID Connect (OIDC) relying party (RP) implementation, used for authentication on the server.
+
+```json
+{
+ "dependencies": {
+ "express": "^4.18.2",
+ "openid-client": "^5.6.4"
+ },
+ "devDependencies": {
+ "@types/express": "^4.17.17"
+ }
+}
+```
+
+**For Webpack projects only:**
+- **browser-sync** (Dev dependency): Used for live reloading during development.
+
+### 2.2. Scripts & Configuration
+
+The changes depend on the builder used in your project (Application Builder or Webpack).
+
+#### Application Builder (esbuild)
+
+If your project uses the **Application Builder** (`@angular/build:application`), the schematic:
+
+- **Scripts**: Adds `serve:ssr:project-name` to serve the SSR application.
+- **angular.json**: Updates the `build` target to enable SSR (`outputMode: 'server'`) and sets the SSR entry point.
+
+```json
+{
+ "projects": {
+ "MyProjectName": {
+ "architect": {
+ "build": {
+ "options": {
+ "outputPath": "dist/MyProjectName",
+ "outputMode": "server",
+ "ssr": {
+ "entry": "src/server.ts"
+ }
+ }
+ }
+ }
+ }
+ }
+}
+```
+
+- **tsconfig**: Updates the application's `tsconfig` to include `server.ts`.
+
+#### Webpack Builder
+
+If your project uses the **Webpack Builder** (`@angular-devkit/build-angular:browser`), the schematic:
+
+- **Scripts**: Adds `dev:ssr`, `serve:ssr`, `build:ssr`, and `prerender` scripts.
+- **angular.json**: Adds new targets: `server`, `serve-ssr`, and `prerender`.
+- **tsconfig**: Updates the server's `tsconfig` to include `server.ts`.
+
+### 2.3. Files
+
+- **server.ts**: This file is the main entry point for the server-side application.
+ - **Standalone Projects**: Generates a server entry point compatible with `bootstrapApplication`.
+ - **NgModule Projects**: Generates a server entry point compatible with `platformBrowserDynamic`.
+
+```typescript
+import {
+ AngularNodeAppEngine,
+ createNodeRequestHandler,
+ isMainModule,
+ writeResponseToNodeResponse,
+} from '@angular/ssr/node';
+import express from 'express';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { environment } from './environments/environment';
+import { ServerCookieParser } from '@abp/ng.core';
+import * as oidc from 'openid-client';
+
+// ... (OIDC configuration and setup)
+
+const app = express();
+const angularApp = new AngularNodeAppEngine();
+
+// ... (OIDC routes: /authorize, /logout, /)
+
+/**
+ * Serve static files from /browser
+ */
+app.use(
+ express.static(browserDistFolder, {
+ maxAge: '1y',
+ index: false,
+ redirect: false,
+ }),
+);
+
+/**
+ * Handle all other requests by rendering the Angular application.
+ */
+app.use((req, res, next) => {
+ angularApp
+ .handle(req)
+ .then(response => {
+ if (response) {
+ res.cookie('ssr-init', 'true', {...secureCookie, httpOnly: false});
+ return writeResponseToNodeResponse(response, res);
+ } else {
+ return next()
+ }
+ })
+ .catch(next);
+});
+
+// ... (Start server logic)
+
+export const reqHandler = createNodeRequestHandler(app);
+```
+- **app.routes.server.ts**: Defines server-side routes and render modes (e.g., Prerender, Server, Client). This allows fine-grained control over how each route is rendered.
+
+```typescript
+import { RenderMode, ServerRoute } from '@angular/ssr';
+
+export const serverRoutes: ServerRoute[] = [
+ {
+ path: '**',
+ renderMode: RenderMode.Server
+ }
+];
+```
+
+- **app.config.server.ts**: Merges the application configuration with server-specific providers.
+
+```typescript
+import { mergeApplicationConfig, ApplicationConfig, provideAppInitializer, inject, PLATFORM_ID, TransferState } from '@angular/core';
+import { isPlatformServer } from '@angular/common';
+import { provideServerRendering, withRoutes } from '@angular/ssr';
+import { appConfig } from './app.config';
+import { serverRoutes } from './app.routes.server';
+import { SSR_FLAG } from '@abp/ng.core';
+
+const serverConfig: ApplicationConfig = {
+ providers: [
+ provideAppInitializer(() => {
+ const platformId = inject(PLATFORM_ID);
+ const transferState = inject{%{{{ item.name }}}%}
+@for (item of list; track: track.by('id')) {
+ {%{{{ item.name }}}%}
+}
```
@@ -67,11 +68,11 @@ import { trackBy } from "@abp/ng.core";
@Component({
template: `
-
- {%{{{ item.name }}}%}
-
+ @for (item of list; track: trackById) {
+
+ {%{{{ item.name }}}%}
+
+ }
`,
})
class DemoComponent {
@@ -89,12 +90,11 @@ You can use `byDeep` to get a `TrackByFunction` that tracks the iterated object
```html
-
-
- {%{{{ item.tenant.name }}}%}
-
+@for (item of list; track: track.byDeep('tenant', 'account', 'id')) {
+
+ {%{{{ item.tenant.name }}}%}
+
+}
```
@@ -106,11 +106,11 @@ import { trackByDeep } from "@abp/ng.core";
@Component({
template: `
-
- {%{{{ item.name }}}%}
+ @for (item of list; track: trackByTenantAccountId) {
+ ()
+ 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/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.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())
{
: 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.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.
+ ///
+ ///
+ /// 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.
+///
+/// : 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.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.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/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())
{
=10.0.0",
- "@abp/ng.theme.shared": ">=10.0.0"
+ "@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 209885d4ea..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"
+ "@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 65ed9d96ea..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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.0.tgz#ad918558653ed7c6d329d58a37e681a9f410e01f"
- integrity sha512-gyAmQdwR/SWSNXF3Q8r1zyJu4h4DKnN+wSHfvfVB0A1+X/TFGUJXJ6FrJwoFh1QDAqeIdeXOTk4d+M3AZeCgIw==
+"@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"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.1"
-"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.0.tgz#ac4150739c6b2d24d27ddc86659e9d2bbdb82548"
- integrity sha512-ghockOUBUG4ZoQCKB7H5Jd5ztgnxJsDoVaxpPc/amcF2Nm/7shSA0w2uK5p1Qo7icGoOriE2zM0hfpuKy7JDeQ==
+"@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"
- "@abp/bootstrap" "~10.0.0"
- "@abp/bootstrap-datepicker" "~10.0.0"
- "@abp/bootstrap-daterangepicker" "~10.0.0"
- "@abp/datatables.net-bs5" "~10.0.0"
- "@abp/font-awesome" "~10.0.0"
- "@abp/jquery-form" "~10.0.0"
- "@abp/jquery-validation-unobtrusive" "~10.0.0"
- "@abp/lodash" "~10.0.0"
- "@abp/luxon" "~10.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~10.0.0"
- "@abp/moment" "~10.0.0"
- "@abp/select2" "~10.0.0"
- "@abp/sweetalert2" "~10.0.0"
- "@abp/timeago" "~10.0.0"
-
-"@abp/aspnetcore.mvc.ui@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.0.tgz#3357ba70f5f6545a87755a4c368f373c8cee6f8d"
- integrity sha512-S8wSmfRz66ozIm17a4cPJxBDoXRqhNAa+N6uV+gLhVRvTSFAGNvcCsUTCmW4VsEf1Wnaedxwg/cUFjMc6eD6nA==
+ "@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.0.tgz#76859087323bec5e8f9d05500b1858374e8d5f11"
- integrity sha512-rZo7+l/VWXsRmIKtqq6hGIqlew/nB2axIsaIHnrzuOqoSyq/SqMjBoUoQsvLSfK/YaoloYGj1r/IDmtb+OxCOg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.0.tgz#be561035b4778b040470246f71cd5b228c80bbc2"
- integrity sha512-njuKNfCg06d2J454/hD6A2lUZqg77c4qHxzPhaA5IFj5xGyV9qoZv98bz3Cf8KoHS/nrTHGRiAVYhfRxtx2Xrg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.0.tgz#f78a0a0f1dbee8839d074e23559fd9bf906673fd"
- integrity sha512-yXnSvZVl1T6y3vcZTCFBAm9C3kqWViM8cpYWGD/MNFnxz3CrrnCkE+SHFGwEaU2CozEBXIGgT3pDZ1rgQOIg9Q==
+"@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"
+ "@abp/core" "~10.0.1"
bootstrap "^5.3.8"
-"@abp/core@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.0.tgz#a201dab2cec00d61154499fc0e4784632d6a4c29"
- integrity sha512-9pg6a95iHtUMF9T0ZoNLO4xAJWoephBLPl2HqQ3TeagBuW3J1fu4FRM0bkvoUMaOUJ1O4emcfLUxkzqbaoEQWA==
+"@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"
+ "@abp/utils" "~10.0.1"
-"@abp/datatables.net-bs5@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.0.tgz#bc5d59dffbbb22ec866b1702424433cc5fd3280e"
- integrity sha512-2d/xlLHdf4oFE3EDyXpIQcdfsPjYvrUdv5RJTIajhMQ9vCftYwDtruDtVgnfNef7BR0KeeRJ3LAyxynh3siOuQ==
+"@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"
+ "@abp/datatables.net" "~10.0.1"
datatables.net-bs5 "^2.3.4"
-"@abp/datatables.net@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.0.tgz#9aa4dec837007eafa93667fcc36fe08f2ca25fcf"
- integrity sha512-GoxswQyOyYvCxZDdbNPMlJ9CG0S2OpmK1CqLOVLFbYYHWSGT8X4T+AVg7Bys2AaBqqz3Smg1duIawfMu2yVEAA==
+"@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"
+ "@abp/jquery" "~10.0.1"
datatables.net "^2.3.4"
-"@abp/font-awesome@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.0.tgz#390669267f70a817f21f1cc0508a8ceb613fc631"
- integrity sha512-R1pckhwQj+lHLV6rRD/sxEPqz58Od4xPKYR1IcfveZ74GV/PqVmjbNkC0U655l+CI6pwZzzyJMFVNRgl22/v6w==
+"@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"
+ "@abp/core" "~10.0.1"
"@fortawesome/fontawesome-free" "^7.0.1"
-"@abp/jquery-form@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.0.tgz#27182c80e17b4ffbc2551fa3e5d22f058c5b71ef"
- integrity sha512-QVf+geob891AfdM2SGWbuUXo9/MhIquqmBgLJveKXRoNExqLyp2+jbd4YTRUW9RB7ZEzoKg+U+Om9ax/nnRV4A==
+"@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"
+ "@abp/jquery" "~10.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.0.tgz#89698d2ec25f21e697d5b23540885a2c74115db8"
- integrity sha512-eqri3yDeyFutZcOJrP8aVf5vKoE47KP/mL8TXCRjyjVCZsHxOgjhSRY4n4rYo0JK2fePBOhwb5vpBhlezFKoNg==
+"@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"
+ "@abp/jquery-validation" "~10.0.1"
jquery-validation-unobtrusive "^4.0.0"
-"@abp/jquery-validation@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.0.tgz#83850af15bd3d65c399519da9461ff30fd615197"
- integrity sha512-2Sigm4L+8IwzvLYIoNWpOE8u/HvHLqWlOfqClL1x0p3JQBhgAVNns5sm3P6xgjWVJpCzrUOh8lxFMUGUiRSS0w==
+"@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"
+ "@abp/jquery" "~10.0.1"
jquery-validation "^1.21.0"
-"@abp/jquery@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.0.tgz#530b968eed2e94d13381679aabddfa4cb1aad8d5"
- integrity sha512-KksQlTs3VojDBxjBcLPkI55V7aG9TpDqzpylVq+5Sj8ZozFH9C75XQZpkLVwiU57rGYyQpfKuKAAPiZlJnWK0Q==
+"@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"
+ "@abp/core" "~10.0.1"
jquery "~3.7.1"
-"@abp/lodash@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.0.tgz#08c271911d398329dbcb815c109bf3a29a940f1c"
- integrity sha512-I8cqRK/2ln0/dFT9e+XzmjprBO2GnN5JCP8pb9q3wgOYb+Wf+BYg/3RQQhGAv+NhwCsxAezRMQfF+DU3xb3hAw==
+"@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"
+ "@abp/core" "~10.0.1"
lodash "^4.17.21"
-"@abp/luxon@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.0.tgz#e0743dca2b50561176aec44cf90870e80863d6b9"
- integrity sha512-CUPHIW/7osW2wDtjB6OuURq16/jAIPV9ssGINUxgJZYpVKsaHCfORQLQ+wn8h653Crf5CEiDVZMpuLaLVFEpXw==
+"@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"
+ "@abp/core" "~10.0.1"
luxon "^3.7.2"
-"@abp/malihu-custom-scrollbar-plugin@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.0.tgz#ff69e4dd180c7d6945b5db883b57b1131c51fae6"
- integrity sha512-yGHsYExELbF/sKXS6zQ9SqEsl8w3yr6daWOkgW/aoITks6DeOte2jdjP2Ly6UpHQbAzbeAjZg0oCrSbtcz/tZw==
+"@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"
+ "@abp/core" "~10.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/moment@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.0.tgz#8b84d1a15c43d0099125be2b5b071e11a7b402d4"
- integrity sha512-AAu4BgciErLKYTIW6uT14q5WCl+oJeXz0J7a/kyZz2tHYbQz4FnYWMuFoDUFvkKKtGzyq7LuKTmGPxmJUXNpRg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.0.tgz#0a3a425c30e4139b8677c871bb7bfd2ab010b9f6"
- integrity sha512-ZAFuLA8CIJr/UspKN/coRxnB+3xArc06a0YQ6HHVL5RWVRlRkcuZL/2aBFQ5HdrWZjSmImG1yXKxGyVLNmavpQ==
+"@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"
+ "@abp/core" "~10.0.1"
select2 "^4.0.13"
-"@abp/sweetalert2@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.0.tgz#ef9830d0d294aa685fe6ad8049056650a7d46381"
- integrity sha512-wAAIacOdWyBiJMVuFVbiNpR3SnRsyhNHmNr4gmhge5KBDlO+JQlueaar0MrKkdUNaXuF9memdgERzi/cIJm1mw==
+"@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"
+ "@abp/core" "~10.0.1"
sweetalert2 "^11.23.0"
-"@abp/timeago@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.0.tgz#af348b8ca21c466847c3dd47d4947f615ff82707"
- integrity sha512-LbGIKpsDJyoDpN4ams9yTebA7fOPerdN4bQUWJB/7LV5wI0jtzkvbe+bEI00NLeMIDJ/nU+k+ecjhQjzkrY7qQ==
+"@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"
+ "@abp/jquery" "~10.0.1"
timeago "^1.6.7"
-"@abp/utils@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.0.tgz#372ea8b37809ec1951d3fd74ae02adff9215245b"
- integrity sha512-VO725+ALRGmjFz9Yal+joivNZpBbPS9AWOx6N5E8meEYQnHo2oEDeoOziKkwLZ4EYIizno37zwsXiQLEO4iFRg==
+"@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 8d219b4042..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"
+ "@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 65ed9d96ea..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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.0.tgz#ad918558653ed7c6d329d58a37e681a9f410e01f"
- integrity sha512-gyAmQdwR/SWSNXF3Q8r1zyJu4h4DKnN+wSHfvfVB0A1+X/TFGUJXJ6FrJwoFh1QDAqeIdeXOTk4d+M3AZeCgIw==
+"@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"
+ "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.1"
-"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.0.tgz#ac4150739c6b2d24d27ddc86659e9d2bbdb82548"
- integrity sha512-ghockOUBUG4ZoQCKB7H5Jd5ztgnxJsDoVaxpPc/amcF2Nm/7shSA0w2uK5p1Qo7icGoOriE2zM0hfpuKy7JDeQ==
+"@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"
- "@abp/bootstrap" "~10.0.0"
- "@abp/bootstrap-datepicker" "~10.0.0"
- "@abp/bootstrap-daterangepicker" "~10.0.0"
- "@abp/datatables.net-bs5" "~10.0.0"
- "@abp/font-awesome" "~10.0.0"
- "@abp/jquery-form" "~10.0.0"
- "@abp/jquery-validation-unobtrusive" "~10.0.0"
- "@abp/lodash" "~10.0.0"
- "@abp/luxon" "~10.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~10.0.0"
- "@abp/moment" "~10.0.0"
- "@abp/select2" "~10.0.0"
- "@abp/sweetalert2" "~10.0.0"
- "@abp/timeago" "~10.0.0"
-
-"@abp/aspnetcore.mvc.ui@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.0.tgz#3357ba70f5f6545a87755a4c368f373c8cee6f8d"
- integrity sha512-S8wSmfRz66ozIm17a4cPJxBDoXRqhNAa+N6uV+gLhVRvTSFAGNvcCsUTCmW4VsEf1Wnaedxwg/cUFjMc6eD6nA==
+ "@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.0.tgz#76859087323bec5e8f9d05500b1858374e8d5f11"
- integrity sha512-rZo7+l/VWXsRmIKtqq6hGIqlew/nB2axIsaIHnrzuOqoSyq/SqMjBoUoQsvLSfK/YaoloYGj1r/IDmtb+OxCOg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.0.tgz#be561035b4778b040470246f71cd5b228c80bbc2"
- integrity sha512-njuKNfCg06d2J454/hD6A2lUZqg77c4qHxzPhaA5IFj5xGyV9qoZv98bz3Cf8KoHS/nrTHGRiAVYhfRxtx2Xrg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.0.tgz#f78a0a0f1dbee8839d074e23559fd9bf906673fd"
- integrity sha512-yXnSvZVl1T6y3vcZTCFBAm9C3kqWViM8cpYWGD/MNFnxz3CrrnCkE+SHFGwEaU2CozEBXIGgT3pDZ1rgQOIg9Q==
+"@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"
+ "@abp/core" "~10.0.1"
bootstrap "^5.3.8"
-"@abp/core@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.0.tgz#a201dab2cec00d61154499fc0e4784632d6a4c29"
- integrity sha512-9pg6a95iHtUMF9T0ZoNLO4xAJWoephBLPl2HqQ3TeagBuW3J1fu4FRM0bkvoUMaOUJ1O4emcfLUxkzqbaoEQWA==
+"@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"
+ "@abp/utils" "~10.0.1"
-"@abp/datatables.net-bs5@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.0.tgz#bc5d59dffbbb22ec866b1702424433cc5fd3280e"
- integrity sha512-2d/xlLHdf4oFE3EDyXpIQcdfsPjYvrUdv5RJTIajhMQ9vCftYwDtruDtVgnfNef7BR0KeeRJ3LAyxynh3siOuQ==
+"@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"
+ "@abp/datatables.net" "~10.0.1"
datatables.net-bs5 "^2.3.4"
-"@abp/datatables.net@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.0.tgz#9aa4dec837007eafa93667fcc36fe08f2ca25fcf"
- integrity sha512-GoxswQyOyYvCxZDdbNPMlJ9CG0S2OpmK1CqLOVLFbYYHWSGT8X4T+AVg7Bys2AaBqqz3Smg1duIawfMu2yVEAA==
+"@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"
+ "@abp/jquery" "~10.0.1"
datatables.net "^2.3.4"
-"@abp/font-awesome@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.0.tgz#390669267f70a817f21f1cc0508a8ceb613fc631"
- integrity sha512-R1pckhwQj+lHLV6rRD/sxEPqz58Od4xPKYR1IcfveZ74GV/PqVmjbNkC0U655l+CI6pwZzzyJMFVNRgl22/v6w==
+"@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"
+ "@abp/core" "~10.0.1"
"@fortawesome/fontawesome-free" "^7.0.1"
-"@abp/jquery-form@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.0.tgz#27182c80e17b4ffbc2551fa3e5d22f058c5b71ef"
- integrity sha512-QVf+geob891AfdM2SGWbuUXo9/MhIquqmBgLJveKXRoNExqLyp2+jbd4YTRUW9RB7ZEzoKg+U+Om9ax/nnRV4A==
+"@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"
+ "@abp/jquery" "~10.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.0.tgz#89698d2ec25f21e697d5b23540885a2c74115db8"
- integrity sha512-eqri3yDeyFutZcOJrP8aVf5vKoE47KP/mL8TXCRjyjVCZsHxOgjhSRY4n4rYo0JK2fePBOhwb5vpBhlezFKoNg==
+"@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"
+ "@abp/jquery-validation" "~10.0.1"
jquery-validation-unobtrusive "^4.0.0"
-"@abp/jquery-validation@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.0.tgz#83850af15bd3d65c399519da9461ff30fd615197"
- integrity sha512-2Sigm4L+8IwzvLYIoNWpOE8u/HvHLqWlOfqClL1x0p3JQBhgAVNns5sm3P6xgjWVJpCzrUOh8lxFMUGUiRSS0w==
+"@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"
+ "@abp/jquery" "~10.0.1"
jquery-validation "^1.21.0"
-"@abp/jquery@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.0.tgz#530b968eed2e94d13381679aabddfa4cb1aad8d5"
- integrity sha512-KksQlTs3VojDBxjBcLPkI55V7aG9TpDqzpylVq+5Sj8ZozFH9C75XQZpkLVwiU57rGYyQpfKuKAAPiZlJnWK0Q==
+"@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"
+ "@abp/core" "~10.0.1"
jquery "~3.7.1"
-"@abp/lodash@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.0.tgz#08c271911d398329dbcb815c109bf3a29a940f1c"
- integrity sha512-I8cqRK/2ln0/dFT9e+XzmjprBO2GnN5JCP8pb9q3wgOYb+Wf+BYg/3RQQhGAv+NhwCsxAezRMQfF+DU3xb3hAw==
+"@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"
+ "@abp/core" "~10.0.1"
lodash "^4.17.21"
-"@abp/luxon@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.0.tgz#e0743dca2b50561176aec44cf90870e80863d6b9"
- integrity sha512-CUPHIW/7osW2wDtjB6OuURq16/jAIPV9ssGINUxgJZYpVKsaHCfORQLQ+wn8h653Crf5CEiDVZMpuLaLVFEpXw==
+"@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"
+ "@abp/core" "~10.0.1"
luxon "^3.7.2"
-"@abp/malihu-custom-scrollbar-plugin@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.0.tgz#ff69e4dd180c7d6945b5db883b57b1131c51fae6"
- integrity sha512-yGHsYExELbF/sKXS6zQ9SqEsl8w3yr6daWOkgW/aoITks6DeOte2jdjP2Ly6UpHQbAzbeAjZg0oCrSbtcz/tZw==
+"@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"
+ "@abp/core" "~10.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/moment@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.0.tgz#8b84d1a15c43d0099125be2b5b071e11a7b402d4"
- integrity sha512-AAu4BgciErLKYTIW6uT14q5WCl+oJeXz0J7a/kyZz2tHYbQz4FnYWMuFoDUFvkKKtGzyq7LuKTmGPxmJUXNpRg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.0.tgz#0a3a425c30e4139b8677c871bb7bfd2ab010b9f6"
- integrity sha512-ZAFuLA8CIJr/UspKN/coRxnB+3xArc06a0YQ6HHVL5RWVRlRkcuZL/2aBFQ5HdrWZjSmImG1yXKxGyVLNmavpQ==
+"@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"
+ "@abp/core" "~10.0.1"
select2 "^4.0.13"
-"@abp/sweetalert2@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.0.tgz#ef9830d0d294aa685fe6ad8049056650a7d46381"
- integrity sha512-wAAIacOdWyBiJMVuFVbiNpR3SnRsyhNHmNr4gmhge5KBDlO+JQlueaar0MrKkdUNaXuF9memdgERzi/cIJm1mw==
+"@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"
+ "@abp/core" "~10.0.1"
sweetalert2 "^11.23.0"
-"@abp/timeago@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.0.tgz#af348b8ca21c466847c3dd47d4947f615ff82707"
- integrity sha512-LbGIKpsDJyoDpN4ams9yTebA7fOPerdN4bQUWJB/7LV5wI0jtzkvbe+bEI00NLeMIDJ/nU+k+ecjhQjzkrY7qQ==
+"@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"
+ "@abp/jquery" "~10.0.1"
timeago "^1.6.7"
-"@abp/utils@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.0.tgz#372ea8b37809ec1951d3fd74ae02adff9215245b"
- integrity sha512-VO725+ALRGmjFz9Yal+joivNZpBbPS9AWOx6N5E8meEYQnHo2oEDeoOziKkwLZ4EYIizno37zwsXiQLEO4iFRg==
+"@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 6780e05c5b..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",
- "@abp/cms-kit": "10.0.0"
- },
- "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 927ee12c76..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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.0.tgz#ad918558653ed7c6d329d58a37e681a9f410e01f"
- integrity sha512-gyAmQdwR/SWSNXF3Q8r1zyJu4h4DKnN+wSHfvfVB0A1+X/TFGUJXJ6FrJwoFh1QDAqeIdeXOTk4d+M3AZeCgIw==
- dependencies:
- "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.0"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.0.tgz#ac4150739c6b2d24d27ddc86659e9d2bbdb82548"
- integrity sha512-ghockOUBUG4ZoQCKB7H5Jd5ztgnxJsDoVaxpPc/amcF2Nm/7shSA0w2uK5p1Qo7icGoOriE2zM0hfpuKy7JDeQ==
- dependencies:
- "@abp/aspnetcore.mvc.ui" "~10.0.0"
- "@abp/bootstrap" "~10.0.0"
- "@abp/bootstrap-datepicker" "~10.0.0"
- "@abp/bootstrap-daterangepicker" "~10.0.0"
- "@abp/datatables.net-bs5" "~10.0.0"
- "@abp/font-awesome" "~10.0.0"
- "@abp/jquery-form" "~10.0.0"
- "@abp/jquery-validation-unobtrusive" "~10.0.0"
- "@abp/lodash" "~10.0.0"
- "@abp/luxon" "~10.0.0"
- "@abp/malihu-custom-scrollbar-plugin" "~10.0.0"
- "@abp/moment" "~10.0.0"
- "@abp/select2" "~10.0.0"
- "@abp/sweetalert2" "~10.0.0"
- "@abp/timeago" "~10.0.0"
-
-"@abp/aspnetcore.mvc.ui@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.0.tgz#3357ba70f5f6545a87755a4c368f373c8cee6f8d"
- integrity sha512-S8wSmfRz66ozIm17a4cPJxBDoXRqhNAa+N6uV+gLhVRvTSFAGNvcCsUTCmW4VsEf1Wnaedxwg/cUFjMc6eD6nA==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.0.tgz#76859087323bec5e8f9d05500b1858374e8d5f11"
- integrity sha512-rZo7+l/VWXsRmIKtqq6hGIqlew/nB2axIsaIHnrzuOqoSyq/SqMjBoUoQsvLSfK/YaoloYGj1r/IDmtb+OxCOg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.0.tgz#be561035b4778b040470246f71cd5b228c80bbc2"
- integrity sha512-njuKNfCg06d2J454/hD6A2lUZqg77c4qHxzPhaA5IFj5xGyV9qoZv98bz3Cf8KoHS/nrTHGRiAVYhfRxtx2Xrg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.0.0.tgz#f78a0a0f1dbee8839d074e23559fd9bf906673fd"
- integrity sha512-yXnSvZVl1T6y3vcZTCFBAm9C3kqWViM8cpYWGD/MNFnxz3CrrnCkE+SHFGwEaU2CozEBXIGgT3pDZ1rgQOIg9Q==
+"@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"
+ "@abp/core" "~10.0.1"
bootstrap "^5.3.8"
-"@abp/clipboard@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.0.0.tgz#ad3ebdcf5da314b4213518c2841fd8a15c3d4bf1"
- integrity sha512-UT9NIqLvKL88ybA67SihA3CAzcNXYACTP/pDLM5IoqkRs0UNpUlN7+nK5pmC6j1TxY72piGoa+havcWikU/7Jw==
+"@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"
+ "@abp/core" "~10.0.1"
clipboard "^2.0.11"
-"@abp/cms-kit.admin@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-10.0.0.tgz#8c100453f3b56f32c29f9d0cb8a88acd9248c0f6"
- integrity sha512-mg6+b8yF+i/oxfP+tyHeNBlPj33F+iDdUshVSCrESjkEuPOGlxU+n3Xwks0XB9RyAHRpWpvNNTt6JmnKM03Mfw==
+"@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"
- "@abp/jstree" "~10.0.0"
- "@abp/markdown-it" "~10.0.0"
- "@abp/slugify" "~10.0.0"
- "@abp/tui-editor" "~10.0.0"
- "@abp/uppy" "~10.0.0"
+ "@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-10.0.0.tgz#36175d172eb2fc2d1169ab98764d8ab999662c43"
- integrity sha512-4U/0A+qGgMdptSsh+SdAue6wwtYsUORGclvIw5GA4JQgCRboThsh2MfB4DAkl2xZqdHsrcljShkqR0DyYMM2LA==
+"@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"
- "@abp/star-rating-svg" "~10.0.0"
+ "@abp/highlight.js" "~10.0.1"
+ "@abp/star-rating-svg" "~10.0.1"
-"@abp/cms-kit@10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-10.0.0.tgz#1540c00ac0ab953e9a1a765ac98bd0f6257cb3c0"
- integrity sha512-KrCajyE7nVUeOhRw00s6g3bX2Fzw9uUpl0GpVO+Tsatr8Nf7qft50/i+VZ45ApRg/fnVwPhfQDKltdBfpcPrJQ==
+"@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"
- "@abp/cms-kit.public" "~10.0.0"
+ "@abp/cms-kit.admin" "~10.0.1"
+ "@abp/cms-kit.public" "~10.0.1"
-"@abp/codemirror@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-10.0.0.tgz#c27524db0b83a099ef2957083e2eac527ef01dac"
- integrity sha512-Kb8ClFayuLz86I3bT6dwEhbkJa+NGFLa/JlrAM/9UtlehWgAkVM9D5Ze9defAF+0T5cntijhunwEWdQv5iwf0w==
+"@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"
+ "@abp/core" "~10.0.1"
codemirror "^5.65.1"
-"@abp/core@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.0.0.tgz#a201dab2cec00d61154499fc0e4784632d6a4c29"
- integrity sha512-9pg6a95iHtUMF9T0ZoNLO4xAJWoephBLPl2HqQ3TeagBuW3J1fu4FRM0bkvoUMaOUJ1O4emcfLUxkzqbaoEQWA==
+"@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"
+ "@abp/utils" "~10.0.1"
-"@abp/datatables.net-bs5@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.0.tgz#bc5d59dffbbb22ec866b1702424433cc5fd3280e"
- integrity sha512-2d/xlLHdf4oFE3EDyXpIQcdfsPjYvrUdv5RJTIajhMQ9vCftYwDtruDtVgnfNef7BR0KeeRJ3LAyxynh3siOuQ==
+"@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"
+ "@abp/datatables.net" "~10.0.1"
datatables.net-bs5 "^2.3.4"
-"@abp/datatables.net@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.0.0.tgz#9aa4dec837007eafa93667fcc36fe08f2ca25fcf"
- integrity sha512-GoxswQyOyYvCxZDdbNPMlJ9CG0S2OpmK1CqLOVLFbYYHWSGT8X4T+AVg7Bys2AaBqqz3Smg1duIawfMu2yVEAA==
+"@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"
+ "@abp/jquery" "~10.0.1"
datatables.net "^2.3.4"
-"@abp/font-awesome@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.0.0.tgz#390669267f70a817f21f1cc0508a8ceb613fc631"
- integrity sha512-R1pckhwQj+lHLV6rRD/sxEPqz58Od4xPKYR1IcfveZ74GV/PqVmjbNkC0U655l+CI6pwZzzyJMFVNRgl22/v6w==
+"@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"
+ "@abp/core" "~10.0.1"
"@fortawesome/fontawesome-free" "^7.0.1"
-"@abp/highlight.js@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-10.0.0.tgz#8ca79a29c3fa6aef88ea20bf2fe74bdd58c3189e"
- integrity sha512-BouG7VBk1VjkIIHpO3B8XggBBfs2EUD7cTD9akmDciErANjTD22hWkPRhONM4uqZX4tm9/7RL+TxBFRYXY6dFA==
+"@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"
+ "@abp/core" "~10.0.1"
"@highlightjs/cdn-assets" "~11.11.1"
-"@abp/jquery-form@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.0.0.tgz#27182c80e17b4ffbc2551fa3e5d22f058c5b71ef"
- integrity sha512-QVf+geob891AfdM2SGWbuUXo9/MhIquqmBgLJveKXRoNExqLyp2+jbd4YTRUW9RB7ZEzoKg+U+Om9ax/nnRV4A==
+"@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"
+ "@abp/jquery" "~10.0.1"
jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.0.tgz#89698d2ec25f21e697d5b23540885a2c74115db8"
- integrity sha512-eqri3yDeyFutZcOJrP8aVf5vKoE47KP/mL8TXCRjyjVCZsHxOgjhSRY4n4rYo0JK2fePBOhwb5vpBhlezFKoNg==
+"@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"
+ "@abp/jquery-validation" "~10.0.1"
jquery-validation-unobtrusive "^4.0.0"
-"@abp/jquery-validation@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.0.0.tgz#83850af15bd3d65c399519da9461ff30fd615197"
- integrity sha512-2Sigm4L+8IwzvLYIoNWpOE8u/HvHLqWlOfqClL1x0p3JQBhgAVNns5sm3P6xgjWVJpCzrUOh8lxFMUGUiRSS0w==
+"@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"
+ "@abp/jquery" "~10.0.1"
jquery-validation "^1.21.0"
-"@abp/jquery@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.0.0.tgz#530b968eed2e94d13381679aabddfa4cb1aad8d5"
- integrity sha512-KksQlTs3VojDBxjBcLPkI55V7aG9TpDqzpylVq+5Sj8ZozFH9C75XQZpkLVwiU57rGYyQpfKuKAAPiZlJnWK0Q==
+"@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"
+ "@abp/core" "~10.0.1"
jquery "~3.7.1"
-"@abp/jstree@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-10.0.0.tgz#1a6588b6575e22f1643135cf220c0bd960204195"
- integrity sha512-NxHxIDctz92MjdS8pVY/qANv1H09UpWz+BUDdqtYuGw7QMGJQn+ZXiQck/G7fz2O/z1hQquHl0/5svR4ACg/fw==
+"@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"
+ "@abp/jquery" "~10.0.1"
jstree "^3.3.17"
-"@abp/lodash@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.0.0.tgz#08c271911d398329dbcb815c109bf3a29a940f1c"
- integrity sha512-I8cqRK/2ln0/dFT9e+XzmjprBO2GnN5JCP8pb9q3wgOYb+Wf+BYg/3RQQhGAv+NhwCsxAezRMQfF+DU3xb3hAw==
+"@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"
+ "@abp/core" "~10.0.1"
lodash "^4.17.21"
-"@abp/luxon@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.0.0.tgz#e0743dca2b50561176aec44cf90870e80863d6b9"
- integrity sha512-CUPHIW/7osW2wDtjB6OuURq16/jAIPV9ssGINUxgJZYpVKsaHCfORQLQ+wn8h653Crf5CEiDVZMpuLaLVFEpXw==
+"@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"
+ "@abp/core" "~10.0.1"
luxon "^3.7.2"
-"@abp/malihu-custom-scrollbar-plugin@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.0.tgz#ff69e4dd180c7d6945b5db883b57b1131c51fae6"
- integrity sha512-yGHsYExELbF/sKXS6zQ9SqEsl8w3yr6daWOkgW/aoITks6DeOte2jdjP2Ly6UpHQbAzbeAjZg0oCrSbtcz/tZw==
+"@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"
+ "@abp/core" "~10.0.1"
malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/markdown-it@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-10.0.0.tgz#7df1b5f662f85cf56a5e5499d44e42c4ed4f0c7c"
- integrity sha512-RVYgEQntj2DJrjVn026fPslrEO6oRjBK2saejrvfSqzGniPzBZWPQPc7lA9VU1cCPPEZJdYzpi6eWxC6DZSLMQ==
+"@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"
+ "@abp/core" "~10.0.1"
markdown-it "^14.1.0"
-"@abp/moment@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.0.0.tgz#8b84d1a15c43d0099125be2b5b071e11a7b402d4"
- integrity sha512-AAu4BgciErLKYTIW6uT14q5WCl+oJeXz0J7a/kyZz2tHYbQz4FnYWMuFoDUFvkKKtGzyq7LuKTmGPxmJUXNpRg==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.0.0.tgz#6463b5d5fcbe2f9da687e04c49d38e8eb6e778b8"
- integrity sha512-N2p18MAX9wYx62Ck5+V/RWLGyX+1BemiVuNX/cIOJMG0iDVJ57C6fEX1HzLc9Mchi+MXPHUR7lKwg92ui2OzfQ==
+"@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"
- "@abp/core" "~10.0.0"
+ "@abp/clipboard" "~10.0.1"
+ "@abp/core" "~10.0.1"
prismjs "^1.30.0"
-"@abp/select2@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.0.0.tgz#0a3a425c30e4139b8677c871bb7bfd2ab010b9f6"
- integrity sha512-ZAFuLA8CIJr/UspKN/coRxnB+3xArc06a0YQ6HHVL5RWVRlRkcuZL/2aBFQ5HdrWZjSmImG1yXKxGyVLNmavpQ==
+"@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"
+ "@abp/core" "~10.0.1"
select2 "^4.0.13"
-"@abp/slugify@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-10.0.0.tgz#2b5cd3a4e2062920f3e362ba1b5761d719326ef9"
- integrity sha512-3y/HhsRsDIdjL25NSMM4UqF8C1+wZQQHaXgguCysXeajMcLG6zzkr1F+rHqW55gylDRtlc7+dvAZTxJ9C2tF1g==
+"@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":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-10.0.0.tgz#eee8be42be93d473bb7d93665178ca1d886ba4bd"
- integrity sha512-UD0I/vHFn/nYVB5QpEjgGikKpN3e4Go9wuIIKgD3n1Ftj3wKHMX1HBTZw93OePzcatNVEcDqGaHGWehbqqNvaA==
+"@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"
+ "@abp/jquery" "~10.0.1"
star-rating-svg "^3.5.0"
-"@abp/sweetalert2@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.0.0.tgz#ef9830d0d294aa685fe6ad8049056650a7d46381"
- integrity sha512-wAAIacOdWyBiJMVuFVbiNpR3SnRsyhNHmNr4gmhge5KBDlO+JQlueaar0MrKkdUNaXuF9memdgERzi/cIJm1mw==
+"@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"
+ "@abp/core" "~10.0.1"
sweetalert2 "^11.23.0"
-"@abp/timeago@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.0.0.tgz#af348b8ca21c466847c3dd47d4947f615ff82707"
- integrity sha512-LbGIKpsDJyoDpN4ams9yTebA7fOPerdN4bQUWJB/7LV5wI0jtzkvbe+bEI00NLeMIDJ/nU+k+ecjhQjzkrY7qQ==
+"@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"
+ "@abp/jquery" "~10.0.1"
timeago "^1.6.7"
-"@abp/tui-editor@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-10.0.0.tgz#6ccfe6a2337f4bc08cbb9342a43fb95fc49980f4"
- integrity sha512-nDFmFbSzZ7IMM4LVIDGtvVWAbqYo+1OLOqeFL0iOXg21dUCBEs0WE8GQsaJsdOYa9AGyMLkzcHm37yqPqCN6mg==
+"@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"
- "@abp/prismjs" "~10.0.0"
+ "@abp/jquery" "~10.0.1"
+ "@abp/prismjs" "~10.0.1"
-"@abp/uppy@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-10.0.0.tgz#0694b8a39ed32c161c0731b115b64e037dc39c1b"
- integrity sha512-INKk6bsi01DYnUBCJ2hc+a4Th/QnBTtB7hJbWe+tCLkGXPZMD+2EB3ZW6kjD5ELgOwaIq1hQrEuj2N6MEQS31w==
+"@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"
+ "@abp/core" "~10.0.1"
uppy "^5.1.2"
-"@abp/utils@~10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.0.0.tgz#372ea8b37809ec1951d3fd74ae02adff9215245b"
- integrity sha512-VO725+ALRGmjFz9Yal+joivNZpBbPS9AWOx6N5E8meEYQnHo2oEDeoOziKkwLZ4EYIizno37zwsXiQLEO4iFRg==
+"@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);
}
-
+
+ {%{{{ item.name }}}%}
+ }
`,
})
class DemoComponent {
diff --git a/docs/en/get-started/empty-aspnet-core-application.md b/docs/en/get-started/empty-aspnet-core-application.md
index 78eb744eda..5bcec4ebb6 100644
--- a/docs/en/get-started/empty-aspnet-core-application.md
+++ b/docs/en/get-started/empty-aspnet-core-application.md
@@ -11,7 +11,7 @@ This tutorial explains how to start ABP from scratch with minimal dependencies.
## Create a New Project
-1. Create a new AspNet Core Web Application with Visual Studio 2022 (17.0.0+):
+1. Create a new AspNet Core Web Application with Visual Studio 2026 (18.0.0+):
diff --git a/docs/en/get-started/layered-web-application.md b/docs/en/get-started/layered-web-application.md
index dc65e45829..b2bd05454a 100644
--- a/docs/en/get-started/layered-web-application.md
+++ b/docs/en/get-started/layered-web-application.md
@@ -22,8 +22,8 @@ In this quick start guide, you will learn how to create and run a layered (and p
First things first! Let's setup your development environment before creating the first project. The following tools should be installed on your development machine:
-* [Visual Studio 2022](https://visualstudio.microsoft.com/) or another IDE that supports [.NET 9.0+](https://dotnet.microsoft.com/download/dotnet) development.
-* [.NET 9.0+](https://dotnet.microsoft.com/en-us/download/dotnet){{ if UI != "Blazor" }}
+* [Visual Studio 2026](https://visualstudio.microsoft.com/) or another IDE that supports [.NET 10.0+](https://dotnet.microsoft.com/download/dotnet) development.
+* [.NET 10.0+](https://dotnet.microsoft.com/en-us/download/dotnet){{ if UI != "Blazor" }}
* [Node v22.11+](https://nodejs.org/){{ end }}{{ if UI == "NG" }}
* [Yarn v1.22+ (not v2+)](https://classic.yarnpkg.com/en/docs/install) or npm v10+ (already installed with Node){{ end }}
* [Docker Desktop](https://www.docker.com/products/docker-desktop/)
@@ -276,4 +276,9 @@ You can start the following application(s):
> For example in non-tiered MVC with public website application:
-
\ No newline at end of file
+
+
+## What's next?
+
+- [TODO Application Tutorial with Layered Solution](../tutorials/todo/layered/index.md)
+- [Web Application Development Tutorial](../tutorials/book-store/index.md)
\ No newline at end of file
diff --git a/docs/en/get-started/microservice.md b/docs/en/get-started/microservice.md
index fb8626baef..d57c652b8e 100644
--- a/docs/en/get-started/microservice.md
+++ b/docs/en/get-started/microservice.md
@@ -15,8 +15,8 @@ In this quick start guide, you will learn how to create and run a microservice s
First things first! Let's setup your development environment before creating the first project. The following tools should be installed on your development machine:
-* [Visual Studio 2022](https://visualstudio.microsoft.com/vs/) or another IDE that supports .NET development
-* [.NET 9.0+](https://dotnet.microsoft.com/en-us/download/dotnet)
+* [Visual Studio 2026](https://visualstudio.microsoft.com/vs/) or another IDE that supports .NET development
+* [.NET 10.0+](https://dotnet.microsoft.com/en-us/download/dotnet)
* [Node v22.11+](https://nodejs.org/)
* [Yarn v1.22+ (not v2+)](https://classic.yarnpkg.com/en/docs/install) or npm v10+ (already installed with Node), **This is required for the Angular applications.**
* [Docker Desktop (with Kubernetes enabled)](https://www.docker.com/products/docker-desktop/)
diff --git a/docs/en/get-started/single-layer-web-application.md b/docs/en/get-started/single-layer-web-application.md
index 06c5ed90f9..9ee87fd439 100644
--- a/docs/en/get-started/single-layer-web-application.md
+++ b/docs/en/get-started/single-layer-web-application.md
@@ -21,8 +21,8 @@ In this quick start guide, you will learn how to create and run a single layer w
First things first! Let's setup your development environment before creating the first project. The following tools should be installed on your development machine:
-* [Visual Studio 2022](https://visualstudio.microsoft.com/) or another IDE that supports [.NET 9.0+](https://dotnet.microsoft.com/download/dotnet) development.
-* [.NET 9.0+](https://dotnet.microsoft.com/en-us/download/dotnet){{ if UI != "Blazor" }}
+* [Visual Studio 2026](https://visualstudio.microsoft.com/) or another IDE that supports [.NET 10.0+](https://dotnet.microsoft.com/download/dotnet) development.
+* [.NET 10.0+](https://dotnet.microsoft.com/en-us/download/dotnet){{ if UI != "Blazor" }}
* [Node v22.11+](https://nodejs.org/){{ end }}{{ if UI == "NG" }}
* [Yarn v1.22+ (not v2+)](https://classic.yarnpkg.com/en/docs/install) or npm v10+ (already installed with Node){{ end }}
@@ -185,3 +185,7 @@ You can then hit *F5* or *Ctrl + F5* to run the web application. It will run and
You can use `admin` as username and `1q2w3E*` as default password to login to the application.
+
+## What's next?
+
+- [TODO Application Tutorial with Single-Layer Solution](../tutorials/todo/single-layer/index.md)
\ No newline at end of file
diff --git a/docs/en/modules/ai-management/index.md b/docs/en/modules/ai-management/index.md
index 6657b0e463..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/index.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
diff --git a/docs/en/release-info/migration-guides/abp-5-0-angular.md b/docs/en/release-info/migration-guides/abp-5-0-angular.md
index f6abcf10f6..66627b1e8a 100644
--- a/docs/en/release-info/migration-guides/abp-5-0-angular.md
+++ b/docs/en/release-info/migration-guides/abp-5-0-angular.md
@@ -104,7 +104,7 @@ If you don't want to use the NGXS, you should remove all NGXS related imports, i
## @angular/localize package
-[`@angular/localize`](https://angular.io/api/localize) dependency has been removed from `@abp/ng.core` package. The package must be installed in your app. Run the following command to install:
+[`@angular/localize`](https://angular.dev/guide/i18n/add-package) dependency has been removed from `@abp/ng.core` package. The package must be installed in your app. Run the following command to install:
```bash
npm install @angular/localize@12
diff --git a/docs/en/release-info/release-notes.md b/docs/en/release-info/release-notes.md
index f0c58f0013..bf335fa7a2 100644
--- a/docs/en/release-info/release-notes.md
+++ b/docs/en/release-info/release-notes.md
@@ -14,9 +14,9 @@ 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-10-01)
+## 10.0 (2025-11-18)
-This is currently a RC (release-candidate) and you can see the detailed **[blog post / announcement](https://abp.io/community/announcements/announcing-abp-10-0-release-candidate-86lrnyox)** for the v10.0 release.
+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**
diff --git a/docs/en/samples/easy-crm.md b/docs/en/samples/easy-crm.md
index eb959a38c8..7aee565171 100644
--- a/docs/en/samples/easy-crm.md
+++ b/docs/en/samples/easy-crm.md
@@ -30,7 +30,7 @@ When you download and open the zip file, you will see two folders:
### Server Side / MVC (Razor Pages) Application
-* Open the solution (inside the aspnet-core folder) in **Visual Studio 2019** or later (or with another IDE that supports ASP.NET Core).
+* Open the solution (inside the aspnet-core folder) in **Visual Studio 2026** or later (or with another IDE that supports ASP.NET Core).
* This project use `Sqlite`, the default database folder is located at appsettings (`"SqliteDbFolder": "sqliteDbs"`, this folder is located in the MVC project).
* Open the `appsettings.json` file in the `Volo.EasyCrm.Web` application and set `"UseDynamicDatabase": "false"`.
> The MVC project is creating new database for each unique visitor. And the visitor id is stored at cookies. When you set `UseDynamicDatabase` as a `true`, you cannot run Blazor & Angular projects because they have no cookie implementation. Be aware it is set as `false` for running Blazor & Angular applications.
diff --git a/docs/en/samples/microservice-demo.md b/docs/en/samples/microservice-demo.md
index 31516b2a55..c31959f6b0 100644
--- a/docs/en/samples/microservice-demo.md
+++ b/docs/en/samples/microservice-demo.md
@@ -60,7 +60,7 @@ To be able to run the solution from source code, following tools should be insta
### Open & Build the Visual Studio Solution
-* Open the `samples\MicroserviceDemo\MicroserviceDemo.sln` in Visual Studio 2017 (15.9.0+).
+* Open the `samples\MicroserviceDemo\MicroserviceDemo.sln` in Visual Studio 2026 (18.0.0+).
* Run `dotnet restore` from the command line inside the `samples\MicroserviceDemo` folder.
* Build the solution in Visual Studio.
diff --git a/docs/en/solution-templates/layered-web-application/web-applications.md b/docs/en/solution-templates/layered-web-application/web-applications.md
index 58cc3af078..8400a6dfbe 100644
--- a/docs/en/solution-templates/layered-web-application/web-applications.md
+++ b/docs/en/solution-templates/layered-web-application/web-applications.md
@@ -120,7 +120,7 @@ The required style files are added to the `styles` array in `angular.json`. `App
You should create your tests in the same folder as the file you want to test.
-See the [testing document](https://angular.io/guide/testing).
+See the [testing document](https://angular.dev/guide/testing).
### Depended Packages
diff --git a/docs/en/suite/editing-templates.md b/docs/en/suite/editing-templates.md
index 9c859ba0de..354adc8ead 100644
--- a/docs/en/suite/editing-templates.md
+++ b/docs/en/suite/editing-templates.md
@@ -27,7 +27,7 @@ There's a search box on the templates page. To find the related template, pick a
There's a naming convention for the template files.
* If the template name has `Server` prefix, it's used for backend code like repositories, application services, localizations, controllers, permissions, mappings, unit tests.
-* If the template name has `Frontend.Angular` prefix, it's used for Angular code generation. The Angular code is being generated via [Angular Schematics](https://angular.io/guide/schematics).
+* If the template name has `Frontend.Angular` prefix, it's used for Angular code generation. The Angular code is being generated via [Angular Schematics](https://angular.dev/tools/cli/schematics).
* If the template name has `Frontend.Mvc` prefix, it's used for razor pages, menus, JavaScript, CSS files.
* If the template name has `Frontend.Blazor` prefix, it's used for razor components.
diff --git a/docs/en/suite/generating-crud-page.md b/docs/en/suite/generating-crud-page.md
index cc9df3ee32..afc2536709 100644
--- a/docs/en/suite/generating-crud-page.md
+++ b/docs/en/suite/generating-crud-page.md
@@ -294,7 +294,7 @@ There are some adjustments you may need to make before generating CRUD pages for
- Check if your environment variables have `rootNamespace` defined as explained [here](../framework/ui/angular/service-proxies.md#angular-project-configuration).
-- Check if your [workspace configuration](https://angular.io/guide/workspace-config) satisfies one of the following. Examples assume your solution namespace is `BookStore`, `Acme.BookStore`, or `Acme.Retail.BookStore`.
+- Check if your [workspace configuration](https://angular.dev/reference/configs/workspace-config) satisfies one of the following. Examples assume your solution namespace is `BookStore`, `Acme.BookStore`, or `Acme.Retail.BookStore`.
- Project key is in pascal case. E.g. `BookStore`.
- Project key is in camel case. E.g. `bookStore`.
- Project key is in kebab case. E.g. `book-store`.
diff --git a/docs/en/suite/solution-structure.md b/docs/en/suite/solution-structure.md
index d36ea35e7f..4b15be2f07 100644
--- a/docs/en/suite/solution-structure.md
+++ b/docs/en/suite/solution-structure.md
@@ -303,7 +303,7 @@ Lepton theme uses two logos for each style. You can change these logos with your
You should create your tests in the same folder as the file file you want to test.
-See the [testing document](https://angular.io/guide/testing).
+See the [testing document](https://angular.dev/guide/testing).
### Depended Packages
diff --git a/docs/en/tutorials/book-store/part-03.md b/docs/en/tutorials/book-store/part-03.md
index a2bac2110e..73b2daea4e 100644
--- a/docs/en/tutorials/book-store/part-03.md
+++ b/docs/en/tutorials/book-store/part-03.md
@@ -670,7 +670,7 @@ You can open your browser and click the **New book** button to see the new modal
### Create a Reactive Form
-[Reactive forms](https://angular.io/guide/reactive-forms) provide a model-driven approach to handling form inputs whose values change over time.
+[Reactive forms](https://angular.dev/guide/forms/reactive-forms) provide a model-driven approach to handling form inputs whose values change over time.
Open `/src/app/book/book.component.ts` and replace the content as below:
@@ -742,7 +742,7 @@ 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 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.
+* Injected the `FormBuilder` with the inject function. [FormBuilder](https://angular.dev/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.
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/todo/layered/index.md b/docs/en/tutorials/todo/layered/index.md
index 632168c4b3..c8d95b627c 100644
--- a/docs/en/tutorials/todo/layered/index.md
+++ b/docs/en/tutorials/todo/layered/index.md
@@ -59,7 +59,7 @@ This documentation has a video tutorial on **YouTube**!! You can watch it here:
## Pre-Requirements
-* An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 9.0+](https://dotnet.microsoft.com/download/dotnet) development.
+* An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 10.0+](https://dotnet.microsoft.com/download/dotnet) development.
* [Node v20.11+](https://nodejs.org/)
{{if DB=="EF"}}
* [SQL Server Express LocalDB](https://learn.microsoft.com/en-us/sql/database-engine/configure-windows/sql-server-express-localdb)
diff --git a/docs/en/tutorials/todo/single-layer/index.md b/docs/en/tutorials/todo/single-layer/index.md
index 1452462dcd..6a7f45ce62 100644
--- a/docs/en/tutorials/todo/single-layer/index.md
+++ b/docs/en/tutorials/todo/single-layer/index.md
@@ -55,7 +55,7 @@ This documentation has a video tutorial on **YouTube**!! You can watch it here:
## Pre-Requirements
-* An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 9.0+](https://dotnet.microsoft.com/download/dotnet) development.
+* An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 10.0+](https://dotnet.microsoft.com/download/dotnet) development.
* [Node v20.11+](https://nodejs.org/)
{{if DB=="EF"}}
* [SQL Server Express LocalDB](https://learn.microsoft.com/en-us/sql/database-engine/configure-windows/sql-server-express-localdb)
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@L["Format"].Value
@@ -161,9 +161,6 @@
@L["LastSignificantUpdateTime"].Value
@@ -185,7 +182,9 @@
-
+
+
+