Browse Source

Merge branch 'main' into enisn/payment-service

pull/17/head
enisn 4 years ago
parent
commit
ac824fbeaf
  1. 18
      apps/angular/package.json
  2. 157
      apps/angular/yarn.lock
  3. 18
      apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbp.AuthServer.csproj
  4. 4
      apps/auth-server/src/EShopOnAbp.AuthServer/package.json
  5. 11453
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css
  6. 1
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map
  7. 7
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css
  8. 1
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css.map
  9. 15036
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.css
  10. 2
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.css.map
  11. 6
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.min.css
  12. 2
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.min.css.map
  13. 11242
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css
  14. 1
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css.map
  15. 7
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css
  16. 1
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css.map
  17. 9949
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js
  18. 2
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map
  19. 4
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js
  20. 2
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map
  21. 5
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.enable.tooltips.everywhere.js
  22. 128
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css
  23. 10
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js
  24. 1081
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net/js/jquery.dataTables.js
  25. 6
      apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/select2/js/select2-bootstrap-modal-patch.js
  26. 313
      apps/auth-server/src/EShopOnAbp.AuthServer/yarn.lock
  27. 18
      apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
  28. 2
      apps/public-web/src/EShopOnAbp.PublicWeb/package.json
  29. 11453
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.css
  30. 1
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map
  31. 7
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css
  32. 1
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css.map
  33. 15036
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.css
  34. 2
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.css.map
  35. 6
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.min.css
  36. 2
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.min.css.map
  37. 11242
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.css
  38. 1
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.css.map
  39. 7
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css
  40. 1
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css.map
  41. 9949
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.js
  42. 2
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map
  43. 4
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js
  44. 2
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map
  45. 5
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.enable.tooltips.everywhere.js
  46. 128
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css
  47. 10
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js
  48. 1013
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net/js/jquery.dataTables.js
  49. 6
      apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/select2/js/select2-bootstrap-modal-patch.js
  50. 269
      apps/public-web/src/EShopOnAbp.PublicWeb/yarn.lock
  51. BIN
      docs/roadmap/Phase_1.png
  52. BIN
      docs/roadmap/Phase_2.png
  53. 2
      global.json
  54. 6
      services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
  55. 6
      services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
  56. 10
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
  57. 12
      services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
  58. 14
      services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
  59. 6
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
  60. 10
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
  61. 6
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
  62. 2
      services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
  63. 6
      services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj
  64. 4
      services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj
  65. 4
      services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj
  66. 4
      services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj
  67. 2
      services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj
  68. 2
      services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj
  69. 2
      services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj
  70. 2
      services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj
  71. 6
      services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj
  72. 6
      services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj
  73. 4
      services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj
  74. 4
      services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj
  75. 4
      services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj
  76. 2
      services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj
  77. 4
      services/catalog/src/EShopOnAbp.CatalogService.EntityFrameworkCore/EShopOnAbp.CatalogService.EntityFrameworkCore.csproj
  78. 2
      services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj
  79. 2
      services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj
  80. 33
      services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/Samples/SampleAppServiceTests.cs
  81. 45
      services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/Samples/SampleDomainTests.cs
  82. 2
      services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests.csproj
  83. 44
      services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs
  84. 6
      services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj
  85. 14
      services/catalog/test/EShopOnAbp.CatalogService.TestBase/CatalogServiceTestBaseModule.cs
  86. 7
      services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj
  87. 4
      services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj
  88. 4
      services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj
  89. 6
      services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj
  90. 4
      services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj
  91. 8
      services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj
  92. 4
      services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj
  93. 2
      services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj
  94. 4
      services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj
  95. 2
      services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj
  96. 6
      services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj
  97. 4
      services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj
  98. 4
      services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj
  99. 4
      services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj
  100. 2
      services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj

18
apps/angular/package.json

@ -12,14 +12,14 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "~5.0.0-beta.1-1",
"@abp/ng.components": "~5.0.0-beta.1-1",
"@abp/ng.core": "~5.0.0-beta.1-1",
"@abp/ng.identity": "~5.0.0-beta.1-1",
"@abp/ng.setting-management": "~5.0.0-beta.1-1",
"@abp/ng.tenant-management": "~5.0.0-beta.1-1",
"@abp/ng.theme.basic": "~5.0.0-beta.1-1",
"@abp/ng.theme.shared": "~5.0.0-beta.1-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.1-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",

157
apps/angular/yarn.lock

@ -2,73 +2,72 @@
# yarn lockfile v1
"@abp/ng.account.core@~5.0.0-beta.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.account.core/-/ng.account.core-5.0.0-beta.1-1.tgz#1b283a884a178e86306bb3719fc9aa4f4e13f1a7"
integrity sha512-T5eyxg+UdFWe3+qS1mFwk0TWZUOD+E4ILbLtQJdmC4kE/aqSOJZeab4PQo45xvTqxJ+QO4GVIYrfg6krkIDnZQ==
"@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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-5.0.0-beta.1-1.tgz#0b1fe99e5f0df4892e12f1ea989c087dd3fafcc1"
integrity sha512-bwqqiUxVINtDX6cMqNx6Wh1Ie7VUJNGyAx3nHNjhvDwU+40w0DvngoQ/+2UUNrWvacFplj9wkuhKR4YNr26Dfw==
"@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.1-1"
"@abp/ng.identity" "~5.0.0-beta.1-1"
"@abp/ng.theme.shared" "~5.0.0-beta.1-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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-5.0.0-beta.1-1.tgz#53cb99f14f47f1e274a5b729f7f2239ce5ea6251"
integrity sha512-567FfP108A2yFVDHfz34g1LJQsV7HGpm0z4403nlVUT1CWxv5o5zVVpcaOn2pau57Uf9tE0IRxXxZuWHNPzXVw==
"@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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-5.0.0-beta.1-1.tgz#3a679cfb562a4598fe8628b9335009cce8d821ad"
integrity sha512-F/N7M1rUPG9ROTOhruF9wMBy/hOTHOeSuJSqI1BN5m3lav8mDj0q6X+TlxszN5xQvIepgZXDYmCz6C+qmB9+Lg==
"@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.1"
"@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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-5.0.0-beta.1-1.tgz#0b14ef984de2308297b053ea421c834d22bd352c"
integrity sha512-89XX1+PkA1LZROZIJGGIDGQWEbuqvusnDcDKkuzVrI3+mghkvoGQYPig7nxnhW5vGdAmvJ9fDztsUNN5JKUDDQ==
"@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.1-1"
"@abp/ng.theme.shared" "~5.0.0-rc.1"
tslib "^2.0.0"
"@abp/ng.identity@~5.0.0-beta.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-5.0.0-beta.1-1.tgz#dd06d766a950a354565b5821363200d8763d2a65"
integrity sha512-qHRc5SceIQ56V1F0VVGqPjVnr7YHLEYmfX5tgyd/qk97WWvszkBD7a1eyQREP4Q63IiwcBtqnbN3hRCAU78JIQ==
"@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.1-1"
"@abp/ng.theme.shared" "~5.0.0-beta.1-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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-5.0.0-beta.1-1.tgz#72f709fc99581724b9102e9308f69f52200dc596"
integrity sha512-TKoP0lPMpgGzhtQ4W1zfv3uof4oP4ZZNxoTa9W7t1TzfAhxo/ryPJuMf11NXrJvKnD3s0I9AZMudGhjQvxXm3Q==
"@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.1-1"
"@abp/ng.theme.shared" "~5.0.0-rc.1"
tslib "^2.0.0"
"@abp/ng.schematics@~5.0.0-beta.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-5.0.0-beta.1-1.tgz#e53298a5f6472065b07ae1268ed74ee879389d6b"
integrity sha512-B820JImPYoCRuAf6LgxcCTW0i841RZwD2Y9prhmeAbue8uKs89MnjWiQMf7VbKIWR9rm7WPoEKoLBSV1cVO9/A==
"@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"
@ -77,50 +76,50 @@
should-quote "^1.0.0"
typescript "~3.9.2"
"@abp/ng.setting-management@~5.0.0-beta.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-5.0.0-beta.1-1.tgz#4ad8d3ce4b0eee54460f6babb6a6b8775a217b05"
integrity sha512-Qqu/vjeoGJ/8+uq1/dmIb/ZsZn7lah3afUkYrs/1auFACYSiR9F9JgYueXaQ9OxLjrBZuA7wjdMB2mxKGDaZAg==
"@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.1-1"
"@abp/ng.theme.shared" "~5.0.0-beta.1-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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-5.0.0-beta.1-1.tgz#4b851d6d4971fce83d11cf0511d74d2578ccf742"
integrity sha512-t7e8oYGas4Y3L28UUFmWPGlHyri/HVHSdKNf27rq3XjY1bhDd2RCC3FqSJCCr/AoNm1NU7fIPUl8oLTCWIYvkg==
"@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.1-1"
"@abp/ng.theme.shared" "~5.0.0-beta.1-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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-5.0.0-beta.1-1.tgz#fdb92411c5c3df686472ea3ea6175294a7a1f437"
integrity sha512-CAoVAU3ZOBsXhIAiQYGhNeuPic1yGR1MBolIK4EUpR0Ag1jyUXEahCu3T78MYdRBcPlYOD0yrK1/llo4GWZn2w==
"@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.1-1"
"@abp/ng.theme.shared" "~5.0.0-beta.1-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.1-1":
version "5.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-5.0.0-beta.1-1.tgz#fce2aa9433838f514263cfa3aff34ab803651320"
integrity sha512-AQFTm4T8ohR/7RmZTTJ7CvUscwKqf/HF2AvxZRy+ixe+q1PGWos6L+e8ZFt5YuzkieUPLXdWkeBni0x4rEQRdw==
"@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.1-1"
"@abp/ng.core" "~5.0.0-rc.1"
"@fortawesome/fontawesome-free" "^5.15.4"
"@ng-bootstrap/ng-bootstrap" "^7.0.0"
"@ng-bootstrap/ng-bootstrap" "^11.0.0-beta.2"
"@ngx-validate/core" "^0.0.13"
"@swimlane/ngx-datatable" "^19.0.0"
bootstrap "~4.6.0"
bootstrap "^5.1.1"
tslib "^2.0.0"
"@abp/utils@^5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-beta.1.tgz#e1bf9240738276081c89a67073d9d85205fdf14c"
integrity sha512-suzKxHUautizxt5XdlJ8ONIaVMcAHrb2dp1kEnXnFRW1ip+7ZQ9/nxJj+GtY1MhHX2yPmlUQP2K8f2upJh9aoA==
"@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"
@ -1436,12 +1435,12 @@
merge-source-map "^1.1.0"
schema-utils "^2.7.0"
"@ng-bootstrap/ng-bootstrap@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-7.0.0.tgz#3bfa62eb52fdb891b1ce693ea11c39127e2d1ab7"
integrity sha512-SxUaptGWJmCxM0d2Zy1mx7K7p/YBwGZ69NmmBQVY4BE6p5av0hWrVmv9rzzfBz0rhxU7RPZLor2Jpaoq8Xyl4w==
"@ng-bootstrap/ng-bootstrap@^11.0.0-beta.2":
version "11.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.0-beta.2.tgz#4d0c1f23a050e2e07ea22cc0c017e0b3685cdbf9"
integrity sha512-H6Kdzw4DBsUIrlvoxEJHCValSTHq0XcsiTVNbb99PjgD6ZhkBjINenT0W62A91k0nQEQBZCjhGGv+aNU/XxQNg==
dependencies:
tslib "^2.0.0"
tslib "^2.1.0"
"@ngtools/webpack@12.2.8":
version "12.2.8"
@ -2437,10 +2436,10 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
bootstrap@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
bootstrap@^5.1.1:
version "5.1.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
brace-expansion@^1.1.7:
version "1.1.11"
@ -8511,7 +8510,7 @@ tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.0, tslib@^2.2.0, tslib@^2.3.0:
tslib@^2.0.0, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==

18
apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbp.AuthServer.csproj

@ -5,18 +5,18 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs.RabbitMQ" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.RabbitMQ" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

4
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.2",
"@volo/account": "^5.0.0-beta.2"
"@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-rc.1",
"@volo/account": "~5.0.0-rc.1"
}
}

11453
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css

File diff suppressed because it is too large

1
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map

File diff suppressed because one or more lines are too long

7
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css

File diff suppressed because one or more lines are too long

1
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css.map

File diff suppressed because one or more lines are too long

15036
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.css

File diff suppressed because it is too large

2
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.css.map

File diff suppressed because one or more lines are too long

6
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.min.css

File diff suppressed because one or more lines are too long

2
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.min.css.map

File diff suppressed because one or more lines are too long

11242
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css

File diff suppressed because it is too large

1
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css.map

File diff suppressed because one or more lines are too long

7
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css

File diff suppressed because one or more lines are too long

1
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css.map

File diff suppressed because one or more lines are too long

9949
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js

File diff suppressed because it is too large

2
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map

File diff suppressed because one or more lines are too long

4
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js

File diff suppressed because one or more lines are too long

2
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map

File diff suppressed because one or more lines are too long

5
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/bootstrap/js/bootstrap.enable.tooltips.everywhere.js

@ -0,0 +1,5 @@
(function () {
[].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')).map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl)
});
})();

128
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css → 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);
}

10
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js → 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"
} );

1081
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/datatables.net/js/jquery.dataTables.js

File diff suppressed because it is too large

6
apps/auth-server/src/EShopOnAbp.AuthServer/wwwroot/libs/select2/js/select2-bootstrap-modal-patch.js

@ -1,6 +0,0 @@
/*
https://select2.org/troubleshooting/common-problems
*/
if ($.fn.modal) {
$.fn.modal.Constructor.prototype._enforceFocus = function () { };
}

313
apps/auth-server/src/EShopOnAbp.AuthServer/yarn.lock

@ -2,37 +2,37 @@
# yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@^5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.0-beta.2.tgz#077d1edd88f2f1ccb5c8227180a75e3121eece19"
integrity sha512-b7f05Fza18NYHudrHosYuCX/UJ/Y3KYJrJMHqdvAsZYu0t3dc7EMWKYTDA/+rDEO8iV/83twRYfHLf0tmVyc1Q==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-beta.2"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.0-beta.2.tgz#8c58d252f1a39f91c2c287b91691e5bd772f4918"
integrity sha512-l4suGM7PjGTw/MEg2f2BdbRXYzALhZQUSijzKIQTy5dwcA/JQPsLbezPzGy45fD3lXsYxBwS4QaOmofTosKkug==
dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.0-beta.2"
"@abp/bootstrap" "~5.0.0-beta.2"
"@abp/bootstrap-datepicker" "~5.0.0-beta.2"
"@abp/datatables.net-bs4" "~5.0.0-beta.2"
"@abp/font-awesome" "~5.0.0-beta.2"
"@abp/jquery-form" "~5.0.0-beta.2"
"@abp/jquery-validation-unobtrusive" "~5.0.0-beta.2"
"@abp/lodash" "~5.0.0-beta.2"
"@abp/luxon" "~5.0.0-beta.2"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.0-beta.2"
"@abp/select2" "~5.0.0-beta.2"
"@abp/sweetalert2" "~5.0.0-beta.2"
"@abp/timeago" "~5.0.0-beta.2"
"@abp/toastr" "~5.0.0-beta.2"
"@abp/aspnetcore.mvc.ui@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.0-beta.2.tgz#c30d9905e133451208e379f7173ed9c44dd5f487"
integrity sha512-8Dzfg5SzeVoXz/nY11o2u3y7ZQdUW/zVSYVTgbsCMC1HCe2yzptpr2XI0Goz8jQKgz0G+zg3iwfeur7vNoaoMw==
"@abp/aspnetcore.mvc.ui.theme.basic@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.0-rc.1.tgz#cd575ab35b5cf9c9c2d3ab02fc6ff5fb1851a622"
integrity sha512-/tezLoIaqMJTlV78EbyKkJY30XpayiXJg2apq6/LnSddDIDKaRdlWe1gfXBjFrkOVkdhdSPrvOIy95a284cY/Q==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.0-rc.1.tgz#053ee1d8f69eea1559d6600d7f7b5a645968d6bf"
integrity sha512-XbCXZ8mka5RCezYR54YRiUn+SgTyVgo/2F42UJ8ZJKMHKo8nQGMFANWuuJ4qHamApEqKZZmmdWp37BnpQ7JMMw==
dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.0-rc.1"
"@abp/bootstrap" "~5.0.0-rc.1"
"@abp/bootstrap-datepicker" "~5.0.0-rc.1"
"@abp/datatables.net-bs5" "~5.0.0-rc.1"
"@abp/font-awesome" "~5.0.0-rc.1"
"@abp/jquery-form" "~5.0.0-rc.1"
"@abp/jquery-validation-unobtrusive" "~5.0.0-rc.1"
"@abp/lodash" "~5.0.0-rc.1"
"@abp/luxon" "~5.0.0-rc.1"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.0-rc.1"
"@abp/select2" "~5.0.0-rc.1"
"@abp/sweetalert2" "~5.0.0-rc.1"
"@abp/timeago" "~5.0.0-rc.1"
"@abp/toastr" "~5.0.0-rc.1"
"@abp/aspnetcore.mvc.ui@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.0-rc.1.tgz#17e16731a4b840ccf208ec9fa651783776b7ed28"
integrity sha512-eLH0tj5KMwwFRL1JnN1zjM1lkJyB16ElpQ0W56tjiTx0S++QChMrBFhbKXxIfsFylNv9bhaInamq3pXKrXKhAg==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@ -41,161 +41,161 @@
merge-stream "^2.0.0"
micromatch "^4.0.2"
"@abp/bootstrap-datepicker@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.0-beta.2.tgz#dbf92485225a424f0e53e55c3ef8c993943682f0"
integrity sha512-jJWVKrkKcUMEqwBrEqhGD1zDFD8b0b3j0WdlzKuzlw26AaQkfE4LQ9Gjfjs+RnTW1LxPn8rGP8QCgdVeWMNjQQ==
"@abp/bootstrap-datepicker@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.0-rc.1.tgz#750e3cfc93124ecb10805e511d499ba03ec8b446"
integrity sha512-VkuX0qdHt8zYe7jJt4Y03kr4UnFYmqqBC2DyyaipUvy9KncUsui/t5enn7GN5ZWE9phF9ek4Fga3mRRIgs3bZg==
dependencies:
bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.0-beta.2.tgz#0faaa85871fd23076dd597dce83dc3020b1ff950"
integrity sha512-zy0DUcAJuX+Oeu4csw7XbyLGq/YdfonMLJt/Mkpq8CjAssD7n7aJK6PwG+akaI4giSQd7Sc1JvvnKRMRzyxy1Q==
"@abp/bootstrap@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.0-rc.1.tgz#a9adb676908612e4f83c184d0d2188f1d561e6c4"
integrity sha512-TCFwjX3o1lOkV4n3ZmD0PtsXPfBaaOAkLh4fMZTxF9EfBLtH6u0y3LsOviPAjiee+BmjYy2vO+9cgS6TQP8HBw==
dependencies:
"@abp/core" "~5.0.0-beta.2"
bootstrap "^4.6.0"
"@abp/core" "~5.0.0-rc.1"
bootstrap "^5.1.0"
bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.0-beta.2.tgz#f9643d21b19128be3ad58b23083e1fc9620f2102"
integrity sha512-AHlJQF5NC+yNsj5xILHk1CF++Z93aQDNp0zdJciDqIexH9lEJ+AQCX2EKLn0yjWt4Ga00pOOmQM5vJVJjuJCEw==
"@abp/core@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.0-rc.1.tgz#1b7d88dcd2855e0fd0cec92b32f9a770f744c1da"
integrity sha512-E/j8aAsgVPcUS2bhTggpbqBHoavlAW9s2IS5GZ2rd8nKTd8aV2oa9lH0CgYN2Yswgd1mr9aA4Mz+/Se5mumyRA==
dependencies:
"@abp/utils" "^5.0.0-beta.2"
"@abp/utils" "~5.0.0-rc.1"
"@abp/cropperjs@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/cropperjs/-/cropperjs-5.0.0-beta.2.tgz#6b8d870e85add42941f778cec14122f962cf8e4b"
integrity sha512-fkkomk3+7gMoEGyx6Hq2cLC4zsCtddwz7QamjEA7g7SxzQf3Rvfv36Nk/GBf78Jn/5eQXAXwLiNIXxeYDTyARA==
"@abp/cropperjs@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/cropperjs/-/cropperjs-5.0.0-rc.1.tgz#d8cdf262d4b668e1526d51d266f2d83c953c5b52"
integrity sha512-1cXg3rcX9J58DcYy6ZcjKbNZz0wzG283cuGmenXy9hcUc266QSUeux3yyxXyr4sb5HouckvEdPykIMRhT01kWw==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
cropperjs "^1.5.7"
"@abp/datatables.net-bs4@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-5.0.0-beta.2.tgz#3afb32918f59b55c68d3d37b2c1f0bf49bb06fc8"
integrity sha512-t6YserKkBId7KnT46uYaGw6HJrf8tcLp4bJmGyUSnCwVlgJcha/P6fr3pKWqFz9QPGk5riCZF3hK6x1BH9u71g==
"@abp/datatables.net-bs5@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.0.0-rc.1.tgz#45998d0469ee79eb006973981b26b541cd1bc6d0"
integrity sha512-TwSFY396xY9SRy93LNlKvuj3XnLpt3NGFv2/CnKizeVF6ike/nwun1NjNhLRZ1b1kfs6LsHoolYzhOfkJeoH1A==
dependencies:
"@abp/datatables.net" "~5.0.0-beta.2"
datatables.net-bs4 "^1.10.21"
"@abp/datatables.net" "~5.0.0-rc.1"
datatables.net-bs5 "^1.10.25"
"@abp/datatables.net@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.0-beta.2.tgz#fc87be76ebec94b16c6734c2249ea8a0a04a83b8"
integrity sha512-aEAlej1wNtxsxpwlw2GFOV0tFSZ7MWA+Wpfi5QZ4VIbYHSIkhEnz0apiNMBsoB8i7VJLJKZuKvynlJWYABNk0Q==
"@abp/datatables.net@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.0-rc.1.tgz#4f286a2e253f67a7522a5e8b6f6767d5fc324983"
integrity sha512-r1RjBde+8zacolfsolc4DBcLVyG3A/Fb4ptP3x8/HPQl7lkLCLTd9xS0/w3HeD62wFiugZvHjt82gD5A48CYUA==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
datatables.net "^1.10.21"
"@abp/font-awesome@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.0-beta.2.tgz#10a920fb20294f7ccd404ea2b302fb11f68f0705"
integrity sha512-Mmhfm7g5HdflvqbZOZDKk335IlY8ipwtKsCQ1qRaobsMpWi2AFh6/P/XX7y4H5p0wH5cluUsSzS1QB37QXp36w==
"@abp/font-awesome@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.0-rc.1.tgz#a2fdcb8111ddac8558b92feb935abb12103d0592"
integrity sha512-1rinXJdRurXIwxIszYt/6dS5EKrJPgBWKF2E8Mxc+ODN3/NboMYNrdKm3FAxHX3YB36fmW+qsBXH9aTVDohvCw==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
"@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.0-beta.2.tgz#4b685858d54eafac123995ebfea759c769e49cab"
integrity sha512-ekytRAvAUNKJAPiR5i7kxASh5j3D5jabO1GHbPwq6UzapGLMzG5r8s6/1b4eX+4Zorfy+TmERNeUsWvQwf3P1A==
"@abp/jquery-form@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.0-rc.1.tgz#c2bbf6532d88d8f7eb96d5ff8f8720d9166ab106"
integrity sha512-Yz5RpBzslciR6DEOvw2OjA1uDD0zf2JECbzAoy1BaY3iEFy0EUwLDhYKQmWcyoo6/2yMrPMBJlghpirmi5B9Vg==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.0-beta.2.tgz#392ab72716baea26e6f560e2369d09f8c5488d3b"
integrity sha512-PyiWj0hj5jkjcZ1oJeLXYuoVCIAg51X4y6iLbcb1SpAbqYQP23gilDJK8xkURbysGPMiDq+7tOiKAnGiHSBnWA==
"@abp/jquery-validation-unobtrusive@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.0-rc.1.tgz#6d39c58f1ad0b48d23521dc31904dfca4bc074c9"
integrity sha512-PcZE6JlcMRjIk042MkwvGQjJ88zdMM/o99A3cnT0UMkAwHl8z28R7OjWjhlZhrYznOtwEtp3yNhPrNn7OdtmNw==
dependencies:
"@abp/jquery-validation" "~5.0.0-beta.2"
"@abp/jquery-validation" "~5.0.0-rc.1"
jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.0-beta.2.tgz#233eda5998ae566daeb945d8508999da2ef75a51"
integrity sha512-jKY0yfRgM5RGlJeQCGKkkczx5qptpPkhqWr4x+ffTUzR+ywF9FHUB5zcbELpEyWuOJ9cilap2hga2lvPZ8c+Pg==
"@abp/jquery-validation@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.0-rc.1.tgz#f76d5c631a24f292327e01dfa7f557a6643055b1"
integrity sha512-FZwDN6FVx2WAMfK2QSpI081H1GBd8Tdbw60T0Kmc6m/qfQqLuwY3gPbUCrAS1J91eyvwxOVEycIIJ1Np/UhRmA==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
jquery-validation "^1.19.2"
"@abp/jquery@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.0-beta.2.tgz#62fa64fcc0bd5dca4b5e7534b24205a3f0461f08"
integrity sha512-tMzjo9qQAgJDYPvLk67YNlnOOUSTUfPWodlqfl5vvo6/NHSsB9eJhXH28txEtygX0o/Mepi9Ag87dL9VLh0DEw==
"@abp/jquery@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.0-rc.1.tgz#4ff643273b57dde7bb2af53ce62ab753bb13e0be"
integrity sha512-tK/eE0mq7UhPjQLJgluR06pHHIH64fcHCtL+V2V/u1u0dmHa6Fd6LpHGuekGdlZI7QLs6n6DiG6tkv4Cdf8W/g==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
jquery "~3.6.0"
"@abp/lodash@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.0-beta.2.tgz#c821eb502de3211f94ca2f7ba8a5c0b0677c5c9b"
integrity sha512-lW8lz1JG8kweVOWVCB7jC6xxLUE0G6MJfwv4g0+eKwFLgsAO5dK6Yk4xZi+UXgST73OgGt5LIQJcS4+aCo/zmg==
"@abp/lodash@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.0-rc.1.tgz#00e31f74eb28329caae96250c4439c5b2800acdb"
integrity sha512-6oO1m3vnXhNfITLyNubShKmIX92DMpgPJDJmUpoNiDMf0J1G0oHHauKW9X7aTEHlxIA0sK9xk8kIKSvgS9SThA==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
lodash "^4.17.15"
"@abp/luxon@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.0-beta.2.tgz#64c68c3091415153c8c470fb3e5650bbc00500d1"
integrity sha512-0mSVsycWEo5hamEuR7Mqw00JnVRlhQvpy8Bks58d7bRksIQzK8iPx9advTbP2ICF3iz9zHT9MJrMXYfvUT6oIQ==
"@abp/luxon@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.0-rc.1.tgz#ce185ebdefe1c416fcf85124226440f1334b05a6"
integrity sha512-fGN/6lHKIqCGe6pv49G2lRK5/7ezUYhZW+2A0oRtyEHsdjhXiZobTVnT/lqawqEs8aR2sJyc7lwCmRnO4jTrug==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.0-beta.2.tgz#6c030cfe1e123be0a81f769dedd6a6b22aed9077"
integrity sha512-ZEkCMMDKe26b/sCArQjDOGEm8+lQB9Uis17FNyHDt/vA+FdtaPJjeLOqmfzMeLQYppvefH+JCpGzfaWwCNZmcw==
"@abp/malihu-custom-scrollbar-plugin@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.0-rc.1.tgz#8b14c53b52603bcc283d1916133038ff25b5f18b"
integrity sha512-lEM2UwfoK+sUZlL7QiNgvFrXxq1Vb4nJbFmz4eZftZ1Zhj7akq5xxfWdq2jTwM4DQWFhr1OOAVaYHYx0tSCHpA==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.0-beta.2.tgz#f5e74d56ccdabde61825453044f31fa183573b58"
integrity sha512-ApL7ioC4p5GguQM2KfnqtGrJ9TqBRiQh1v+y1J2Z3Lh18SJU+tsA3f9Va9ZyZNIFrpV3Bsmim2cIu7bjm7IBRw==
"@abp/select2@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.0-rc.1.tgz#2b1e554ec9c96d5259c56c8f20d4b1b3d0bdb559"
integrity sha512-usATVW8Mbd/iSt74BQQZbvFei+Fz3IqDCJXW6stHJ4CqOkoJit6lA0cfMv9Az0ApOFf4ucgNgmsrYW3k31jPlQ==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
select2 "^4.0.13"
"@abp/sweetalert2@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.0-beta.2.tgz#164c1df63c2859fa5277673906f85cc8e7e2d1ef"
integrity sha512-UdENhKcfywOorjTf4+CxDO8UUet9lYAIDH2r+Kd1qjFKIDDu6w3TfJ7Gz108VG84+RsUevfVLgZ8qeYsA+drKQ==
"@abp/sweetalert2@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.0-rc.1.tgz#f677853dd5e1e7bdba5d06cff816befcdf0e58b9"
integrity sha512-JW87ed0YhCCd1O2TGX7BoSs5ts0/F4O4D5nv3vvvDgoqXdn0Q1hCXKjeIjfstSIFXAt/e20Cw0azvsYCFaCh3w==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
sweetalert2 "^11.0.18"
"@abp/timeago@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.0-beta.2.tgz#7a6242e6cc403addf172ebf18ffb3513d4b30f21"
integrity sha512-wdXaKd0dBJP0mawzHqE04YWUgpUYzq8vJHGH3QGf9RpB+XpMztt1KNHR6d32VylDAEoPEtB7GH4rVvlimKa48g==
"@abp/timeago@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.0-rc.1.tgz#f826f111d9d89258d5ac57a633a86e55d5604033"
integrity sha512-zcNG+3EnI/HLLKm4xJXbwjyFsUtFQey+j7zI9zEcXR4JZS+n5ltFSvcV+jLJDL0qcnwpB9008PXR0Jsqpzcmng==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
timeago "^1.6.7"
"@abp/toastr@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.0-beta.2.tgz#924f5315d3ade6ee41869d8809b625116c5b02f1"
integrity sha512-iqmgO/8AwORzYKf/43+Fx/478la0w+g+mrDahzokPlZFv6WUvFL3QSD/fs1mjc2yUOxEuvgprEiEfWoZcrwtNA==
"@abp/toastr@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.0-rc.1.tgz#2c9a52c71eb60115a05f70465a191febb068ab2f"
integrity sha512-SItT5xMfAQsb7ME+v9PQ+6+dUa905T5+Ws7CNMDKZWD59HPxqaoTRHtTOqzn/8pGMyCiXYzNeTdCESkRFdKWKQ==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
toastr "^2.1.4"
"@abp/uppy@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.0.0-beta.2.tgz#9b2dc0333cd2b35431a7287d60883d57796b63cf"
integrity sha512-oNRMMqgaFMMLDqPRaVOLER04iZ3Mx3h1kmfWOnEra3zopHqB/c3B3sOgaYYVzav2IeO/lz4YUuzLN6+/kZEIVw==
"@abp/uppy@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.0.0-rc.1.tgz#a13de305265c0dc843eed46c6af9f3239f7601e4"
integrity sha512-HfwE9kzMBCcnpX8IplGWos5UF+CDb81yApmwQwA30IJv7LGqO0PIVFvlkv2YopYYvG65f8tEFEbyUkpdXMw7SQ==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
uppy "^1.16.1"
"@abp/utils@^5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-beta.2.tgz#4d120c0f930b943071b4ba27dafedf6c8b730182"
integrity sha512-EZV1P+eafVBEHO6B+Ws6iX4xyeg8B6nCPLvpaFC6mStk7SGidh2rAYYWyydyh68Ky8YdbLYQE3oPaIewOhDWTg==
"@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"
@ -498,21 +498,21 @@
"@uppy/utils" "^3.3.0"
cuid "^2.1.1"
"@volo/abp.aspnetcore.mvc.ui.theme.commercial@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@volo/abp.aspnetcore.mvc.ui.theme.commercial/-/abp.aspnetcore.mvc.ui.theme.commercial-5.0.0-beta.2.tgz#6ac19bc128920b6f45996a2f0cddc36653188164"
integrity sha512-63gJgqexwdeSeiEHLmR4jxMv9+fXWjkNVjW29xAdtFMC+/kW07IMSOTZEA9bbGLOukOPxvN3OruEFc4n5v2HeA==
"@volo/abp.aspnetcore.mvc.ui.theme.commercial@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@volo/abp.aspnetcore.mvc.ui.theme.commercial/-/abp.aspnetcore.mvc.ui.theme.commercial-5.0.0-rc.1.tgz#88cf6979de98c7ccff43d63ab5d044e2ce791522"
integrity sha512-S2upgNDFjKRvJvi/V9pPsk1gr5yJxGWsJ7HD8bfm+0LzOQLgobLiL3lW/86CU7jS6C1Z5yfxeJC1GiYQ/bqBGw==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-beta.2"
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-rc.1"
"@volo/account@^5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@volo/account/-/account-5.0.0-beta.2.tgz#681915f8a40cea1a95115fa17b231996fc33418a"
integrity sha512-qjyK4ZnHPtnLSBfE/ox4O1lavZa/bQA4TOp6tDayuLKYaAM0zAG/pz0heBzgkTQzj5+LlAJx/IkIOI/0BhLjKA==
"@volo/account@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@volo/account/-/account-5.0.0-rc.1.tgz#1d7b7e64fab4636718860b9a0a5dbcd7cc232d38"
integrity sha512-gh4wi2vZ5PKXCycqHZLK773IsfGSxDjJcTFGRvBO2K80AkI0VsFZfhnzDfGkH77T8uM+a6v/B8mnUqzi04fjdQ==
dependencies:
"@abp/cropperjs" "~5.0.0-beta.2"
"@abp/uppy" "~5.0.0-beta.2"
"@volo/abp.aspnetcore.mvc.ui.theme.commercial" "~5.0.0-beta.2"
"@abp/cropperjs" "~5.0.0-rc.1"
"@abp/uppy" "~5.0.0-rc.1"
"@volo/abp.aspnetcore.mvc.ui.theme.commercial" "~5.0.0-rc.1"
abortcontroller-polyfill@^1.4.0:
version "1.5.0"
@ -762,10 +762,10 @@ bootstrap-v4-rtl@4.6.0-1:
resolved "https://registry.yarnpkg.com/bootstrap-v4-rtl/-/bootstrap-v4-rtl-4.6.0-1.tgz#8fc502e800308fb725151128dd288df1c027cd8e"
integrity sha512-ChcbO5JeEQx6/Yz40YZLq3A4RIWcCmCCiRpweF5wg32/Q8CfWrwDNpcDTJ2SU+aSAewUJoCSzf/tRxhAgnZuog==
bootstrap@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
bootstrap@^5.1.0:
version "5.1.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
brace-expansion@^1.1.7:
version "1.1.11"
@ -1031,15 +1031,22 @@ d@1, d@^1.0.1:
es5-ext "^0.10.50"
type "^1.0.1"
datatables.net-bs4@^1.10.21:
version "1.10.23"
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.10.23.tgz#bdd5d0dcb1bd68a7afe649a4424ba20647523b52"
integrity sha512-ChUB8t5t5uzPnJYTPXx2DOvnlm2shz8OadXrKoFavOadB308OuwHVxSldYq9+KGedCeiVxEjNqcaV4nFSXkRsw==
datatables.net-bs5@^1.10.25:
version "1.11.3"
resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-1.11.3.tgz#939d0e66fbf518718a519534a88fc88cd29405b0"
integrity sha512-u0tosKUR1XNpXzxOOt2NInnNYayt7GQoG+OM1xPRhdkZ7ZBD4oNF8S0aKve8yvSUq/ZwTMh4WJeh80GdmrJAdQ==
dependencies:
datatables.net ">=1.10.25"
jquery ">=1.7"
datatables.net@>=1.10.25:
version "1.11.3"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.11.3.tgz#80e691036efcd62467558ee64c07dd566cb761b4"
integrity sha512-VMj5qEaTebpNurySkM6jy6sGpl+s6onPK8xJhYr296R/vUBnz1+id16NVqNf9z5aR076OGcpGHCuiTuy4E05oQ==
dependencies:
datatables.net "1.10.23"
jquery ">=1.7"
datatables.net@1.10.23, datatables.net@^1.10.21:
datatables.net@^1.10.21:
version "1.10.23"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.23.tgz#59f7d7b12845183b1b379530d1385077e113ec01"
integrity sha512-we3tlNkzpxvgkKKlTxTMXPCt35untVXNg8zUYWpQyC1U5vJc+lT0+Zdc1ztK8d3lh5CfdnuFde2p8n3XwaGl3Q==

18
apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj

@ -5,18 +5,18 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

2
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.2"
"@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-rc.1"
}
}

11453
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.css

File diff suppressed because it is too large

1
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map

File diff suppressed because one or more lines are too long

7
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css

File diff suppressed because one or more lines are too long

1
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css.map

File diff suppressed because one or more lines are too long

15036
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.css

File diff suppressed because it is too large

2
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.css.map

File diff suppressed because one or more lines are too long

6
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.min.css

File diff suppressed because one or more lines are too long

2
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.min.css.map

File diff suppressed because one or more lines are too long

11242
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.css

File diff suppressed because it is too large

1
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.css.map

File diff suppressed because one or more lines are too long

7
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css

File diff suppressed because one or more lines are too long

1
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css.map

File diff suppressed because one or more lines are too long

9949
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.js

File diff suppressed because it is too large

2
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map

File diff suppressed because one or more lines are too long

4
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js

File diff suppressed because one or more lines are too long

2
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map

File diff suppressed because one or more lines are too long

5
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/bootstrap/js/bootstrap.enable.tooltips.everywhere.js

@ -0,0 +1,5 @@
(function () {
[].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')).map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl)
});
})();

128
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css → 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);
}

10
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js → 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"
} );

1013
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/datatables.net/js/jquery.dataTables.js

File diff suppressed because it is too large

6
apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/select2/js/select2-bootstrap-modal-patch.js

@ -1,6 +0,0 @@
/*
https://select2.org/troubleshooting/common-problems
*/
if ($.fn.modal) {
$.fn.modal.Constructor.prototype._enforceFocus = function () { };
}

269
apps/public-web/src/EShopOnAbp.PublicWeb/yarn.lock

@ -2,37 +2,37 @@
# yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@^5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.0-beta.2.tgz#077d1edd88f2f1ccb5c8227180a75e3121eece19"
integrity sha512-b7f05Fza18NYHudrHosYuCX/UJ/Y3KYJrJMHqdvAsZYu0t3dc7EMWKYTDA/+rDEO8iV/83twRYfHLf0tmVyc1Q==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-beta.2"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.0-beta.2.tgz#8c58d252f1a39f91c2c287b91691e5bd772f4918"
integrity sha512-l4suGM7PjGTw/MEg2f2BdbRXYzALhZQUSijzKIQTy5dwcA/JQPsLbezPzGy45fD3lXsYxBwS4QaOmofTosKkug==
dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.0-beta.2"
"@abp/bootstrap" "~5.0.0-beta.2"
"@abp/bootstrap-datepicker" "~5.0.0-beta.2"
"@abp/datatables.net-bs4" "~5.0.0-beta.2"
"@abp/font-awesome" "~5.0.0-beta.2"
"@abp/jquery-form" "~5.0.0-beta.2"
"@abp/jquery-validation-unobtrusive" "~5.0.0-beta.2"
"@abp/lodash" "~5.0.0-beta.2"
"@abp/luxon" "~5.0.0-beta.2"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.0-beta.2"
"@abp/select2" "~5.0.0-beta.2"
"@abp/sweetalert2" "~5.0.0-beta.2"
"@abp/timeago" "~5.0.0-beta.2"
"@abp/toastr" "~5.0.0-beta.2"
"@abp/aspnetcore.mvc.ui@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.0-beta.2.tgz#c30d9905e133451208e379f7173ed9c44dd5f487"
integrity sha512-8Dzfg5SzeVoXz/nY11o2u3y7ZQdUW/zVSYVTgbsCMC1HCe2yzptpr2XI0Goz8jQKgz0G+zg3iwfeur7vNoaoMw==
"@abp/aspnetcore.mvc.ui.theme.basic@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.0-rc.1.tgz#cd575ab35b5cf9c9c2d3ab02fc6ff5fb1851a622"
integrity sha512-/tezLoIaqMJTlV78EbyKkJY30XpayiXJg2apq6/LnSddDIDKaRdlWe1gfXBjFrkOVkdhdSPrvOIy95a284cY/Q==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.0-rc.1.tgz#053ee1d8f69eea1559d6600d7f7b5a645968d6bf"
integrity sha512-XbCXZ8mka5RCezYR54YRiUn+SgTyVgo/2F42UJ8ZJKMHKo8nQGMFANWuuJ4qHamApEqKZZmmdWp37BnpQ7JMMw==
dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.0-rc.1"
"@abp/bootstrap" "~5.0.0-rc.1"
"@abp/bootstrap-datepicker" "~5.0.0-rc.1"
"@abp/datatables.net-bs5" "~5.0.0-rc.1"
"@abp/font-awesome" "~5.0.0-rc.1"
"@abp/jquery-form" "~5.0.0-rc.1"
"@abp/jquery-validation-unobtrusive" "~5.0.0-rc.1"
"@abp/lodash" "~5.0.0-rc.1"
"@abp/luxon" "~5.0.0-rc.1"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.0-rc.1"
"@abp/select2" "~5.0.0-rc.1"
"@abp/sweetalert2" "~5.0.0-rc.1"
"@abp/timeago" "~5.0.0-rc.1"
"@abp/toastr" "~5.0.0-rc.1"
"@abp/aspnetcore.mvc.ui@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.0-rc.1.tgz#17e16731a4b840ccf208ec9fa651783776b7ed28"
integrity sha512-eLH0tj5KMwwFRL1JnN1zjM1lkJyB16ElpQ0W56tjiTx0S++QChMrBFhbKXxIfsFylNv9bhaInamq3pXKrXKhAg==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@ -41,145 +41,145 @@
merge-stream "^2.0.0"
micromatch "^4.0.2"
"@abp/bootstrap-datepicker@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.0-beta.2.tgz#dbf92485225a424f0e53e55c3ef8c993943682f0"
integrity sha512-jJWVKrkKcUMEqwBrEqhGD1zDFD8b0b3j0WdlzKuzlw26AaQkfE4LQ9Gjfjs+RnTW1LxPn8rGP8QCgdVeWMNjQQ==
"@abp/bootstrap-datepicker@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.0-rc.1.tgz#750e3cfc93124ecb10805e511d499ba03ec8b446"
integrity sha512-VkuX0qdHt8zYe7jJt4Y03kr4UnFYmqqBC2DyyaipUvy9KncUsui/t5enn7GN5ZWE9phF9ek4Fga3mRRIgs3bZg==
dependencies:
bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.0-beta.2.tgz#0faaa85871fd23076dd597dce83dc3020b1ff950"
integrity sha512-zy0DUcAJuX+Oeu4csw7XbyLGq/YdfonMLJt/Mkpq8CjAssD7n7aJK6PwG+akaI4giSQd7Sc1JvvnKRMRzyxy1Q==
"@abp/bootstrap@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.0-rc.1.tgz#a9adb676908612e4f83c184d0d2188f1d561e6c4"
integrity sha512-TCFwjX3o1lOkV4n3ZmD0PtsXPfBaaOAkLh4fMZTxF9EfBLtH6u0y3LsOviPAjiee+BmjYy2vO+9cgS6TQP8HBw==
dependencies:
"@abp/core" "~5.0.0-beta.2"
bootstrap "^4.6.0"
"@abp/core" "~5.0.0-rc.1"
bootstrap "^5.1.0"
bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.0-beta.2.tgz#f9643d21b19128be3ad58b23083e1fc9620f2102"
integrity sha512-AHlJQF5NC+yNsj5xILHk1CF++Z93aQDNp0zdJciDqIexH9lEJ+AQCX2EKLn0yjWt4Ga00pOOmQM5vJVJjuJCEw==
"@abp/core@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.0-rc.1.tgz#1b7d88dcd2855e0fd0cec92b32f9a770f744c1da"
integrity sha512-E/j8aAsgVPcUS2bhTggpbqBHoavlAW9s2IS5GZ2rd8nKTd8aV2oa9lH0CgYN2Yswgd1mr9aA4Mz+/Se5mumyRA==
dependencies:
"@abp/utils" "^5.0.0-beta.2"
"@abp/utils" "~5.0.0-rc.1"
"@abp/datatables.net-bs4@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-5.0.0-beta.2.tgz#3afb32918f59b55c68d3d37b2c1f0bf49bb06fc8"
integrity sha512-t6YserKkBId7KnT46uYaGw6HJrf8tcLp4bJmGyUSnCwVlgJcha/P6fr3pKWqFz9QPGk5riCZF3hK6x1BH9u71g==
"@abp/datatables.net-bs5@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.0.0-rc.1.tgz#45998d0469ee79eb006973981b26b541cd1bc6d0"
integrity sha512-TwSFY396xY9SRy93LNlKvuj3XnLpt3NGFv2/CnKizeVF6ike/nwun1NjNhLRZ1b1kfs6LsHoolYzhOfkJeoH1A==
dependencies:
"@abp/datatables.net" "~5.0.0-beta.2"
datatables.net-bs4 "^1.10.21"
"@abp/datatables.net" "~5.0.0-rc.1"
datatables.net-bs5 "^1.10.25"
"@abp/datatables.net@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.0-beta.2.tgz#fc87be76ebec94b16c6734c2249ea8a0a04a83b8"
integrity sha512-aEAlej1wNtxsxpwlw2GFOV0tFSZ7MWA+Wpfi5QZ4VIbYHSIkhEnz0apiNMBsoB8i7VJLJKZuKvynlJWYABNk0Q==
"@abp/datatables.net@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.0-rc.1.tgz#4f286a2e253f67a7522a5e8b6f6767d5fc324983"
integrity sha512-r1RjBde+8zacolfsolc4DBcLVyG3A/Fb4ptP3x8/HPQl7lkLCLTd9xS0/w3HeD62wFiugZvHjt82gD5A48CYUA==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
datatables.net "^1.10.21"
"@abp/font-awesome@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.0-beta.2.tgz#10a920fb20294f7ccd404ea2b302fb11f68f0705"
integrity sha512-Mmhfm7g5HdflvqbZOZDKk335IlY8ipwtKsCQ1qRaobsMpWi2AFh6/P/XX7y4H5p0wH5cluUsSzS1QB37QXp36w==
"@abp/font-awesome@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.0-rc.1.tgz#a2fdcb8111ddac8558b92feb935abb12103d0592"
integrity sha512-1rinXJdRurXIwxIszYt/6dS5EKrJPgBWKF2E8Mxc+ODN3/NboMYNrdKm3FAxHX3YB36fmW+qsBXH9aTVDohvCw==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
"@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.0-beta.2.tgz#4b685858d54eafac123995ebfea759c769e49cab"
integrity sha512-ekytRAvAUNKJAPiR5i7kxASh5j3D5jabO1GHbPwq6UzapGLMzG5r8s6/1b4eX+4Zorfy+TmERNeUsWvQwf3P1A==
"@abp/jquery-form@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.0-rc.1.tgz#c2bbf6532d88d8f7eb96d5ff8f8720d9166ab106"
integrity sha512-Yz5RpBzslciR6DEOvw2OjA1uDD0zf2JECbzAoy1BaY3iEFy0EUwLDhYKQmWcyoo6/2yMrPMBJlghpirmi5B9Vg==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.0-beta.2.tgz#392ab72716baea26e6f560e2369d09f8c5488d3b"
integrity sha512-PyiWj0hj5jkjcZ1oJeLXYuoVCIAg51X4y6iLbcb1SpAbqYQP23gilDJK8xkURbysGPMiDq+7tOiKAnGiHSBnWA==
"@abp/jquery-validation-unobtrusive@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.0-rc.1.tgz#6d39c58f1ad0b48d23521dc31904dfca4bc074c9"
integrity sha512-PcZE6JlcMRjIk042MkwvGQjJ88zdMM/o99A3cnT0UMkAwHl8z28R7OjWjhlZhrYznOtwEtp3yNhPrNn7OdtmNw==
dependencies:
"@abp/jquery-validation" "~5.0.0-beta.2"
"@abp/jquery-validation" "~5.0.0-rc.1"
jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.0-beta.2.tgz#233eda5998ae566daeb945d8508999da2ef75a51"
integrity sha512-jKY0yfRgM5RGlJeQCGKkkczx5qptpPkhqWr4x+ffTUzR+ywF9FHUB5zcbELpEyWuOJ9cilap2hga2lvPZ8c+Pg==
"@abp/jquery-validation@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.0-rc.1.tgz#f76d5c631a24f292327e01dfa7f557a6643055b1"
integrity sha512-FZwDN6FVx2WAMfK2QSpI081H1GBd8Tdbw60T0Kmc6m/qfQqLuwY3gPbUCrAS1J91eyvwxOVEycIIJ1Np/UhRmA==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
jquery-validation "^1.19.2"
"@abp/jquery@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.0-beta.2.tgz#62fa64fcc0bd5dca4b5e7534b24205a3f0461f08"
integrity sha512-tMzjo9qQAgJDYPvLk67YNlnOOUSTUfPWodlqfl5vvo6/NHSsB9eJhXH28txEtygX0o/Mepi9Ag87dL9VLh0DEw==
"@abp/jquery@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.0-rc.1.tgz#4ff643273b57dde7bb2af53ce62ab753bb13e0be"
integrity sha512-tK/eE0mq7UhPjQLJgluR06pHHIH64fcHCtL+V2V/u1u0dmHa6Fd6LpHGuekGdlZI7QLs6n6DiG6tkv4Cdf8W/g==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
jquery "~3.6.0"
"@abp/lodash@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.0-beta.2.tgz#c821eb502de3211f94ca2f7ba8a5c0b0677c5c9b"
integrity sha512-lW8lz1JG8kweVOWVCB7jC6xxLUE0G6MJfwv4g0+eKwFLgsAO5dK6Yk4xZi+UXgST73OgGt5LIQJcS4+aCo/zmg==
"@abp/lodash@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.0-rc.1.tgz#00e31f74eb28329caae96250c4439c5b2800acdb"
integrity sha512-6oO1m3vnXhNfITLyNubShKmIX92DMpgPJDJmUpoNiDMf0J1G0oHHauKW9X7aTEHlxIA0sK9xk8kIKSvgS9SThA==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
lodash "^4.17.15"
"@abp/luxon@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.0-beta.2.tgz#64c68c3091415153c8c470fb3e5650bbc00500d1"
integrity sha512-0mSVsycWEo5hamEuR7Mqw00JnVRlhQvpy8Bks58d7bRksIQzK8iPx9advTbP2ICF3iz9zHT9MJrMXYfvUT6oIQ==
"@abp/luxon@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.0-rc.1.tgz#ce185ebdefe1c416fcf85124226440f1334b05a6"
integrity sha512-fGN/6lHKIqCGe6pv49G2lRK5/7ezUYhZW+2A0oRtyEHsdjhXiZobTVnT/lqawqEs8aR2sJyc7lwCmRnO4jTrug==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.0-beta.2.tgz#6c030cfe1e123be0a81f769dedd6a6b22aed9077"
integrity sha512-ZEkCMMDKe26b/sCArQjDOGEm8+lQB9Uis17FNyHDt/vA+FdtaPJjeLOqmfzMeLQYppvefH+JCpGzfaWwCNZmcw==
"@abp/malihu-custom-scrollbar-plugin@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.0-rc.1.tgz#8b14c53b52603bcc283d1916133038ff25b5f18b"
integrity sha512-lEM2UwfoK+sUZlL7QiNgvFrXxq1Vb4nJbFmz4eZftZ1Zhj7akq5xxfWdq2jTwM4DQWFhr1OOAVaYHYx0tSCHpA==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.0-beta.2.tgz#f5e74d56ccdabde61825453044f31fa183573b58"
integrity sha512-ApL7ioC4p5GguQM2KfnqtGrJ9TqBRiQh1v+y1J2Z3Lh18SJU+tsA3f9Va9ZyZNIFrpV3Bsmim2cIu7bjm7IBRw==
"@abp/select2@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.0-rc.1.tgz#2b1e554ec9c96d5259c56c8f20d4b1b3d0bdb559"
integrity sha512-usATVW8Mbd/iSt74BQQZbvFei+Fz3IqDCJXW6stHJ4CqOkoJit6lA0cfMv9Az0ApOFf4ucgNgmsrYW3k31jPlQ==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
select2 "^4.0.13"
"@abp/sweetalert2@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.0-beta.2.tgz#164c1df63c2859fa5277673906f85cc8e7e2d1ef"
integrity sha512-UdENhKcfywOorjTf4+CxDO8UUet9lYAIDH2r+Kd1qjFKIDDu6w3TfJ7Gz108VG84+RsUevfVLgZ8qeYsA+drKQ==
"@abp/sweetalert2@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.0-rc.1.tgz#f677853dd5e1e7bdba5d06cff816befcdf0e58b9"
integrity sha512-JW87ed0YhCCd1O2TGX7BoSs5ts0/F4O4D5nv3vvvDgoqXdn0Q1hCXKjeIjfstSIFXAt/e20Cw0azvsYCFaCh3w==
dependencies:
"@abp/core" "~5.0.0-beta.2"
"@abp/core" "~5.0.0-rc.1"
sweetalert2 "^11.0.18"
"@abp/timeago@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.0-beta.2.tgz#7a6242e6cc403addf172ebf18ffb3513d4b30f21"
integrity sha512-wdXaKd0dBJP0mawzHqE04YWUgpUYzq8vJHGH3QGf9RpB+XpMztt1KNHR6d32VylDAEoPEtB7GH4rVvlimKa48g==
"@abp/timeago@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.0-rc.1.tgz#f826f111d9d89258d5ac57a633a86e55d5604033"
integrity sha512-zcNG+3EnI/HLLKm4xJXbwjyFsUtFQey+j7zI9zEcXR4JZS+n5ltFSvcV+jLJDL0qcnwpB9008PXR0Jsqpzcmng==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
timeago "^1.6.7"
"@abp/toastr@~5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.0-beta.2.tgz#924f5315d3ade6ee41869d8809b625116c5b02f1"
integrity sha512-iqmgO/8AwORzYKf/43+Fx/478la0w+g+mrDahzokPlZFv6WUvFL3QSD/fs1mjc2yUOxEuvgprEiEfWoZcrwtNA==
"@abp/toastr@~5.0.0-rc.1":
version "5.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.0-rc.1.tgz#2c9a52c71eb60115a05f70465a191febb068ab2f"
integrity sha512-SItT5xMfAQsb7ME+v9PQ+6+dUa905T5+Ws7CNMDKZWD59HPxqaoTRHtTOqzn/8pGMyCiXYzNeTdCESkRFdKWKQ==
dependencies:
"@abp/jquery" "~5.0.0-beta.2"
"@abp/jquery" "~5.0.0-rc.1"
toastr "^2.1.4"
"@abp/utils@^5.0.0-beta.2":
version "5.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-beta.2.tgz#4d120c0f930b943071b4ba27dafedf6c8b730182"
integrity sha512-EZV1P+eafVBEHO6B+Ws6iX4xyeg8B6nCPLvpaFC6mStk7SGidh2rAYYWyydyh68Ky8YdbLYQE3oPaIewOhDWTg==
"@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"
@ -394,10 +394,10 @@ bootstrap-v4-rtl@4.6.0-1:
resolved "https://registry.yarnpkg.com/bootstrap-v4-rtl/-/bootstrap-v4-rtl-4.6.0-1.tgz#8fc502e800308fb725151128dd288df1c027cd8e"
integrity sha512-ChcbO5JeEQx6/Yz40YZLq3A4RIWcCmCCiRpweF5wg32/Q8CfWrwDNpcDTJ2SU+aSAewUJoCSzf/tRxhAgnZuog==
bootstrap@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
bootstrap@^5.1.0:
version "5.1.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
brace-expansion@^1.1.7:
version "1.1.11"
@ -610,15 +610,22 @@ d@1, d@^1.0.1:
es5-ext "^0.10.50"
type "^1.0.1"
datatables.net-bs4@^1.10.21:
version "1.10.25"
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.10.25.tgz#4474d6738bf55a25d20da79afe18e1e654cfca42"
integrity sha512-leoiWJWxoPKHBNC9dkFRE84PRybQcAI2Aw4UiS5zisROcYRx8YG1uQOTtID4jbqakmbwwXap/c2eH+sdVP5t2w==
datatables.net-bs5@^1.10.25:
version "1.11.3"
resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-1.11.3.tgz#939d0e66fbf518718a519534a88fc88cd29405b0"
integrity sha512-u0tosKUR1XNpXzxOOt2NInnNYayt7GQoG+OM1xPRhdkZ7ZBD4oNF8S0aKve8yvSUq/ZwTMh4WJeh80GdmrJAdQ==
dependencies:
datatables.net ">=1.10.25"
jquery ">=1.7"
datatables.net@>=1.10.25:
version "1.11.3"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.11.3.tgz#80e691036efcd62467558ee64c07dd566cb761b4"
integrity sha512-VMj5qEaTebpNurySkM6jy6sGpl+s6onPK8xJhYr296R/vUBnz1+id16NVqNf9z5aR076OGcpGHCuiTuy4E05oQ==
dependencies:
datatables.net "1.10.25"
jquery ">=1.7"
datatables.net@1.10.25, datatables.net@^1.10.21:
datatables.net@^1.10.21:
version "1.10.25"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.25.tgz#fc03a239e08f91d1d64ba101aa54daf4086d162c"
integrity sha512-y0+C7all+MC/h1acwnjErhaJPjYGKpWTvbXrfEUbR8+P+nnhgjNn5nL1udgsTwBObMhlj1KITNBRrM/ZLSoj+Q==

BIN
docs/roadmap/Phase_1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 KiB

After

Width:  |  Height:  |  Size: 405 KiB

BIN
docs/roadmap/Phase_2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 KiB

After

Width:  |  Height:  |  Size: 444 KiB

2
global.json

@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.100-rc.1.21458.32",
"version": "6.0.100",
"rollForward": "latestFeature"
}
}

6
services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj

@ -10,9 +10,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

6
services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj

@ -11,9 +11,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

10
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj

@ -7,14 +7,14 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

12
services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj

@ -10,12 +10,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

14
services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj

@ -6,19 +6,19 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

6
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj

@ -10,9 +10,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

10
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj

@ -7,16 +7,16 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

6
services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj

@ -10,9 +10,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

2
services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj

@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.EntityFrameworkCore\EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.AdministrationService.TestBase\EShopOnAbp.AdministrationService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

6
services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj

@ -5,9 +5,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-rc.1" />
<ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
</ItemGroup>

4
services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj

@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

4
services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

4
services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj

@ -9,11 +9,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Validation" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
</ItemGroup>

2
services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

2
services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Http.Client" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

2
services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

2
services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj

@ -9,7 +9,7 @@
<ItemGroup>
<ProjectReference Include="..\EShopOnAbp.BasketService.TestBase\EShopOnAbp.BasketService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

6
services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj

@ -19,13 +19,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="5.0.0-rc.1" />
<ProjectReference Include="..\..\src\EShopOnAbp.BasketService.HttpApi.Client\EShopOnAbp.BasketService.HttpApi.Client.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
</ItemGroup>
</Project>

6
services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj

@ -8,9 +8,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-rc.1" />
<ProjectReference Include="..\..\src\EShopOnAbp.BasketService.Domain\EShopOnAbp.BasketService.Domain.csproj" />
</ItemGroup>

4
services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj

@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

4
services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

4
services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj

@ -9,11 +9,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Validation" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
</ItemGroup>
<ItemGroup>

2
services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

4
services/catalog/src/EShopOnAbp.CatalogService.EntityFrameworkCore/EShopOnAbp.CatalogService.EntityFrameworkCore.csproj

@ -12,11 +12,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
</PackageReference>

2
services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Http.Client" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

2
services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

33
services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/Samples/SampleAppServiceTests.cs

@ -1,33 +0,0 @@
using Shouldly;
using System.Threading.Tasks;
using Volo.Abp.Identity;
using Xunit;
namespace EShopOnAbp.CatalogService.Samples
{
/* This is just an example test class.
* Normally, you don't test code of the modules you are using
* (like IIdentityUserAppService here).
* Only test your own application services.
*/
public class SampleAppServiceTests : CatalogServiceApplicationTestBase
{
private readonly IIdentityUserAppService _userAppService;
public SampleAppServiceTests()
{
_userAppService = GetRequiredService<IIdentityUserAppService>();
}
[Fact]
public async Task Initial_Data_Should_Contain_Admin_User()
{
//Act
var result = await _userAppService.GetListAsync(new GetIdentityUsersInput());
//Assert
result.TotalCount.ShouldBeGreaterThan(0);
result.Items.ShouldContain(u => u.UserName == "admin");
}
}
}

45
services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/Samples/SampleDomainTests.cs

@ -1,45 +0,0 @@
using System.Threading.Tasks;
using Shouldly;
using Volo.Abp.Identity;
using Xunit;
namespace EShopOnAbp.CatalogService.Samples
{
/* This is just an example test class.
* Normally, you don't test code of the modules you are using
* (like IdentityUserManager here).
* Only test your own domain services.
*/
public class SampleDomainTests : CatalogServiceDomainTestBase
{
private readonly IIdentityUserRepository _identityUserRepository;
private readonly IdentityUserManager _identityUserManager;
public SampleDomainTests()
{
_identityUserRepository = GetRequiredService<IIdentityUserRepository>();
_identityUserManager = GetRequiredService<IdentityUserManager>();
}
[Fact]
public async Task Should_Set_Email_Of_A_User()
{
IdentityUser adminUser;
/* Need to manually start Unit Of Work because
* FirstOrDefaultAsync should be executed while db connection / context is available.
*/
await WithUnitOfWorkAsync(async () =>
{
adminUser = await _identityUserRepository
.FindByNormalizedUserNameAsync("ADMIN");
await _identityUserManager.SetEmailAsync(adminUser, "newemail@abp.io");
await _identityUserRepository.UpdateAsync(adminUser);
});
adminUser = await _identityUserRepository.FindByNormalizedUserNameAsync("ADMIN");
adminUser.Email.ShouldBe("newemail@abp.io");
}
}
}

2
services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests.csproj

@ -10,7 +10,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.EntityFrameworkCore\EShopOnAbp.CatalogService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.CatalogService.TestBase\EShopOnAbp.CatalogService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

44
services/catalog/test/EShopOnAbp.CatalogService.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs

@ -1,44 +0,0 @@
using Microsoft.EntityFrameworkCore;
using Shouldly;
using System;
using System.Linq;
using System.Threading.Tasks;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
using Xunit;
namespace EShopOnAbp.CatalogService.EntityFrameworkCore.Samples
{
/* This is just an example test class.
* Normally, you don't test ABP framework code
* (like default AppUser repository IRepository<AppUser, Guid> here).
* Only test your custom repository methods.
*/
public class SampleRepositoryTests : CatalogServiceEntityFrameworkCoreTestBase
{
private readonly IRepository<IdentityUser, Guid> _appUserRepository;
public SampleRepositoryTests()
{
_appUserRepository = GetRequiredService<IRepository<IdentityUser, Guid>>();
}
[Fact]
public async Task Should_Query_AppUser()
{
/* Need to manually start Unit Of Work because
* FirstOrDefaultAsync should be executed while db connection / context is available.
*/
await WithUnitOfWorkAsync(async () =>
{
//Act
var adminUser = await (await _appUserRepository.GetQueryableAsync())
.Where(u => u.UserName == "admin")
.FirstOrDefaultAsync();
//Assert
adminUser.ShouldNotBeNull();
});
}
}
}

6
services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj

@ -19,13 +19,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="5.0.0-rc.1" />
<ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
</ItemGroup>
</Project>

14
services/catalog/test/EShopOnAbp.CatalogService.TestBase/CatalogServiceTestBaseModule.cs

@ -4,7 +4,6 @@ using Volo.Abp.Authorization;
using Volo.Abp.Autofac;
using Volo.Abp.BackgroundJobs;
using Volo.Abp.Data;
using Volo.Abp.IdentityServer;
using Volo.Abp.Modularity;
using Volo.Abp.Threading;
@ -18,19 +17,6 @@ namespace EShopOnAbp.CatalogService
)]
public class CatalogServiceTestBaseModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
PreConfigure<AbpIdentityServerBuilderOptions>(options =>
{
options.AddDeveloperSigningCredential = false;
});
PreConfigure<IIdentityServerBuilder>(identityServerBuilder =>
{
identityServerBuilder.AddDeveloperSigningCredential(false, System.Guid.NewGuid().ToString());
});
}
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpBackgroundJobOptions>(options =>

7
services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj

@ -8,9 +8,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="5.0.0-rc.1" />
<ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.Domain\EShopOnAbp.CatalogService.Domain.csproj" />
</ItemGroup>

4
services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj

@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

4
services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj

@ -11,8 +11,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

6
services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj

@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

4
services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj

@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

8
services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
@ -16,9 +16,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

4
services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj

@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

2
services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

4
services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj

@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.0-rc.1" />
</ItemGroup>
</Project>

2
services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj

@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\EShopOnAbp.IdentityService.EntityFrameworkCore\EShopOnAbp.IdentityService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.IdentityService.TestBase\EShopOnAbp.IdentityService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

6
services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj

@ -6,9 +6,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-rc.1" />
<ProjectReference Include="..\..\src\EShopOnAbp.IdentityService.Domain\EShopOnAbp.IdentityService.Domain.csproj" />
</ItemGroup>

4
services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-rc.1" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain.Shared\EShopOnAbp.OrderingService.Domain.Shared.csproj" />
</ItemGroup>

4
services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="5.0.0-rc.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-rc.1" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Application.Contracts\EShopOnAbp.OrderingService.Application.Contracts.csproj" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain\EShopOnAbp.OrderingService.Domain.csproj" />
</ItemGroup>

4
services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj

@ -9,11 +9,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Validation" Version="5.0.0-rc.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
</ItemGroup>
<ItemGroup>

2
services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.0.0-beta.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.0.0-rc.1" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain.Shared\EShopOnAbp.OrderingService.Domain.Shared.csproj" />
</ItemGroup>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save