From c098781584ed614f70ee739a60e9463e54841107 Mon Sep 17 00:00:00 2001 From: xyfy Date: Wed, 17 Nov 2021 14:29:31 +0800 Subject: [PATCH] update abp to v5.0rc1 --- apps/angular/package.json | 18 +- apps/angular/yarn.lock | 132 +- .../EShopOnAbp.AuthServer.csproj | 14 +- .../src/EShopOnAbp.AuthServer/package.json | 4 +- .../css/dataTables.bootstrap5.css} | 128 +- .../js/dataTables.bootstrap5.js} | 10 +- .../datatables.net/js/jquery.dataTables.js | 1081 ++++++++--------- .../src/EShopOnAbp.AuthServer/yarn.lock | 303 ++--- .../EShopOnAbp.PublicWeb.csproj | 16 +- .../src/EShopOnAbp.PublicWeb/package.json | 2 +- .../css/dataTables.bootstrap5.css} | 128 +- .../js/dataTables.bootstrap5.js} | 10 +- .../datatables.net/js/jquery.dataTables.js | 1013 ++++++++------- .../src/EShopOnAbp.PublicWeb/yarn.lock | 259 ++-- ...rationService.Application.Contracts.csproj | 6 +- ...p.AdministrationService.Application.csproj | 6 +- ...AdministrationService.Domain.Shared.csproj | 8 +- ...pOnAbp.AdministrationService.Domain.csproj | 12 +- ...strationService.EntityFrameworkCore.csproj | 12 +- ...dministrationService.HttpApi.Client.csproj | 6 +- ....AdministrationService.HttpApi.Host.csproj | 8 +- ...OnAbp.AdministrationService.HttpApi.csproj | 6 +- ...onService.EntityFrameworkCore.Tests.csproj | 2 +- ...nAbp.AdministrationService.TestBase.csproj | 6 +- ...BasketService.Application.Contracts.csproj | 4 +- ...ShopOnAbp.BasketService.Application.csproj | 4 +- ...opOnAbp.BasketService.Domain.Shared.csproj | 2 +- .../EShopOnAbp.BasketService.Domain.csproj | 2 +- ...pOnAbp.BasketService.HttpApi.Client.csproj | 2 +- .../EShopOnAbp.BasketService.HttpApi.csproj | 2 +- ...etService.EntityFrameworkCore.Tests.csproj | 2 +- ...rvice.HttpApi.Client.ConsoleTestApp.csproj | 2 +- .../EShopOnAbp.BasketService.TestBase.csproj | 6 +- ...atalogService.Application.Contracts.csproj | 4 +- ...hopOnAbp.CatalogService.Application.csproj | 4 +- ...pOnAbp.CatalogService.Domain.Shared.csproj | 2 +- .../EShopOnAbp.CatalogService.Domain.csproj | 2 +- ....CatalogService.EntityFrameworkCore.csproj | 2 +- ...OnAbp.CatalogService.HttpApi.Client.csproj | 2 +- .../EShopOnAbp.CatalogService.HttpApi.csproj | 2 +- ...ogService.EntityFrameworkCore.Tests.csproj | 2 +- ...rvice.HttpApi.Client.ConsoleTestApp.csproj | 2 +- .../EShopOnAbp.CatalogService.TestBase.csproj | 6 +- ...entityService.Application.Contracts.csproj | 4 +- ...opOnAbp.IdentityService.Application.csproj | 4 +- ...OnAbp.IdentityService.Domain.Shared.csproj | 4 +- .../EShopOnAbp.IdentityService.Domain.csproj | 4 +- ...IdentityService.EntityFrameworkCore.csproj | 6 +- ...nAbp.IdentityService.HttpApi.Client.csproj | 4 +- .../EShopOnAbp.IdentityService.HttpApi.csproj | 4 +- ...tyService.EntityFrameworkCore.Tests.csproj | 2 +- ...EShopOnAbp.IdentityService.TestBase.csproj | 6 +- ...deringService.Application.Contracts.csproj | 4 +- ...opOnAbp.OrderingService.Application.csproj | 4 +- ...OnAbp.OrderingService.Domain.Shared.csproj | 2 +- .../EShopOnAbp.OrderingService.Domain.csproj | 2 +- ...OrderingService.EntityFrameworkCore.csproj | 2 +- ...nAbp.OrderingService.HttpApi.Client.csproj | 2 +- ...pOnAbp.OrderingService.HttpApi.Host.csproj | 6 +- .../EShopOnAbp.OrderingService.HttpApi.csproj | 2 +- ...ngService.EntityFrameworkCore.Tests.csproj | 2 +- ...rvice.HttpApi.Client.ConsoleTestApp.csproj | 2 +- ...EShopOnAbp.OrderingService.TestBase.csproj | 6 +- ...aymentService.Application.Contracts.csproj | 4 +- ...hopOnAbp.PaymentService.Application.csproj | 4 +- ...pOnAbp.PaymentService.Domain.Shared.csproj | 2 +- .../EShopOnAbp.PaymentService.Domain.csproj | 2 +- ....PaymentService.EntityFrameworkCore.csproj | 2 +- ...OnAbp.PaymentService.HttpApi.Client.csproj | 2 +- .../EShopOnAbp.PaymentService.HttpApi.csproj | 2 +- ...ntService.EntityFrameworkCore.Tests.csproj | 2 +- ...rvice.HttpApi.Client.ConsoleTestApp.csproj | 2 +- .../EShopOnAbp.PaymentService.TestBase.csproj | 6 +- ...ShopOnAbp.Shared.Hosting.AspNetCore.csproj | 4 +- .../EShopOnAbp.Shared.Hosting.Gateways.csproj | 2 +- ...pOnAbp.Shared.Hosting.Microservices.csproj | 8 +- .../EShopOnAbp.Shared.Hosting.csproj | 4 +- .../EShopOnAbp.Shared.Localization.csproj | 2 +- 78 files changed, 1741 insertions(+), 1623 deletions(-) rename apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/{datatables.net-bs4/css/dataTables.bootstrap4.css => datatables.net-bs5/css/dataTables.bootstrap5.css} (59%) rename apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/{datatables.net-bs4/js/dataTables.bootstrap4.js => datatables.net-bs5/js/dataTables.bootstrap5.js} (95%) rename apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/{datatables.net-bs4/css/dataTables.bootstrap4.css => datatables.net-bs5/css/dataTables.bootstrap5.css} (59%) rename apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/{datatables.net-bs4/js/dataTables.bootstrap4.js => datatables.net-bs5/js/dataTables.bootstrap5.js} (95%) diff --git a/apps/angular/package.json b/apps/angular/package.json index 4e9542cf..464bd989 100644 --- a/apps/angular/package.json +++ b/apps/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.0.0-beta.3-1", - "@abp/ng.components": "~5.0.0-beta.3-1", - "@abp/ng.core": "~5.0.0-beta.3-1", - "@abp/ng.identity": "~5.0.0-beta.3-1", - "@abp/ng.setting-management": "~5.0.0-beta.3-1", - "@abp/ng.tenant-management": "~5.0.0-beta.3-1", - "@abp/ng.theme.basic": "~5.0.0-beta.3-1", - "@abp/ng.theme.shared": "~5.0.0-beta.3-1", + "@abp/ng.account": "~5.0.0-rc.1", + "@abp/ng.components": "~5.0.0-rc.1", + "@abp/ng.core": "~5.0.0-rc.1", + "@abp/ng.identity": "~5.0.0-rc.1", + "@abp/ng.setting-management": "~5.0.0-rc.1", + "@abp/ng.tenant-management": "~5.0.0-rc.1", + "@abp/ng.theme.basic": "~5.0.0-rc.1", + "@abp/ng.theme.shared": "~5.0.0-rc.1", "@angular/animations": "~12.2.8", "@angular/common": "~12.2.8", "@angular/compiler": "~12.2.8", @@ -34,7 +34,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.0.0-beta.3-1", + "@abp/ng.schematics": "~5.0.0-rc.1", "@angular-devkit/build-angular": "~12.2.8", "@angular/cli": "~12.2.8", "@angular/compiler-cli": "~12.2.8", diff --git a/apps/angular/yarn.lock b/apps/angular/yarn.lock index 41095e59..6b21d51c 100644 --- a/apps/angular/yarn.lock +++ b/apps/angular/yarn.lock @@ -2,72 +2,72 @@ # yarn lockfile v1 -"@abp/ng.account.core@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.account.core/-/ng.account.core-5.0.0-beta.3-1.tgz#5e18c55d8f0ae0957d552e77ea8687106588c28d" - integrity sha512-3+BxvzZauPm0uIRLINIuwIHRHQ0eCAV1ceWIZcCIBkm+ONoiK4ApiFNdQzVQ8QPbH639xOW/De+9sPqJieY0jg== +"@abp/ng.account.core@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.account.core/-/ng.account.core-5.0.0-rc.1.tgz#df65aaf02008e088edfa80342ef1c6244f59ba1a" + integrity sha512-p4k+Os0yWFSpP93UekklJR3rU7z5gTPiL6EuCjgtm3s6MTueuCSHIm7YHuFwZ966dfWhXOO9gJdQhMVI9qy3iQ== dependencies: tslib "^2.0.0" -"@abp/ng.account@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-5.0.0-beta.3-1.tgz#0c5ae9d2234e72a6214a997ccbc813d7b5409752" - integrity sha512-Hjqiq5tq+A8YLkfyosnbmtGHguFlYZBMF4CFIkAFHT24Say74HHDbPuboLYFGvxz3nOBwXJh8p41YyuuvjpYvQ== +"@abp/ng.account@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-5.0.0-rc.1.tgz#37ca0333ee348960c74563932506bd695de548b3" + integrity sha512-MVnq3NLfMUZBTL7bEuDDYw9rnFwQK2jbRXm/BbMFBh1PetKNBR7Xv8QLtW6C6mGu5eBp/lZbFwp7v0brpirrZA== dependencies: - "@abp/ng.account.core" "~5.0.0-beta.3-1" - "@abp/ng.theme.shared" "~5.0.0-beta.3-1" + "@abp/ng.account.core" "~5.0.0-rc.1" + "@abp/ng.theme.shared" "~5.0.0-rc.1" tslib "^2.0.0" -"@abp/ng.components@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-5.0.0-beta.3-1.tgz#f8e994a586c8d459e473a2c0264fc87e4b160d4d" - integrity sha512-deCPvGOQ8tqKpNG08N47dKsKMS2OrAm1iuLu9S/IIOK5HcTotvlXYHlH3oih3PbjkfkpUImKANNSf2h0HmnEBA== +"@abp/ng.components@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-5.0.0-rc.1.tgz#b65bc879ec4831378257f2c0cf308bc023fbde9c" + integrity sha512-iS/oJHDmYV0Ng6YIPWnoUeA/Ei0TmyCws4fDdxzNWozV0Sf5AimIi/VfmeHRFY0sz5XKlCm04oQZOvwx0eLZUQ== dependencies: chart.js "^3.5.1" ng-zorro-antd "^12.0.1" tslib "^2.0.0" -"@abp/ng.core@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-5.0.0-beta.3-1.tgz#586be6ead6459a2d8fc4891bdcd18a6c2442242d" - integrity sha512-dJX+Vv52iGyyBXP6dYI36Y1hCIcL5BYdvXE0ETc2lXNfslbzeTDHu4Amghq31IAmNEF+au0JKazwj54lTHhiBA== +"@abp/ng.core@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-5.0.0-rc.1.tgz#92170056fa54b08ec6f79d3ddf1e767b40ffc5ee" + integrity sha512-CX51woDCHKyjhmgY3FghrIIUCQ3suz+uPx3+nhCV4yZ/BxjkBQiO7OGAoVL+e4NJkvYc8t7Q3GV2iK/PswZHnw== dependencies: - "@abp/utils" "~5.0.0-beta.3" + "@abp/utils" "~5.0.0-rc.1" angular-oauth2-oidc "^12.1.0" just-clone "^3.2.1" just-compare "^1.4.0" ts-toolbelt "6.15.4" tslib "^2.0.0" -"@abp/ng.feature-management@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-5.0.0-beta.3-1.tgz#e3674cff51ac15b280e4829c8e6cbe00f57d9723" - integrity sha512-+F5OKgSfbQ1qY2cnm3Bz1Hh8YDZggS0NLS1d3EqJF3Wyx5OMo7R51F+/LZGxIgloJGv2fGrfVg+9UGhMuwi60Q== +"@abp/ng.feature-management@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-5.0.0-rc.1.tgz#cc951b7df2a7e98db6f7dbf33cb6b3f72c445103" + integrity sha512-SCk0NiSVnSeuL0B6ACJ2kGWjiLPIU3zAPtgfvZQH7srTE+BAzSxhho2JAVOo3etYjeUqChRpEAvBWkWX8TxjwA== dependencies: - "@abp/ng.theme.shared" "~5.0.0-beta.3-1" + "@abp/ng.theme.shared" "~5.0.0-rc.1" tslib "^2.0.0" -"@abp/ng.identity@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-5.0.0-beta.3-1.tgz#c20214d5a6e23930933bc2d2413cba1f7530fc96" - integrity sha512-6okmrlUciRHrTbLqa16vY0onqtULQYaoao7e5AFZgmwRWAU0H5/wL4Wv+1EgtCos/fbn/X+f0i6tuzdzeOOGvg== +"@abp/ng.identity@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-5.0.0-rc.1.tgz#c39ed45f880d050523a03bb5aed1f859f9ffd623" + integrity sha512-Gn0cuPWpDTCd449lwHBMPHV2zAu1VZIlo/hglQUpZdUa0VzEOkTV3T/QJa8X+eDEjTDJsK13FyNUheSJKLNA/A== dependencies: - "@abp/ng.permission-management" "~5.0.0-beta.3-1" - "@abp/ng.theme.shared" "~5.0.0-beta.3-1" + "@abp/ng.permission-management" "~5.0.0-rc.1" + "@abp/ng.theme.shared" "~5.0.0-rc.1" tslib "^2.0.0" -"@abp/ng.permission-management@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-5.0.0-beta.3-1.tgz#13820aa8967a615c9327d8d73cd3426eafb18e1b" - integrity sha512-3j32gUfgfBvKMbfFMk0T9xV6ttNN0X7iIqqpI0Jgeu3xmLciSuAd3eZkc5D82xAXEOrOixfh3Mb9MMqcz9qzeQ== +"@abp/ng.permission-management@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-5.0.0-rc.1.tgz#c420f5fdaf6e8c7e41efdf42400024f24a531952" + integrity sha512-IgVoIHEOst+Fv8aVkEfXyFBzcOOrNG4wcLzkSnpaxy0mo/ZDFA6PW5jZz7FpxOfr9Kq61Ic21r9KKhXOK1ASTA== dependencies: - "@abp/ng.theme.shared" "~5.0.0-beta.3-1" + "@abp/ng.theme.shared" "~5.0.0-rc.1" tslib "^2.0.0" -"@abp/ng.schematics@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-5.0.0-beta.3-1.tgz#b1b5b57625bee9fa20eab55234803efd00ba3329" - integrity sha512-wFaV8Ru81IEpfiCu1DnCWi4nCLwUQhjMitPb5V2zB1umyOwS6ED5UR+nPX1KJzrldhchXUZTibeESMl/xG6Raw== +"@abp/ng.schematics@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-5.0.0-rc.1.tgz#092c65412b345edca87b399f1b5c01f273e7f325" + integrity sha512-vMHSbnErsG+JwG5/ojzI4gaWObeBu6IXsXrTickDEtUUYZVlSnyqhbd98/iqGwp7hDisFW7lcemg4j8URyxEnw== dependencies: "@angular-devkit/core" "~11.0.2" "@angular-devkit/schematics" "~11.0.2" @@ -76,39 +76,39 @@ should-quote "^1.0.0" typescript "~3.9.2" -"@abp/ng.setting-management@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-5.0.0-beta.3-1.tgz#5504ce5d9ad758419c349270e95aacc9d8978a62" - integrity sha512-wKuZM/t6M06PJH/D0hWyL6/3I0tB3gsRERW0bNMjGq/zYxAjNxgcViazWaihab4BW90uc70g9vQRKXvkiZ+r3w== +"@abp/ng.setting-management@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-5.0.0-rc.1.tgz#991b35a20c065596b25b94a8e68937a137ca5846" + integrity sha512-wk5PkTl8F3aiey64hfD095odzQs1Tswx5t7apRimsA6v8iaLRDI0oeuLPdcvpET2G+GVOO9JmxbAnjkNb0rKBw== dependencies: - "@abp/ng.components" "~5.0.0-beta.3-1" - "@abp/ng.theme.shared" "~5.0.0-beta.3-1" + "@abp/ng.components" "~5.0.0-rc.1" + "@abp/ng.theme.shared" "~5.0.0-rc.1" tslib "^2.0.0" -"@abp/ng.tenant-management@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-5.0.0-beta.3-1.tgz#e4a5528a8400fc15ab92458e7ba3a4539238e554" - integrity sha512-20WTteuRx3C2Zj7TRQH3E3lYQ50FiE1xihwj1p0ObZ1wvWqvCM4S4zossaDhzQSd6PR5RJ2534SRFKMrpu1Kfw== +"@abp/ng.tenant-management@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-5.0.0-rc.1.tgz#85f3f1932058e726bd9e60c5aa15870ca7916d3d" + integrity sha512-4rMjTTPJ2GT2Xru6/lnSypJh1F0cIKz6g+knnIiHFWxWhEeALFRFn3vnWvBWaNn6cGgPil4aUSdpQAfO59C0dQ== dependencies: - "@abp/ng.feature-management" "~5.0.0-beta.3-1" - "@abp/ng.theme.shared" "~5.0.0-beta.3-1" + "@abp/ng.feature-management" "~5.0.0-rc.1" + "@abp/ng.theme.shared" "~5.0.0-rc.1" tslib "^2.0.0" -"@abp/ng.theme.basic@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-5.0.0-beta.3-1.tgz#5b7c5f54ca5e6ccee5a322273affbf7dd4133aa9" - integrity sha512-i/xdkyrJNKHnmBW9bYlrxsZVV6vQpFh4QCDkZdg8CZ4QidqgH8PFTLAQx7EagJnB3wFBlzdVGLOtwCMoltZngA== +"@abp/ng.theme.basic@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-5.0.0-rc.1.tgz#53b9d9f437131d859fce0024485e3eacbcb84590" + integrity sha512-rhN64Zxwo+fRnZlRoLCvodtjwvpmNAQfWNat6zpOnQ56m/BuHcGURx++lJ63NfGigkDCpqrph7O8LUUr0xoU4w== dependencies: - "@abp/ng.account.core" "~5.0.0-beta.3-1" - "@abp/ng.theme.shared" "~5.0.0-beta.3-1" + "@abp/ng.account.core" "~5.0.0-rc.1" + "@abp/ng.theme.shared" "~5.0.0-rc.1" tslib "^2.0.0" -"@abp/ng.theme.shared@~5.0.0-beta.3-1": - version "5.0.0-beta.3-1" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-5.0.0-beta.3-1.tgz#cf41626289d8830b7aa0854fd6a7905a0eeaecdf" - integrity sha512-eWc65LIj/N/CLvQKZjjGXNLfYbDY/T6WPyvxuXCv7VhWTZDJhtYp00rem9/DhMKaK9pBYbt0U0QTDVFTktjsgA== +"@abp/ng.theme.shared@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-5.0.0-rc.1.tgz#d769ebe0ec9c78286b5c8628b07e9e9b6d05329e" + integrity sha512-caY5i+5mOWdlnksUaTmUxlrTs13+yqbK5nS6YIVfodWqm8MzzJR+wVqvzTBceEcTy8iWMSi/ufEY15RP6i2hOA== dependencies: - "@abp/ng.core" "~5.0.0-beta.3-1" + "@abp/ng.core" "~5.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" "@ng-bootstrap/ng-bootstrap" "^11.0.0-beta.2" "@ngx-validate/core" "^0.0.13" @@ -116,10 +116,10 @@ bootstrap "^5.1.1" tslib "^2.0.0" -"@abp/utils@~5.0.0-beta.3": - version "5.0.0-beta.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-beta.3.tgz#63ece8b7a524a056c7dd16486cbb3203eca39017" - integrity sha512-RonjfS2eL7vdbLa+J/wvDc+8TkyPYB3S587evvB+wkncmL1POY/KjOt6GVcsjIj/E5KbprAj+UMRHuwAQbxvmg== +"@abp/utils@~5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-rc.1.tgz#ba89a9de73288661db295f3bce9ea0e47c669f42" + integrity sha512-bOgH+hz7B7MnrqR/Aqy34CKiAnZItD/tLBXysea+MldzvAKdssmqe2RLA/6lApzLaF3SbOttoXXpa1q432vAlg== dependencies: just-compare "^1.3.0" diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbp.AuthServer.csproj b/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbp.AuthServer.csproj index 607f631e..19d3b548 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbp.AuthServer.csproj +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbp.AuthServer.csproj @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/package.json b/apps/auth-server/src/EShopOnAbp.AuthServer/package.json index d15ee064..7e927f92 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/package.json +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/package.json @@ -3,7 +3,7 @@ "name": "EShopOnAbpAuthServer", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-beta.3", - "@volo/account": "~5.0.0-beta.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-rc.1", + "@volo/account": "~5.0.0-rc.1" } } \ No newline at end of file diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css b/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css similarity index 59% rename from apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css rename to apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css index a181dc4d..3b84befc 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css @@ -1,4 +1,90 @@ @charset "UTF-8"; +td.dt-control { + background: url("https://www.datatables.net/examples/resources/details_open.png") no-repeat center center; + cursor: pointer; +} + +tr.dt-hasChild td.dt-control { + background: url("https://www.datatables.net/examples/resources/details_close.png") no-repeat center center; +} + +table.dataTable th.dt-left, +table.dataTable td.dt-left { + text-align: left; +} +table.dataTable th.dt-center, +table.dataTable td.dt-center, +table.dataTable td.dataTables_empty { + text-align: center; +} +table.dataTable th.dt-right, +table.dataTable td.dt-right { + text-align: right; +} +table.dataTable th.dt-justify, +table.dataTable td.dt-justify { + text-align: justify; +} +table.dataTable th.dt-nowrap, +table.dataTable td.dt-nowrap { + white-space: nowrap; +} +table.dataTable thead th.dt-head-left, +table.dataTable thead td.dt-head-left, +table.dataTable tfoot th.dt-head-left, +table.dataTable tfoot td.dt-head-left { + text-align: left; +} +table.dataTable thead th.dt-head-center, +table.dataTable thead td.dt-head-center, +table.dataTable tfoot th.dt-head-center, +table.dataTable tfoot td.dt-head-center { + text-align: center; +} +table.dataTable thead th.dt-head-right, +table.dataTable thead td.dt-head-right, +table.dataTable tfoot th.dt-head-right, +table.dataTable tfoot td.dt-head-right { + text-align: right; +} +table.dataTable thead th.dt-head-justify, +table.dataTable thead td.dt-head-justify, +table.dataTable tfoot th.dt-head-justify, +table.dataTable tfoot td.dt-head-justify { + text-align: justify; +} +table.dataTable thead th.dt-head-nowrap, +table.dataTable thead td.dt-head-nowrap, +table.dataTable tfoot th.dt-head-nowrap, +table.dataTable tfoot td.dt-head-nowrap { + white-space: nowrap; +} +table.dataTable tbody th.dt-body-left, +table.dataTable tbody td.dt-body-left { + text-align: left; +} +table.dataTable tbody th.dt-body-center, +table.dataTable tbody td.dt-body-center { + text-align: center; +} +table.dataTable tbody th.dt-body-right, +table.dataTable tbody td.dt-body-right { + text-align: right; +} +table.dataTable tbody th.dt-body-justify, +table.dataTable tbody td.dt-body-justify { + text-align: justify; +} +table.dataTable tbody th.dt-body-nowrap, +table.dataTable tbody td.dt-body-nowrap { + white-space: nowrap; +} + +/*! Bootstrap 5 integration for DataTables + * + * ©2020 SpryMedia Ltd, all rights reserved. + * License: MIT datatables.net/license/mit + */ table.dataTable { clear: both; margin-top: 6px !important; @@ -93,7 +179,7 @@ table.dataTable > thead .sorting_asc_disabled:after, table.dataTable > thead .sorting_desc_disabled:before, table.dataTable > thead .sorting_desc_disabled:after { position: absolute; - bottom: 0.9em; + bottom: 0.5em; display: block; opacity: 0.3; } @@ -126,21 +212,21 @@ div.dataTables_scrollHead table.dataTable { margin-bottom: 0 !important; } -div.dataTables_scrollBody table { +div.dataTables_scrollBody > table { border-top: none; margin-top: 0 !important; margin-bottom: 0 !important; } -div.dataTables_scrollBody table thead .sorting:before, -div.dataTables_scrollBody table thead .sorting_asc:before, -div.dataTables_scrollBody table thead .sorting_desc:before, -div.dataTables_scrollBody table thead .sorting:after, -div.dataTables_scrollBody table thead .sorting_asc:after, -div.dataTables_scrollBody table thead .sorting_desc:after { +div.dataTables_scrollBody > table > thead .sorting:before, +div.dataTables_scrollBody > table > thead .sorting_asc:before, +div.dataTables_scrollBody > table > thead .sorting_desc:before, +div.dataTables_scrollBody > table > thead .sorting:after, +div.dataTables_scrollBody > table > thead .sorting_asc:after, +div.dataTables_scrollBody > table > thead .sorting_desc:after { display: none; } -div.dataTables_scrollBody table tbody tr:first-child th, -div.dataTables_scrollBody table tbody tr:first-child td { +div.dataTables_scrollBody > table > tbody tr:first-child th, +div.dataTables_scrollBody > table > tbody tr:first-child td { border-top: none; } @@ -181,18 +267,27 @@ table.dataTable.table-sm .sorting_desc:after { table.table-bordered.dataTable { border-right-width: 0; } +table.table-bordered.dataTable thead tr:first-child th, +table.table-bordered.dataTable thead tr:first-child td { + border-top-width: 1px; +} table.table-bordered.dataTable th, table.table-bordered.dataTable td { border-left-width: 0; } +table.table-bordered.dataTable th:first-child, table.table-bordered.dataTable th:first-child, +table.table-bordered.dataTable td:first-child, +table.table-bordered.dataTable td:first-child { + border-left-width: 1px; +} table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable td:last-child, table.table-bordered.dataTable td:last-child { border-right-width: 1px; } -table.table-bordered.dataTable tbody th, -table.table-bordered.dataTable tbody td { - border-bottom-width: 0; +table.table-bordered.dataTable th, +table.table-bordered.dataTable td { + border-bottom-width: 1px; } div.dataTables_scrollHead table.table-bordered { @@ -208,3 +303,10 @@ div.table-responsive > div.dataTables_wrapper > div.row > div[class^=col-]:first div.table-responsive > div.dataTables_wrapper > div.row > div[class^=col-]:last-child { padding-right: 0; } + +table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) { + --bs-table-accent-bg: transparent; +} +table.dataTable.table-striped > tbody > tr.odd { + --bs-table-accent-bg: var(--bs-table-striped-bg); +} diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js b/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js similarity index 95% rename from apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js rename to apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js index bb7b7738..1bf51f6a 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js @@ -1,9 +1,9 @@ -/*! DataTables Bootstrap 4 integration - * ©2011-2017 SpryMedia Ltd - datatables.net/license +/*! DataTables Bootstrap 5 integration + * 2020 SpryMedia Ltd - datatables.net/license */ /** - * DataTables integration for Bootstrap 4. This requires Bootstrap 4 and + * DataTables integration for Bootstrap 4. This requires Bootstrap 5 and * DataTables 1.10 or newer. * * This file sets the defaults and adds options to DataTables to style its @@ -55,9 +55,9 @@ $.extend( true, DataTable.defaults, { /* Default class modification */ $.extend( DataTable.ext.classes, { - sWrapper: "dataTables_wrapper dt-bootstrap4", + sWrapper: "dataTables_wrapper dt-bootstrap5", sFilterInput: "form-control form-control-sm", - sLengthSelect: "custom-select custom-select-sm form-control form-control-sm", + sLengthSelect: "form-select form-select-sm", sProcessing: "dataTables_processing card", sPageButton: "paginate_button page-item" } ); diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net/js/jquery.dataTables.js b/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net/js/jquery.dataTables.js index df26319a..dad445e7 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net/js/jquery.dataTables.js +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net/js/jquery.dataTables.js @@ -1,15 +1,15 @@ -/*! DataTables 1.10.23 - * ©2008-2020 SpryMedia Ltd - datatables.net/license +/*! DataTables 1.11.3 + * ©2008-2021 SpryMedia Ltd - datatables.net/license */ /** * @summary DataTables * @description Paginate, search and order HTML tables - * @version 1.10.23 + * @version 1.11.3 * @file jquery.dataTables.js * @author SpryMedia Ltd * @contact www.datatables.net - * @copyright Copyright 2008-2020 SpryMedia Ltd. + * @copyright Copyright 2008-2021 SpryMedia Ltd. * * This source file is free software, available under the following license: * MIT license - http://datatables.net/license @@ -53,7 +53,7 @@ } else { // Browser - factory( jQuery, window, document ); + window.DataTable = factory( jQuery, window, document ); } } (function( $, window, document, undefined ) { @@ -91,8 +91,17 @@ * } ); * } ); */ - var DataTable = function ( options ) + var DataTable = function ( selector, options ) { + // When creating with `new`, create a new DataTable, returning the API instance + if (this instanceof DataTable) { + return $(selector).DataTable(options); + } + else { + // Argument switching + options = selector; + } + /** * Perform a jQuery selector action on the table's TR elements (from the tbody) and * return the resulting jQuery object. @@ -1085,9 +1094,11 @@ dataType: 'json', url: oLanguage.sUrl, success: function ( json ) { - _fnLanguageCompat( json ); _fnCamelToHungarian( defaults.oLanguage, json ); + _fnLanguageCompat( json ); $.extend( true, oLanguage, json ); + + _fnCallbackFire( oSettings, null, 'i18n', [oSettings]); _fnInitialise( oSettings ); }, error: function () { @@ -1097,6 +1108,9 @@ } ); bInitHandedOff = true; } + else { + _fnCallbackFire( oSettings, null, 'i18n', [oSettings]); + } /* * Stripes @@ -1248,7 +1262,7 @@ var tbody = $this.children('tbody'); if ( tbody.length === 0 ) { - tbody = $('').appendTo($this); + tbody = $('').insertAfter(thead); } oSettings.nTBody = tbody[0]; @@ -1296,10 +1310,11 @@ }; /* Must be done after everything which can be overridden by the state saving! */ + _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' ); + if ( oInit.bStateSave ) { features.bStateSave = true; - _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' ); _fnLoadState( oSettings, oInit, loadedInit ); } else { @@ -1599,6 +1614,14 @@ return out; } + var _includes = function (search, start) { + if (start === undefined) { + start = 0; + } + + return this.indexOf(search, start) !== -1; + }; + // Array.isArray polyfill. // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray if (! Array.isArray) { @@ -1607,6 +1630,10 @@ }; } + if (! Array.prototype.includes) { + Array.prototype.includes = _includes; + } + // .trim() polyfill // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trim if (!String.prototype.trim) { @@ -1615,6 +1642,10 @@ }; } + if (! String.prototype.includes) { + String.prototype.includes = _includes; + } + /** * DataTables utility methods * @@ -1670,6 +1701,227 @@ */ escapeRegex: function ( val ) { return val.replace( _re_escape_regex, '\\$1' ); + }, + + /** + * Create a function that will write to a nested object or array + * @param {*} source JSON notation string + * @returns Write function + */ + set: function ( source ) { + if ( $.isPlainObject( source ) ) { + /* Unlike get, only the underscore (global) option is used for for + * setting data since we don't know the type here. This is why an object + * option is not documented for `mData` (which is read/write), but it is + * for `mRender` which is read only. + */ + return DataTable.util.set( source._ ); + } + else if ( source === null ) { + // Nothing to do when the data source is null + return function () {}; + } + else if ( typeof source === 'function' ) { + return function (data, val, meta) { + source( data, 'set', val, meta ); + }; + } + else if ( typeof source === 'string' && (source.indexOf('.') !== -1 || + source.indexOf('[') !== -1 || source.indexOf('(') !== -1) ) + { + // Like the get, we need to get data from a nested object + var setData = function (data, val, src) { + var a = _fnSplitObjNotation( src ), b; + var aLast = a[a.length-1]; + var arrayNotation, funcNotation, o, innerSrc; + + for ( var i=0, iLen=a.length-1 ; i - - - - - - - - + + + + + + + + diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/package.json b/apps/public-web/src/EShopOnAbp.PublicWeb/package.json index 416040a9..600b4a84 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/package.json +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/package.json @@ -3,6 +3,6 @@ "name": "EShopOnAbpPublicWeb", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-beta.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-rc.1" } } \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css similarity index 59% rename from apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css rename to apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css index a181dc4d..3b84befc 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css @@ -1,4 +1,90 @@ @charset "UTF-8"; +td.dt-control { + background: url("https://www.datatables.net/examples/resources/details_open.png") no-repeat center center; + cursor: pointer; +} + +tr.dt-hasChild td.dt-control { + background: url("https://www.datatables.net/examples/resources/details_close.png") no-repeat center center; +} + +table.dataTable th.dt-left, +table.dataTable td.dt-left { + text-align: left; +} +table.dataTable th.dt-center, +table.dataTable td.dt-center, +table.dataTable td.dataTables_empty { + text-align: center; +} +table.dataTable th.dt-right, +table.dataTable td.dt-right { + text-align: right; +} +table.dataTable th.dt-justify, +table.dataTable td.dt-justify { + text-align: justify; +} +table.dataTable th.dt-nowrap, +table.dataTable td.dt-nowrap { + white-space: nowrap; +} +table.dataTable thead th.dt-head-left, +table.dataTable thead td.dt-head-left, +table.dataTable tfoot th.dt-head-left, +table.dataTable tfoot td.dt-head-left { + text-align: left; +} +table.dataTable thead th.dt-head-center, +table.dataTable thead td.dt-head-center, +table.dataTable tfoot th.dt-head-center, +table.dataTable tfoot td.dt-head-center { + text-align: center; +} +table.dataTable thead th.dt-head-right, +table.dataTable thead td.dt-head-right, +table.dataTable tfoot th.dt-head-right, +table.dataTable tfoot td.dt-head-right { + text-align: right; +} +table.dataTable thead th.dt-head-justify, +table.dataTable thead td.dt-head-justify, +table.dataTable tfoot th.dt-head-justify, +table.dataTable tfoot td.dt-head-justify { + text-align: justify; +} +table.dataTable thead th.dt-head-nowrap, +table.dataTable thead td.dt-head-nowrap, +table.dataTable tfoot th.dt-head-nowrap, +table.dataTable tfoot td.dt-head-nowrap { + white-space: nowrap; +} +table.dataTable tbody th.dt-body-left, +table.dataTable tbody td.dt-body-left { + text-align: left; +} +table.dataTable tbody th.dt-body-center, +table.dataTable tbody td.dt-body-center { + text-align: center; +} +table.dataTable tbody th.dt-body-right, +table.dataTable tbody td.dt-body-right { + text-align: right; +} +table.dataTable tbody th.dt-body-justify, +table.dataTable tbody td.dt-body-justify { + text-align: justify; +} +table.dataTable tbody th.dt-body-nowrap, +table.dataTable tbody td.dt-body-nowrap { + white-space: nowrap; +} + +/*! Bootstrap 5 integration for DataTables + * + * ©2020 SpryMedia Ltd, all rights reserved. + * License: MIT datatables.net/license/mit + */ table.dataTable { clear: both; margin-top: 6px !important; @@ -93,7 +179,7 @@ table.dataTable > thead .sorting_asc_disabled:after, table.dataTable > thead .sorting_desc_disabled:before, table.dataTable > thead .sorting_desc_disabled:after { position: absolute; - bottom: 0.9em; + bottom: 0.5em; display: block; opacity: 0.3; } @@ -126,21 +212,21 @@ div.dataTables_scrollHead table.dataTable { margin-bottom: 0 !important; } -div.dataTables_scrollBody table { +div.dataTables_scrollBody > table { border-top: none; margin-top: 0 !important; margin-bottom: 0 !important; } -div.dataTables_scrollBody table thead .sorting:before, -div.dataTables_scrollBody table thead .sorting_asc:before, -div.dataTables_scrollBody table thead .sorting_desc:before, -div.dataTables_scrollBody table thead .sorting:after, -div.dataTables_scrollBody table thead .sorting_asc:after, -div.dataTables_scrollBody table thead .sorting_desc:after { +div.dataTables_scrollBody > table > thead .sorting:before, +div.dataTables_scrollBody > table > thead .sorting_asc:before, +div.dataTables_scrollBody > table > thead .sorting_desc:before, +div.dataTables_scrollBody > table > thead .sorting:after, +div.dataTables_scrollBody > table > thead .sorting_asc:after, +div.dataTables_scrollBody > table > thead .sorting_desc:after { display: none; } -div.dataTables_scrollBody table tbody tr:first-child th, -div.dataTables_scrollBody table tbody tr:first-child td { +div.dataTables_scrollBody > table > tbody tr:first-child th, +div.dataTables_scrollBody > table > tbody tr:first-child td { border-top: none; } @@ -181,18 +267,27 @@ table.dataTable.table-sm .sorting_desc:after { table.table-bordered.dataTable { border-right-width: 0; } +table.table-bordered.dataTable thead tr:first-child th, +table.table-bordered.dataTable thead tr:first-child td { + border-top-width: 1px; +} table.table-bordered.dataTable th, table.table-bordered.dataTable td { border-left-width: 0; } +table.table-bordered.dataTable th:first-child, table.table-bordered.dataTable th:first-child, +table.table-bordered.dataTable td:first-child, +table.table-bordered.dataTable td:first-child { + border-left-width: 1px; +} table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable td:last-child, table.table-bordered.dataTable td:last-child { border-right-width: 1px; } -table.table-bordered.dataTable tbody th, -table.table-bordered.dataTable tbody td { - border-bottom-width: 0; +table.table-bordered.dataTable th, +table.table-bordered.dataTable td { + border-bottom-width: 1px; } div.dataTables_scrollHead table.table-bordered { @@ -208,3 +303,10 @@ div.table-responsive > div.dataTables_wrapper > div.row > div[class^=col-]:first div.table-responsive > div.dataTables_wrapper > div.row > div[class^=col-]:last-child { padding-right: 0; } + +table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) { + --bs-table-accent-bg: transparent; +} +table.dataTable.table-striped > tbody > tr.odd { + --bs-table-accent-bg: var(--bs-table-striped-bg); +} diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js similarity index 95% rename from apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js rename to apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js index bb7b7738..1bf51f6a 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js @@ -1,9 +1,9 @@ -/*! DataTables Bootstrap 4 integration - * ©2011-2017 SpryMedia Ltd - datatables.net/license +/*! DataTables Bootstrap 5 integration + * 2020 SpryMedia Ltd - datatables.net/license */ /** - * DataTables integration for Bootstrap 4. This requires Bootstrap 4 and + * DataTables integration for Bootstrap 4. This requires Bootstrap 5 and * DataTables 1.10 or newer. * * This file sets the defaults and adds options to DataTables to style its @@ -55,9 +55,9 @@ $.extend( true, DataTable.defaults, { /* Default class modification */ $.extend( DataTable.ext.classes, { - sWrapper: "dataTables_wrapper dt-bootstrap4", + sWrapper: "dataTables_wrapper dt-bootstrap5", sFilterInput: "form-control form-control-sm", - sLengthSelect: "custom-select custom-select-sm form-control form-control-sm", + sLengthSelect: "form-select form-select-sm", sProcessing: "dataTables_processing card", sPageButton: "paginate_button page-item" } ); diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net/js/jquery.dataTables.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net/js/jquery.dataTables.js index a7e3d30f..dad445e7 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net/js/jquery.dataTables.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net/js/jquery.dataTables.js @@ -1,11 +1,11 @@ -/*! DataTables 1.10.25 +/*! DataTables 1.11.3 * ©2008-2021 SpryMedia Ltd - datatables.net/license */ /** * @summary DataTables * @description Paginate, search and order HTML tables - * @version 1.10.25 + * @version 1.11.3 * @file jquery.dataTables.js * @author SpryMedia Ltd * @contact www.datatables.net @@ -53,7 +53,7 @@ } else { // Browser - factory( jQuery, window, document ); + window.DataTable = factory( jQuery, window, document ); } } (function( $, window, document, undefined ) { @@ -91,8 +91,17 @@ * } ); * } ); */ - var DataTable = function ( options ) + var DataTable = function ( selector, options ) { + // When creating with `new`, create a new DataTable, returning the API instance + if (this instanceof DataTable) { + return $(selector).DataTable(options); + } + else { + // Argument switching + options = selector; + } + /** * Perform a jQuery selector action on the table's TR elements (from the tbody) and * return the resulting jQuery object. @@ -1085,8 +1094,8 @@ dataType: 'json', url: oLanguage.sUrl, success: function ( json ) { - _fnLanguageCompat( json ); _fnCamelToHungarian( defaults.oLanguage, json ); + _fnLanguageCompat( json ); $.extend( true, oLanguage, json ); _fnCallbackFire( oSettings, null, 'i18n', [oSettings]); @@ -1301,10 +1310,11 @@ }; /* Must be done after everything which can be overridden by the state saving! */ + _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' ); + if ( oInit.bStateSave ) { features.bStateSave = true; - _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' ); _fnLoadState( oSettings, oInit, loadedInit ); } else { @@ -1604,6 +1614,14 @@ return out; } + var _includes = function (search, start) { + if (start === undefined) { + start = 0; + } + + return this.indexOf(search, start) !== -1; + }; + // Array.isArray polyfill. // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray if (! Array.isArray) { @@ -1612,6 +1630,10 @@ }; } + if (! Array.prototype.includes) { + Array.prototype.includes = _includes; + } + // .trim() polyfill // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trim if (!String.prototype.trim) { @@ -1620,6 +1642,10 @@ }; } + if (! String.prototype.includes) { + String.prototype.includes = _includes; + } + /** * DataTables utility methods * @@ -1675,6 +1701,227 @@ */ escapeRegex: function ( val ) { return val.replace( _re_escape_regex, '\\$1' ); + }, + + /** + * Create a function that will write to a nested object or array + * @param {*} source JSON notation string + * @returns Write function + */ + set: function ( source ) { + if ( $.isPlainObject( source ) ) { + /* Unlike get, only the underscore (global) option is used for for + * setting data since we don't know the type here. This is why an object + * option is not documented for `mData` (which is read/write), but it is + * for `mRender` which is read only. + */ + return DataTable.util.set( source._ ); + } + else if ( source === null ) { + // Nothing to do when the data source is null + return function () {}; + } + else if ( typeof source === 'function' ) { + return function (data, val, meta) { + source( data, 'set', val, meta ); + }; + } + else if ( typeof source === 'string' && (source.indexOf('.') !== -1 || + source.indexOf('[') !== -1 || source.indexOf('(') !== -1) ) + { + // Like the get, we need to get data from a nested object + var setData = function (data, val, src) { + var a = _fnSplitObjNotation( src ), b; + var aLast = a[a.length-1]; + var arrayNotation, funcNotation, o, innerSrc; + + for ( var i=0, iLen=a.length-1 ; i - - - + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj index 79e21251..c403c11b 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj index af64ac17..1eb6c883 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj index 2e4f5488..776a5979 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj @@ -10,12 +10,12 @@ - - - - - - + + + + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj index a5ecb5e4..918602bf 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj @@ -13,12 +13,12 @@ - - - - - - + + + + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj index 23791b74..09d15df5 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj index 1d22de9b..609277a0 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj index e5b6204d..bfdeb46c 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj index 06f34157..38cec39e 100644 --- a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj +++ b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj b/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj index 3d9e0524..a1611caa 100644 --- a/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj +++ b/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj index e6459060..1863e398 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj +++ b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj b/services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj index 05565932..2a8d87f3 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj +++ b/services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj index 594a5d37..56e7c21d 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj +++ b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj @@ -9,7 +9,7 @@ - + diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj b/services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj index ed87039a..e9d4664f 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj +++ b/services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj index 02d285b8..2377a4b4 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj b/services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj index 5ad3f659..8c3b0d26 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj b/services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj index 0d5485d8..bcfdecbb 100644 --- a/services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj +++ b/services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj index 58d3b18f..4b801732 100644 --- a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj +++ b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj @@ -19,7 +19,7 @@ - + diff --git a/services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj b/services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj index fd122c36..c614c4ed 100644 --- a/services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj +++ b/services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj index ace993ec..bfa3bcc2 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj index b13b7b7a..daa5cbd0 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj index aa9b8c90..3577c481 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj @@ -9,7 +9,7 @@ - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj index 58506500..edc6f343 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.EntityFrameworkCore/EShopOnAbp.CatalogService.EntityFrameworkCore.csproj b/services/catalog/src/EShopOnAbp.CatalogService.EntityFrameworkCore/EShopOnAbp.CatalogService.EntityFrameworkCore.csproj index 0e43f88b..80da06e9 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.EntityFrameworkCore/EShopOnAbp.CatalogService.EntityFrameworkCore.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.EntityFrameworkCore/EShopOnAbp.CatalogService.EntityFrameworkCore.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj index f9ffb36c..9c68298a 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj index e34e807f..24fe44e6 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests.csproj b/services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests.csproj index 224335d5..35e7b5b0 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj b/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj index 39650b58..276395c5 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj @@ -19,7 +19,7 @@ - + diff --git a/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj b/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj index aebd5458..afd40cfc 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj b/services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj index 3dc1ec4f..5e57c6c5 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj b/services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj index d67c99fa..0437057b 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj b/services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj index b4ebf9e6..37dab940 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj b/services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj index 64eb522c..cdcc6c14 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj b/services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj index f8a378f0..b10c609a 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj @@ -16,9 +16,9 @@ - - - + + + diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj index 26ffeff9..9271685e 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj b/services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj index ef0c2b2f..f8b30283 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj b/services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj index efdbe091..6a8b7659 100644 --- a/services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj +++ b/services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj b/services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj index 10c11259..618053b8 100644 --- a/services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj +++ b/services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj index a9c0d2b5..94529e64 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj index 2ccd3cc0..0a0297c1 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj index 4cba443e..6f8548a7 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj @@ -9,7 +9,7 @@ - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj index c9fc0111..3ebbd584 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj b/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj index 0a26ef56..4cc80b83 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj @@ -9,7 +9,7 @@ - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj index 2b5b043b..2732b332 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj index 56d21392..e842a249 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj index 281c5360..3f3d1ec4 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj b/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj index c994ff41..ab546587 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj b/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj index b5fea45d..1a88e136 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj @@ -7,7 +7,7 @@ - + diff --git a/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj b/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj index e73899f2..e303b78b 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj b/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj index 3e8cae90..9c453f7c 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj b/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj index decf93f8..b8f72835 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj b/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj index ceb4fd87..9123bd9c 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj @@ -9,7 +9,7 @@ - + diff --git a/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj b/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj index 14dc33cb..f3a04e0e 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj b/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj index 456c07e0..f647bbeb 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj @@ -9,7 +9,7 @@ - + diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj index 17bcecab..6cc9f165 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj b/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj index 48ab30f5..026c1a59 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj b/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj index a05eceb4..6af5f367 100644 --- a/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj +++ b/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj b/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj index 957f6855..6d2d2d09 100644 --- a/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj +++ b/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj @@ -7,7 +7,7 @@ - + diff --git a/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj b/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj index 9481423f..296b91d8 100644 --- a/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj +++ b/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/shared/EShopOnAbp.Shared.Hosting.AspNetCore/EShopOnAbp.Shared.Hosting.AspNetCore.csproj b/shared/EShopOnAbp.Shared.Hosting.AspNetCore/EShopOnAbp.Shared.Hosting.AspNetCore.csproj index aab6dd97..b7e39dda 100644 --- a/shared/EShopOnAbp.Shared.Hosting.AspNetCore/EShopOnAbp.Shared.Hosting.AspNetCore.csproj +++ b/shared/EShopOnAbp.Shared.Hosting.AspNetCore/EShopOnAbp.Shared.Hosting.AspNetCore.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/shared/EShopOnAbp.Shared.Hosting.Gateways/EShopOnAbp.Shared.Hosting.Gateways.csproj b/shared/EShopOnAbp.Shared.Hosting.Gateways/EShopOnAbp.Shared.Hosting.Gateways.csproj index a999083a..1d53c4bd 100644 --- a/shared/EShopOnAbp.Shared.Hosting.Gateways/EShopOnAbp.Shared.Hosting.Gateways.csproj +++ b/shared/EShopOnAbp.Shared.Hosting.Gateways/EShopOnAbp.Shared.Hosting.Gateways.csproj @@ -10,7 +10,7 @@ - + diff --git a/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbp.Shared.Hosting.Microservices.csproj b/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbp.Shared.Hosting.Microservices.csproj index 5c55cf88..e572f172 100644 --- a/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbp.Shared.Hosting.Microservices.csproj +++ b/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbp.Shared.Hosting.Microservices.csproj @@ -15,10 +15,10 @@ - - - - + + + + diff --git a/shared/EShopOnAbp.Shared.Hosting/EShopOnAbp.Shared.Hosting.csproj b/shared/EShopOnAbp.Shared.Hosting/EShopOnAbp.Shared.Hosting.csproj index ad418317..b774233d 100644 --- a/shared/EShopOnAbp.Shared.Hosting/EShopOnAbp.Shared.Hosting.csproj +++ b/shared/EShopOnAbp.Shared.Hosting/EShopOnAbp.Shared.Hosting.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.csproj b/shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.csproj index a3b9a948..e17f6324 100644 --- a/shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.csproj +++ b/shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.csproj @@ -8,7 +8,7 @@ - +