Merge pull request #25250 from abpframework/auto-merge/rel-10-2/4488

Merge branch rel-10.3 with rel-10.2
6 months ago · c179d77deb
28 changed files with 76 additions and 78 deletions
--- a/modules/blogging/app/Volo.BloggingTestApp/package.json
+++ b/modules/blogging/app/Volo.BloggingTestApp/package.json
@ -1,9 +1,9 @@
 {
-  "version": "0.1.0",
+    "version": "0.1.0",
-  "name": "volo.blogtestapp",
+    "name": "volo.blogtestapp",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
-    "@abp/blogging": "~10.3.0-rc.2"
+        "@abp/blogging": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
@ -1,8 +1,8 @@
 {
-  "version": "0.1.0",
+    "version": "0.1.0",
-  "name": "client-simulation-web",
+    "name": "client-simulation-web",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/cms-kit/angular/projects/cms-kit/package.json
+++ b/modules/cms-kit/angular/projects/cms-kit/package.json
@ -1,13 +1,13 @@
 {
-  "name": "@my-company-name/cms-kit",
+    "name": "@my-company-name/cms-kit",
-  "version": "0.0.1",
+    "version": "0.0.1",
-  "peerDependencies": {
+    "peerDependencies": {
-    "@angular/common": "^9.1.11",
+        "@angular/common": "^9.1.11",
-    "@angular/core": "^9.1.11",
+        "@angular/core": "^9.1.11",
-    "@abp/ng.core": ">=10.3.0-rc.2",
+        "@abp/ng.core": ">=10.3.0-rc.2",
-    "@abp/ng.theme.shared": ">=10.3.0-rc.2"
+        "@abp/ng.theme.shared": ">=10.3.0-rc.2"
-  },
+    },
-  "dependencies": {
+    "dependencies": {
-    "tslib": "^2.0.0"
+        "tslib": "^2.0.0"
-}
+    }
 }
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
@ -1,8 +1,8 @@
 {
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "name": "my-app-identityserver",
+    "name": "my-app-identityserver",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
@ -1,8 +1,8 @@
 {
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "name": "my-app",
+    "name": "my-app",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
@ -1,9 +1,9 @@
 {
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "name": "my-app",
+    "name": "my-app",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
-    "@abp/cms-kit": "10.3.0-rc.2"
+        "@abp/cms-kit": "10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/docs/app/VoloDocs.Web/package.json
+++ b/modules/docs/app/VoloDocs.Web/package.json
@ -1,9 +1,9 @@
 {
-  "version": "0.1.0",
+    "version": "0.1.0",
-  "name": "volo.docstestapp",
+    "name": "volo.docstestapp",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
-    "@abp/docs": "~10.3.0-rc.2"
+        "@abp/docs": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json
+++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json
@ -1,8 +1,8 @@
 {
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "name": "my-app",
+    "name": "my-app",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json
+++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json
@ -1,8 +1,8 @@
 {
-  "version": "0.1.0",
+    "version": "0.1.0",
-  "name": "demo-app",
+    "name": "demo-app",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/modules/virtual-file-explorer/app/package.json
+++ b/modules/virtual-file-explorer/app/package.json
@ -1,9 +1,9 @@
 {
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "name": "my-app",
+    "name": "my-app",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
+        "@abp/aspnetcore.mvc.ui.theme.basic": "~10.3.0-rc.2",
-    "@abp/virtual-file-explorer": "~10.3.0-rc.2"
+        "@abp/virtual-file-explorer": "~10.3.0-rc.2"
-  }
+    }
 }
--- a/npm/lerna.json
+++ b/npm/lerna.json
@ -1,8 +1,6 @@
 {
  "version": "10.3.0-rc.2",
-  "packages": [
+  "packages": ["packs/*"],
    "packs/*"
  ],
  "npmClient": "yarn",
  "lerna": "3.18.4"
 }
--- a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip
+++ b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip
--- a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip
+++ b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip
--- a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip
+++ b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip
--- a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip
+++ b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip
--- a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip
+++ b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip
--- a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip
+++ b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip
--- a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip
+++ b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip
--- a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip
+++ b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip
--- a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip
+++ b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip
--- a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip
+++ b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip
--- a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip
+++ b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip
--- a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip
+++ b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip
--- a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip
+++ b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip
--- a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip
+++ b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip
--- a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip
+++ b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip
--- a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip
+++ b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json
@ -1,8 +1,8 @@
 {
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "name": "my-app-authserver",
+    "name": "my-app-authserver",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.3.0-rc.2"
+        "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.3.0-rc.2"
-  }
+    }
 }