Merge pull request #21110 from abpframework/auto-merge/rel-8-3/3094

Merge branch prerel-9.0 with rel-8.3
abpframework · Oct 17, 2024 · cffb178 · cffb178
2 parents 7780f28 + 4c04fbd
commit cffb178
Show file tree

Hide file tree

Showing 137 changed files with 1,718 additions and 1,824 deletions.
diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
@@ -3,8 +3,8 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~8.3.1",
-    "@abp/prismjs": "~8.3.1",
-    "@abp/highlight.js": "~8.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~8.3.2",
+    "@abp/prismjs": "~8.3.2",
+    "@abp/highlight.js": "~8.3.2"
   }
 }
diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
@@ -3,8 +3,8 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.1",
-    "@abp/prismjs": "~8.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.2",
+    "@abp/prismjs": "~8.3.2"
   },
   "devDependencies": {}
 }
diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json
@@ -3,7 +3,7 @@
   "name": "volo.blogtestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.1",
-    "@abp/blogging": "~8.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.2",
+    "@abp/blogging": "~8.3.2"
   }
 }
diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
@@ -3,6 +3,6 @@
   "name": "client-simulation-web",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.2"
   }
 }
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json
@@ -15,11 +15,11 @@
     },
     "private": true,
     "dependencies": {
-        "@abp/ng.account": "~8.3.1",
-        "@abp/ng.identity": "~8.3.1",
-        "@abp/ng.setting-management": "~8.3.1",
-        "@abp/ng.tenant-management": "~8.3.1",
-        "@abp/ng.theme.basic": "~8.3.1",
+        "@abp/ng.account": "~8.3.2",
+        "@abp/ng.identity": "~8.3.2",
+        "@abp/ng.setting-management": "~8.3.2",
+        "@abp/ng.tenant-management": "~8.3.2",
+        "@abp/ng.theme.basic": "~8.3.2",
         "@angular/animations": "~10.0.0",
         "@angular/common": "~10.0.0",
         "@angular/compiler": "~10.0.0",

diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json
@@ -4,8 +4,8 @@
   "peerDependencies": {
     "@angular/common": "^9.1.11",
     "@angular/core": "^9.1.11",
-    "@abp/ng.core": ">=8.3.1",
-    "@abp/ng.theme.shared": ">=8.3.1"
+    "@abp/ng.core": ">=8.3.2",
+    "@abp/ng.theme.shared": ">=8.3.2"
   },
   "dependencies": {
     "tslib": "^2.0.0"

diff --git 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": "~8.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.2"
   }
 }
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
diff --git 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": "~8.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.2"
   }
 }
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
@@ -3,7 +3,7 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.1",
-    "@abp/cms-kit": "8.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.2",
+    "@abp/cms-kit": "8.3.2"
   }
 }