Skip to content

Merge branch dev with rel-10.0 #24074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2025
Merged

Merge branch dev with rel-10.0 #24074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd4ffad
Update_NPM_Packages
voloagent Oct 30, 2025
c26a2da
Merge branch 'rel-10.0' of https://github.com/abpframework/abp into r…
voloagent Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "asp.net",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.shared": "~9.3.6",
"@abp/prismjs": "~9.3.6",
"@abp/highlight.js": "~9.3.6"
"@abp/aspnetcore.mvc.ui.theme.shared": "~10.0.0-rc.2",
"@abp/prismjs": "~10.0.0-rc.2",
"@abp/highlight.js": "~10.0.0-rc.2"
}
}
356 changes: 178 additions & 178 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "asp.net",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6",
"@abp/prismjs": "~9.3.6"
"@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.2",
"@abp/prismjs": "~10.0.0-rc.2"
},
"devDependencies": {}
}
350 changes: 175 additions & 175 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/blogging/app/Volo.BloggingTestApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "volo.blogtestapp",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6",
"@abp/blogging": "~9.3.6"
"@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.2",
"@abp/blogging": "~10.0.0-rc.2"
}
}
388 changes: 194 additions & 194 deletions modules/blogging/app/Volo.BloggingTestApp/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "client-simulation-web",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6"
"@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.2"
}
}
312 changes: 156 additions & 156 deletions modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions modules/cms-kit/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "~9.3.6",
"@abp/ng.identity": "~9.3.6",
"@abp/ng.setting-management": "~9.3.6",
"@abp/ng.tenant-management": "~9.3.6",
"@abp/ng.theme.basic": "~9.3.6",
"@abp/ng.account": "~10.0.0-rc.2",
"@abp/ng.identity": "~10.0.0-rc.2",
"@abp/ng.setting-management": "~10.0.0-rc.2",
"@abp/ng.tenant-management": "~10.0.0-rc.2",
"@abp/ng.theme.basic": "~10.0.0-rc.2",
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
Expand Down
4 changes: 2 additions & 2 deletions modules/cms-kit/angular/projects/cms-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"peerDependencies": {
"@angular/common": "^9.1.11",
"@angular/core": "^9.1.11",
"@abp/ng.core": ">=9.3.6",
"@abp/ng.theme.shared": ">=9.3.6"
"@abp/ng.core": ">=10.0.0-rc.2",
"@abp/ng.theme.shared": ">=10.0.0-rc.2"
},
"dependencies": {
"tslib": "^2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "my-app-identityserver",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6"
"@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.2"
}
}
312 changes: 156 additions & 156 deletions modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6"
"@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.2"
}
}
312 changes: 156 additions & 156 deletions modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6",
"@abp/cms-kit": "9.3.6"
"@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.2",
"@abp/cms-kit": "10.0.0-rc.2"
}
}
2,642 changes: 2,104 additions & 538 deletions modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/docs/app/VoloDocs.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "volo.docstestapp",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6",
"@abp/docs": "~9.3.6"
"@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0-rc.2",
"@abp/docs": "~10.0.0-rc.2"
}
}
Loading
Loading