Browse Source

Merge branch 'dev' into salihozkara/l

pull/17350/head
Salih 3 years ago
parent
commit
3f9292ce26
  1. 5
      abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json
  2. 99
      abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
  3. 10
      docs/en/Best-Practices/Entities.md
  4. 125
      docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/POST.md
  5. BIN
      docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-dark-login.png
  6. BIN
      docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-dark-settings.png
  7. BIN
      docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-dark-users.png
  8. BIN
      docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-toggle-demo.gif
  9. 12
      docs/en/Modules/Docs.md
  10. 80
      docs/en/UI/Angular/CapsLock.directive.md
  11. 77
      docs/en/UI/Angular/Show-Password-Directive.md
  12. BIN
      docs/en/UI/Angular/images/CapsLockDirective1.png
  13. BIN
      docs/en/UI/Angular/images/CapsLockDirective2.png
  14. BIN
      docs/en/UI/Angular/images/showPasswordDirective1.png
  15. BIN
      docs/en/UI/Angular/images/showPasswordDirective2.png
  16. 4
      docs/en/docs-nav.json
  17. 5
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
  18. 59
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
  19. 2
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs
  20. 2
      framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs
  21. 3
      framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IMayHaveCreator.cs
  22. 2
      framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs
  23. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
  24. 2
      framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj
  25. 6
      framework/src/Volo.Abp.Dapper/Volo/Abp/Domain/Repositories/Dapper/DapperRepository.cs
  26. 4
      framework/src/Volo.Abp.Dapper/Volo/Abp/Domain/Repositories/Dapper/IDapperRepository.cs
  27. 2
      framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
  28. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs
  29. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs
  30. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs
  31. 4
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs
  32. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs
  33. 4
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs
  34. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj
  35. 8
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs
  36. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs
  37. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/EntityDto.cs
  38. 8
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleAuditedEntityWithUserDto.cs
  39. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleCreationAuditedEntityWithUserDto.cs
  40. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleEntityDto.cs
  41. 12
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleFullAuditedEntityWithUserDto.cs
  42. 12
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs
  43. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ISortedResultRequest.cs
  44. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs
  45. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ListResultDto.cs
  46. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs
  47. 2
      framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj
  48. 6
      framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AbstractKeyCrudAppService.cs
  49. 6
      framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AbstractKeyReadOnlyAppService.cs
  50. 20
      framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs
  51. 2
      framework/src/Volo.Abp.Ddd.Domain.Shared/Volo.Abp.Ddd.Domain.Shared.csproj
  52. 6
      framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs
  53. 2
      framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionary.cs
  54. 4
      framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionaryItem.cs
  55. 3
      framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs
  56. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj
  57. 10
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs
  58. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs
  59. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/MultiTenantDbContextType.cs
  60. 8
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs
  61. 8
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs
  62. 4
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRootWithUser.cs
  63. 4
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntityWithUser.cs
  64. 12
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs
  65. 12
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs
  66. 12
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheBase.cs
  67. 6
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheServiceCollectionExtensions.cs
  68. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheWithObjectMapper.cs
  69. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheWithoutCacheItem.cs
  70. 3
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/IEntityCache.cs
  71. 8
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs
  72. 16
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs
  73. 7
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntitySynchronizer.cs
  74. 4
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs
  75. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs
  76. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityEventData.cs
  77. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntity.cs
  78. 6
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/BasicRepositoryBase.cs
  79. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IReadOnlyBasicRepository.cs
  80. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs
  81. 12
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryAsyncExtensions.cs
  82. 8
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryBase.cs
  83. 8
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs
  84. 4
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs
  85. 6
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs
  86. 2
      framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj
  87. 3
      framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/IAbpDistributedLock.cs
  88. 2
      framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/LocalAbpDistributedLock.cs
  89. 2
      framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.csproj
  90. 2
      framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/AbpDistributedLockDaprOptions.cs
  91. 2
      framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/DaprAbpDistributedLock.cs
  92. 2
      framework/src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.csproj
  93. 2
      framework/src/Volo.Abp.DistributedLocking/Volo/Abp/DistributedLocking/MedallionAbpDistributedLock.cs
  94. 8
      framework/src/Volo.Abp.Threading/Volo/Abp/Linq/AsyncQueryableExecuter.cs
  95. 8
      framework/src/Volo.Abp.Threading/Volo/Abp/Linq/IAsyncQueryableExecuter.cs
  96. 8
      framework/src/Volo.Abp.Threading/Volo/Abp/Linq/IAsyncQueryableProvider.cs
  97. 2
      latest-versions.json
  98. 6
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
  99. 2622
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
  100. 4
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json

5
abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json

@ -218,7 +218,8 @@
"DetailedChangeNotes" : "Detailed Change Notes",
"SeeTrainings": "See Trainings",
"NoContent": "No content",
"ABPStudioBeta": "ABP Studio <span class=\"badge border rounded fw--5\" style=\"border-color: #B84297 !important;\">BETA</span>",
"More": "More"
"More": "More",
"WhyABPIOPlatform": "Why ABP.IO Platform",
"AbpStudio": "ABP Studio"
}
}

99
abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@ -600,7 +600,7 @@
"TotalDeveloperPrice": "Total Developer Price",
"Purchase_PricePerDeveloper": "<span>{0} {1}</span> per developer",
"Purchase_IncludedDeveloperInfo": "{0} {1} included.",
"Purchase_LicenseExtraDeveloperPurchaseMessage": "The <span class=\"fw-6\">{0} license</span> contains {1} developer(s). You can add additional developers now or later.",
"Purchase_LicenseExtraDeveloperPurchaseMessage": "The <span class=\"fw-bold\">{0} License</span> includes {1} developers. You can add additional developers.",
"StartupTemplates_Page_Title": "ABP Startup Templates",
"StartupTemplates_Page_Description": "ABP Commercial allows you to build solutions with any level of complexity. It provides two main pre-built startup solutions. You can select the one close to your requirements and build your own custom solution on top of it.",
"MicroserviceStartupSolutionForDotnet": "Microservice Startup Solution for .NET",
@ -907,8 +907,12 @@
"ExtraQuestionCreditsFaqExplanation": "Yes, you can. To buy extra question credits, send an e-mail to <a href=\"mailto:info@abp.io\">info@abp.io</a> with your organization's name. Here's the price list for the extra question credits: <ul><li>50 questions pack $999</li><li>25 questions pack $625</li><li>15 questions pack $450</li></ul>",
"AlreadyBetaTester": "You have already joined the beta tester program.",
"AbpStudio": "ABP Studio",
"AbpStudio_Description": "ABP Studio is still under development. You can fill out the form below to be one of the first users.",
"AbpStudio_Description1": "ABP Studio is a <span class=\"text-highlight-white\">cross-platform desktop application</span> for ABP developers.",
"AbpStudio_Description2": "It is <span class=\"text-highlight-white\">well integrated</span> to the ABP Framework and aims to provide a comfortable development environment for you by <span class=\"text-highlight-white\">automating things, providing insights</span> about your solution, making <span class=\"text-highlight-white\">develop, run</span> and <span class=\"text-highlight-white\">deploy</span> your solutions much easier.",
"AbpStudio_ComingSoon": "Coming Soon <span class=\"opacity-50 ms-0 ms-md-3 d-block d-md-inline-block \">Planned beta release date: Q4 of 2023.</span>",
"AbpStudio_PlannedPreviewDate": "Planned preview release date: Q4 of 2023.",
"BetaRequest": "Beta Request",
"CreateNewSolutions": "Create New Solutions",
"CreateNewSolutions_Description1": "You can create from simple applications to modular monolith or microservice solutions easily with a lot of options. You get a full production-ready base software solution for your business.",
"ArchitectYourSolutions": "Architect Your Solutions",
@ -963,6 +967,97 @@
"OneCodeBaseMultipleDevices": "One Code-Base Multiple Devices",
"OneCodeBaseMultipleDevices_Description": "ABP Mobile applications are cross-platform. They are ready to be installed and run on iOS and Android devices, and they adapt to different form-factors using a single code base. Developers only need to create the UI and front-end code once, there is no need to adapt the code for each device you want to support.",
"ComesWithTheSourceCode": "Comes with the Source-Code",
"ComesWithTheSourceCode_Description": "The mobile apps are provided with the source-code. Easily customize the UX/UI of your apps to meet branding guidelines."
"ComesWithTheSourceCode_Description": "The mobile apps are provided with the source-code. Easily customize the UX/UI of your apps to meet branding guidelines.",
"Purchase_OneYearPrice": "1 Year Price",
"Purchase_DeveloperSeatCount": "Developer Seat Count",
"Purchase_DevelopersAlreadyIncluded": "{0} developers already included",
"1Year": "1 year",
"{0}Years": "{0} years",
"1YearLicense": "1 year license",
"{0}YearsLicense": "{0} years license",
"1AdditionalDeveloper": "1 additional developer",
"{0}AdditionalDevelopers": "{0} additional developers",
"Discount": "Discount ({0}%)",
"Summary": "Summary",
"TrainingPack": "Training pack",
"TrainingPackDiscount": "Training pack discount",
"Purchase_OnboardingTraining_Description": "This live training package is discounted when purchase with the new license. This discounted price is valid only for new license purchases. <a href=\"{0}\" class=\"text-white\">Learn more <i class=\"fa fa-external-link ms-1\"></i></a>",
"Purchase_Save": "{0}% <span class=\"save ms-1\">Save {1} {2}</span>",
"RemoveBasket": "Remove from basket",
"WhyABPIOPlatform?": "Why <span class=\"gradient-commercial\">ABP.IO Platform</span>?",
"DocumentAim": "This document aims to answer the big question:",
"DocumentAim_Description": "\"Why should you use the ABP.IO Platform instead of creating a new solution from scratch?\"",
"DocumentAim_Description2": "The document introduces the challenges of building a modern software solution and explains how ABP addresses these challenges.",
"CreatingANewSolution": "Creating a New Solution",
"CreatingANewSolution_Description": "When you need to start a new solution, there are a lot of questions you need to ask yourself, and you should spend a lot of time before starting to write your very first business code.",
"CreatingAnEmptySolution": "Creating an Empty Solution",
"THEPROBLEM": "THE PROBLEM",
"CreatingAnEmptySolution_THEPROBLEM_Description": "Even creating an almost-empty solution is challenging;",
"CreatingAnEmptySolution_THEPROBLEM_Description2": "How do you organize your codebase across projects?",
"CreatingAnEmptySolution_THEPROBLEM_Description3": "What are the layers and how do they interact?",
"CreatingAnEmptySolution_THEPROBLEM_Description4": "How do you integrate to 3rd-party library and systems?",
"CreatingAnEmptySolution_THEPROBLEM_Description5": "How to set up the automated tests?",
"ABPSOLUTION": "ABP SOLUTION",
"CreatingAnEmptySolution_ABPSOLUTION_Description": "ABP provides a well-architected, layered and production-ready <span class=\"text-info\">startup solution</span> based on the <span class=\"text-info\">Domain Driven Design</span> principles. The solution also includes a pre-configured unit and integration <span class=\"text-info\">test</span> projects for each layer.",
"CommonLibraries": "Common Libraries",
"CommonLibraries_THEPROBLEM_Description": "Which libraries should you use to implement common requirements? The software development ecosystem is highly dynamic and it is hard to follow the latest tools, libraries, trends and approaches.",
"CommonLibraries_ABPSOLUTION_Description": "ABP pre-integrates the popular, mature and up-to-date libraries into the solution. You don't spend time integrating them and talking to each other. They properly work out of the box.",
"UITheme&Layout": "UI Theme & Layout",
"UITheme&Layout_THEPROBLEM_Description": "When it comes to the UI, there are a lot of challenges, including preparing a foundation to create a responsive, modern and flexible UI kit with a consistent look & feel and tons of features (like left/top navigation menu, header, toolbar, footer, widgets and so.).",
"UITheme&Layout_THEPROBLEM_Description2": "Even if you buy a pre-built theme, integrating it into your solution may take days of development. Upgrading such a theme is another problem. Most of the time, the theme's HTML/CSS structure is mixed with your UI code, and it is not easy to upgrade or change the theme later.",
"UITheme&Layout_ABPSOLUTION_Description": "ABP Framework provides a <span class=\"text-info\"> theming</span> system that makes your UI code independent from the theme. Themes are isolated, and they are NuGet/NPM packages. Installing or upgrading a theme is just a minute. While you can build your theme (or integrate an existing theme), ABP Commercial offers professional and modern themes.There are also UI component providers (like Telerik and DevExpress). But they only provide individual components. You are responsible for creating your own layout system. You can use such libraries in your ABP-based solutions just like in any other project.",
"TestInfrastructure": "Test Infrastructure",
"TestInfrastructure_THEPROBLEM_Description": "Which libraries should you use to implement common requirements? The software development ecosystem is highly dynamic and it is hard to follow the latest tools, libraries, trends and approaches.",
"TestInfrastructure_ABPSOLUTION_Description": "ABP Startup Templates comes with the test projects already configured for you, and you can immediately write your first unit or integration test code on day 1. Writing unit tests is very clear with the ABP Framework; see how to write tests.",
"CodingStandards&Training": "Coding Standards & Training",
"CodingStandards&Training_THEPROBLEM_Description": "Once you create the development-ready solution, you typically need to train the developers to explain the system and develop it with the same conventions in a standard and consistent way. Even if you train the developers, it is hard to prepare and maintain your documentation. Over time, every developer will write the code differently, and coding standards will begin to diverge.",
"CodingStandards&Training_ABPSOLUTION_Description": "ABP solution is already well-defined and well-documented. <span class=\"text-info\">Tutorials</span> and best practice guides clearly explain how to make development on an ABP project.",
"KeepingYourSolutionUpToDate": "Keeping Your Solution Up to Date",
"KeepingYourSolutionUpToDate_THEPROBLEM_Description": "After you start your development, you must keep track of the new versions of the libraries you use for upgrades & patches. We regularly update all packages to the latest versions and test them before the stable release. When you update the ABP Framework, all its dependencies are upgraded to edge technology.",
"KeepingYourSolutionUpToDate_ABPSOLUTION_Description": "<span class=\"text-primary\">Abp update</span> <span class=\"text-info\">CLI </span> command automatically discovers and upgrades all ABP-dependant NuGet and NPM packages in a solution. With ABP, it is easier to stay with the latest versions.",
"DRY": "Don't Repeat Yourself!",
"DRY_Description": "Creating a base solution takes significant time and requires well architectural experience. However, this is just the beginning! As you start developing, you will likely have to write lots of repetitive code; that would be great if all this could be handled automatically.",
"DRY_Description2": "ABP automates and simplifies repeating code as much as possible by following the convention over configuration principle. However, it doesn't restrict you when you need to switch to manual gear. The control is always in your hands.",
"Authentication": "Authentication",
"Authentication_THEPROBLEM_Description": "Single Sign On, Active Directory / LDAP Integration, OpenIddict integration, social logins, two-factor authentication, forgot/reset password, email activation, new user registration, password complexity control, locking account on failed attempts, showing failed login attemps ... etc. We know that all these generic requirements are familiar to you. You are not alone!",
"Authentication_ABPSOLUTION_Description": "ABP Framework and the commercial version provide all these standard stuff pre-implemented for you as a re-usable account module. You just enable and configure what you need.",
"CrossCuttingConcerns": "Cross-Cutting Concerns",
"CrossCuttingConcerns_THEPROBLEM_Description": "Cross-Cutting Concerns are the fundamental repeating logic that should be implementedfor each use case. Some examples;",
"CrossCuttingConcerns_ABPSOLUTION_Description": "ABP Framework automates or simplifies all the common cross-cutting concerns. You only write code that matters for your business and ABP handles the rest by conventions.",
"ArchitecturalInfrastructure": "Architectural Infrastructure",
"ArchitecturalInfrastructure_THEPROBLEM_Description": "You typically need to build infrastructure to implement your architecture properly. For example, you generally implement the Repository pattern. You define some base classes to simplify and standardize to create entities, services, controllers and other objects.",
"ArchitecturalInfrastructure_ABPSOLUTION_Description": "ABP Framework provides all these and more out of the box. It is mature and well-documented.",
"EnterpriseApplicationRequirements": "Enterprise Application Requirements",
"EnterpriseApplicationRequirements_THEPROBLEM_Description": "There are a lot of requirements you repeatedly implement in every business application;",
"EnterpriseApplicationRequirements_ABPSOLUTION_Description": "There is much more. ABP provides infrastructure to implement such requirements easily. Again, you don't spend your valuable time to re-implement all these again and again.",
"GeneratingInitialCode&Tooling": "Generating Initial Code & Tooling",
"GeneratingInitialCode&Tooling_THEPROBLEM_Description": "<span class=\"text-info text-underline\">ABP Suite</span> can generate a full-stack CRUD page for your entities in seconds. The generated code is layered and clean. All the standard validation and authorization requirements are implemented. Plus, unit test classes are generated. Once you get a fully running page, you can modify it according to your business requirements.",
"GeneratingInitialCode&Tooling_ABPSOLUTION_Description": "ABP Framework provides all these and more out of the box. It is mature and well-documented.",
"IntegratingTo3rdPartyLibrariesAndSystems": "Integrating to 3rd-Party Libraries and Systems",
"IntegratingTo3rdPartyLibrariesAndSystems_THEPROBLEM_Description": "Most libraries are designed as low level, and you typically do some work to integrate them properly without repeating the same integration and configuration code everywhere in your solution. For example, assume you must use RabbitMQ to implement your distributed event bus. All you want to do is; send a message to a queue and handle the incoming messages. But you need to understand messaging patterns, queue and exchange details. To write an efficient code, you must create a pool to manage connections, clients and channels. You also must deal with exceptions, ACK messages, re-connecting to RabbitMQ on failures and more.",
"IntegratingTo3rdPartyLibrariesAndSystems_ABPSOLUTION_Description": "ABP's RabbitMQ Distributed Event Bus integration abstracts all these details. You send and receive messages without the hustle and bustle. Do you need to write low-level code? No problem, you can always do that. ABP doesn't restrict you when you need to use low-level features of the library you are using.",
"WhyNotBuildYourOwnFramework?": "Why Not Build Your Own Framework?",
"WhyNotBuildYourOwnFramework_THEPROBLEM_Description": "All the infrastructure, even in the most simple way, takes a lot of time to build, maintain and document. It gets bigger over time, and it becomes hard to maintain it in your solution. Separating these into a re-usable project is the starting point for building your own internal framework.",
"WhyNotBuildYourOwnFramework_ABPSOLUTION_Description": "Building, documenting, training and maintaining an internal framework is really hard. If you don't have an experienced, dedicated framework team, your internal framework rapidly becomes an undocumented legacy code that no one can understand and maintain anymore. On the other hand, these frameworks are generally developed by one or two developers in the team. And these fellows are becoming a knowledge silo. It is good for them but bad for the company because they are the project's single point of failure -SPOF-. Once they leave the company, the project dramatically goes down.",
"TonsOfFeatures": "Tons of Features",
"TonesOfFeatures_Description": "Tag helpers, dynamic forms, BLOB storing system and many other ABP features help you keep DRY (don't repeat yourself) and focus on your business.",
"ArchitecturalInfrastructure_Description": "SaaS applications, modular or microservice systems are most used enterprise software models. Building such systems not only requires a good understanding and experience, but also requires a strong software infrastructure. Otherwise, you will find yourself spending a great effort to support these architectural details in your codebase.",
"Modularity": "Modularity",
"Modularity_THEPROBLEM_Description": "Building a truly modular system is not easy! All the aspects of the system (database, entities, APIs, UI pages/components) can be split into modules, and each module can be re-usable without others. The plain ASP.NET Core doesn't provide such a modular architecture. If you need it, you should think about it from scratch.",
"Modularity_ABPSOLUTION_Description": "The ABP Framework is born to be a modular application development structure. Every feature in the framework is developed to be compatible with modularity. Documentation and guides explain how to develop re-usable modules in a standard way.",
"SaaSMultiTenancy": "SaaS / Multi-Tenancy",
"SaaSMultiTenancy_THEPROBLEM_Description": "<span class=\"text-info text-underline\">Multi-Tenancy</span> is a common way to implement SaaS systems. However, implementing a consistent multi-tenant infrastructure may become complicated.",
"SaaSMultiTenancy_ABPSOLUTION_Description": "ABP Framework provides a complete multi-tenant infrastructure and abstract complexity from your business code. Your application code will be mostly multi-tenancy aware while the ABP Framework automatically isolates the database, cache and other details of the tenants from each other. It supports single database, per tenant database and hybrid approaches. It properly configures the libraries like Microsoft Identity, IdentityServer, OpenIddict, which are not normally multi-tenancy compatible.",
"Microservices": "Microservices",
"Microservices_THEPROBLEM_Description": "Building a microservice system requires many infrastructure details: Authenticating and authorizing applications and microservices and implementing asynchronous messaging and synchronous (Rest/GRPC) communication patterns between microservices are the most fundamental issues.",
"Microservices_ABPSOLUTION_Description": "The ABP Framework provides services, guides, and samples to help you implement your microservice solution using the industry standard tools. ABP Commercial even goes one step further and provides a complete startup template to kick-start your microservice solution.",
"PreBuiltModules": "Pre-Built Modules",
"PreBuiltModules_THEPROBLEM_Description": "All of us have similar but slightly different business requirements. However, we all should re-invent the wheel since no one's code can directly work in our solution. They are all embedded parts of a larger solution.",
"PreBuiltModules_ABPSOLUTION_Description":"ABP Commercial <span class=\"text-info\">modules</span> provides a lot of re-usable application modules like payment, chat, file management, audit log reporting... etc. All of these modules are easily installed into your solution and directly work. We are constantly adding more modules.",
"PreBuiltModules_ABPSOLUTION_Description2": "All modules are designed as customizable for your business requirements. If you need complete control, you can download the full source code of any module and completely customize based on your specific business requirements.",
"ABPCommunity": "ABP Community",
"ABPCommunity_Description": "Being in a big community where everyone follows similar coding styles and principles and shares a common infrastructure brings power when you have troubles or need help with design decisions. Since we write code similarly, we can help each other much better. ABP is a community-backed project with almost 10K stars on GitHub.",
"ABPCommunity_Description2": "It is easy to share code or even re-usable libraries between ABP developers. A code snippet that works for you will also work for others. There are a lot of samples and tutorials that you can directly implement for your application.",
"ABPCommunity_Description3": "When you hire a developer who worked before with the ABP architecture will immediately understand your solution and start development in a very short time."
}
}

10
docs/en/Best-Practices/Entities.md

@ -28,6 +28,7 @@ Every aggregate root is also an entity. So, these rules are valid for aggregate
- **Do** keep the entity as always **valid** and **consistent** within its own boundary.
- **Do** define properties with `private`, `protected`, `internal ` or `protected internal` setter where it is needed to protect the entity consistency and validity.
- **Do** define `public `, `internal` or `protected internal` (virtual) **methods** to change the properties (with non-public setters) if necessary.
- **Do** return the entity object (`this`) from the setter methods.
### Aggregate Roots
@ -86,15 +87,16 @@ public class Issue : FullAuditedAggregateRoot<Guid> //Using Guid as the key/iden
Labels = new Collection<IssueLabel>(); //Always initialize the collection
}
public virtual void SetTitle([NotNull] string title)
public virtual Issue SetTitle([NotNull] string title)
{
Title = Check.NotNullOrWhiteSpace(title, nameof(title)); //Validate
return this;
}
/* AddLabel & RemoveLabel methods manages the Labels collection
* in a safe way (prevents adding the same label twice) */
public virtual void AddLabel(Guid labelId)
public virtual Issue AddLabel(Guid labelId)
{
if (Labels.Any(l => l.LabelId == labelId))
{
@ -102,11 +104,13 @@ public class Issue : FullAuditedAggregateRoot<Guid> //Using Guid as the key/iden
}
Labels.Add(new IssueLabel(Id, labelId));
return this;
}
public virtual void RemoveLabel(Guid labelId)
public virtual Issue RemoveLabel(Guid labelId)
{
Labels.RemoveAll(l => l.LabelId == labelId);
return this;
}
/* Close & ReOpen methods protect the consistency

125
docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/POST.md

@ -0,0 +1,125 @@
# Adding Dark Mode Support to the Basic Theme
Basic Theme uses plain bootstrap and does not have any custom colors & styles. This article will show you how to add dark mode support to the [Basic Theme](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Basic-Theme).
Bootstrap brings the [Color Modes](https://getbootstrap.com/docs/5.3/customize/color-modes/#dark-mode) feature with version **5.3**. This feature allows you to add dark mode support to your website with a single line of code. Adding the `data-bs-theme="dark"` attribute changes the color mode of the element to dark mode.
## Instructions
1. Create a new project with the following command:
```bash
abp new BasicThemeDarkMode -t app --theme basic
```
2. Create a component that toggles the color mode.
- Create a new file named `Components/ChangeTheme/Default.cshtml`:
```html
<div class="text-light mt-1">
<button class="btn text-light" href="#" id="ToolbarChangeTheme">
<i class="fas fa-sun"></i>
</button>
</div>
```
- Create a new file named `Components/ChangeTheme/ChangeThemeViewComponent.cs`:
```csharp
using Microsoft.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc;
namespace BasicThemeDarkMode.Web.Components.ChangeTheme;
[Widget(ScriptFiles = new[]{"/Components/ChangeTheme/ChangeTheme.js"})]
public class ChangeThemeViewComponent : AbpViewComponent
{
public IViewComponentResult Invoke()
{
return View("~/Components/ChangeTheme/Default.cshtml");
}
}
```
- Create a JavaScript that manages the last selected theme and toggles the color mode. It stores the last selected theme in the *local storage*. So, you don't need to store it in the database.
- Create a new file named `Components/ChangeTheme/ChangeTheme.js`:
```js
$(function () {
function changeTheme(theme) {
window.localStorage.setItem('theme', theme);
document.getElementsByTagName('body')[0].setAttribute('data-bs-theme', theme);
}
function toggleTheme(){
getTheme() == 'light' ? changeTheme('dark') : changeTheme('light');
}
function getTheme(){
return window.localStorage.getItem('theme') ?? 'dark';
}
function init(){
let theme = getTheme();
if(theme){
changeTheme(theme);
}
}
document.getElementById('ToolbarChangeTheme').addEventListener('click', () => {
toggleTheme();
});
init();
});
```
3. Create a new [Toolbar Contributor](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Toolbars) and add a newly created view component to the application toolbar.
- Create a new class named `BasicThemeDarkModeToolbarContributor.cs`:
```csharp
using BasicThemeDarkMode.Web.Components.ChangeTheme;
using System.Threading.Tasks;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
namespace BasicThemeDarkMode.Web;
public class BasicThemeDarkModeToolbarContributor : IToolbarContributor
{
public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
{
if (context.Toolbar.Name == StandardToolbars.Main)
{
context.Toolbar.Items
.Add(new ToolbarItem(typeof(ChangeThemeViewComponent)));
}
return Task.CompletedTask;
}
}
```
- Configure [Toolbar Options](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Toolbars) and add a newly created contributor:
```csharp
Configure<AbpToolbarOptions>(options =>
{
options.Contributors.Add(new BasicThemeDarkModeToolbarContributor());
});
```
That's it! Now, you can toggle the color mode by clicking the sun icon in the toolbar:
![Dark Mode](basictheme-toggle-demo.gif)
- Users Page in Dark Mode:
![Users Page in Dark Mode](basictheme-dark-users.png)
- Settings Page in Dark Mode:
![Settings Page in Dark Mode](basictheme-dark-settings.png)
- Login Page in Dark Mode:
![Login Page in Dark Mode](basictheme-dark-login.png)
## Conclusion
The theme is stored in **local storage** and it's initialized on the client-side. You can use **Cookies** to render the page in the last selected theme on **server-side** to prevent the flash effect while navigating pages. This document shows the concept of adding dark mode support of bootstrap to the Basic Theme.

BIN
docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-dark-login.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-dark-settings.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-dark-users.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
docs/en/Community-Articles/2023-08-07-Basic-Theme-Dark-Mode/basictheme-toggle-demo.gif

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 KiB

12
docs/en/Modules/Docs.md

@ -22,22 +22,16 @@ When you use GitHub to store your docs, Docs Module supports versioning. If you
## Installation
### 1- Download
This document covers `Entity Framework Core` provider but you can also select `MongoDB` as your database provider.
If you do not have an existing ABP project, this step shows you how to create a new project from [abp.io](https://abp.io) to add the Docs Module. If you already have an ABP project, you can skip this step.
### 1- Creating an application
It is recommended to use ABP CLI to create new projects. Use the following command:
If you do not have an existing ABP project, you can either [generate a CLI command from the get started page of the abp.io website](https://abp.io/get-started) and runs it or run the command below:
```bash
abp new Acme.MyProject
```
You can also generate a CLI command from [get started page](https://abp.io/get-started). Enter your project name as `Acme.MyProject`, other use default options.
Note that this document covers `Entity Framework Core` provider but you can also select `MongoDB` as your database provider.
![Create new project](../images/docs-module_download-new-abp-project.png)
### 2- Running The Empty Application
After you download the project, extract the ZIP file and open `Acme.MyProject.sln`. You will see that the solution consists of `Application`, `Application.Contracts`, `DbMigrator`, `Domain`, `Domain.Shared`, `EntityFrameworkCore`, `HttpApi`, `HttpApi.Client` and `Web` projects. Right click on `Acme.MyProject.Web` project and **Set as StartUp Project**.

80
docs/en/UI/Angular/CapsLock.directive.md

@ -0,0 +1,80 @@
# Caps Lock Directive
In password inputs, You may want to show if Caps Lock is on. To make this even easier, you can use the `TrackCapsLockDirective` which has been exposed by the `@abp/ng.core` package.
## Getting Started
`TrackCapsLockDirective` is standalone. In order to use the `TrackCapsLockDirective` in an HTML template, import it to related module or your standalone component:
**Importing to NgModule**
```ts
import { TrackCapsLockDirective } from '@abp/ng.core';
@NgModule({
//...
declarations: [
...,
TestComponent
],
imports: [
...,
TrackCapsLockDirective
],
})
export class MyFeatureModule {}
```
## Usage
The `TrackCapsLockDirective` is very easy to use. The directive's selector is **`abpCapsLock`**. By adding the `abpCapsLock` event to an element, you can track the status of Caps Lock. You can use this to warn user.
See an example usage:
**NgModule Component usage**
```ts
@Component({
selector: 'test-component',
template: `
<div class="d-flex flex-column">
<label>Password</label>
<input (abpCapsLock)="capsLock = $event"/>
<i *ngIf="capsLock">icon</i>
</div>
`
})
export class TestComponent{
capsLock = false;
}
```
**Standalone Component usage**
```ts
import { TrackCapsLockDirective } from '@abp/ng.core'
@Component({
selector: 'standalone-component',
standalone: true,
template: `
<div class="d-flex flex-column">
<label>Password</label>
<input (abpCapsLock)="capsLock = $event"/>
<i *ngIf="capsLock">icon</i>
</div>
`,
imports: [TrackCapsLockDirective]
})
export class StandaloneComponent{
capsLock = false;
}
```
The `abpCapsLock` event has been added to the `<input>` element. Press Caps Lock to activate the `TrackCapsLockDirective`.
See the result:
![Show Password directive](./images/CapsLockDirective1.png)
To see Caps Lock icon press Caps Lock.
![Show Password directive](./images/CapsLockDirective2.png)

77
docs/en/UI/Angular/Show-Password-Directive.md

@ -0,0 +1,77 @@
# Show Password Directive
In password input, text can be shown easily via changing input type attribute to `text`. To make this even easier, you can use the `ShowPasswordDirective` which has been exposed by the `@abp/ng.core` package.
## Getting Started
`ShowPasswordDirective` is standalone. In order to use the `ShowPasswordDirective` in an HTML template, import it to related module or your standalone component:
**Importing to NgModule**
```ts
import { ShowPasswordDirective } from '@abp/ng.core';
@NgModule({
//...
declarations: [
...,
TestComponent
],
imports: [
...,
ShowPasswordDirective
],
})
export class MyFeatureModule {}
```
## Usage
The `ShowPasswordDirective` is very easy to use. The directive's selector is **`abpShowPassword`**. By adding the `abpShowPassword` attribute to an input element, you can activate the `ShowPasswordDirective` for the input element.
See an example usage:
**NgModule Component usage**
```ts
@Component({
selector: 'test-component',
template: `
<div class="d-flex flex-column">
<label>Password</label>
<input [abpShowPassword]="showPassword"/>
<i (click)="showPassword = !showPassword">icon</i>
</div>
`
})
export class TestComponent{
showPassword = false;
}
```
**Standalone Component usage**
```ts
import { ShowPasswordDirective } from '@abp/ng.core';
@Component({
selector: 'standalone-component',
standalone: true,
template: `
<div class="d-flex flex-column">
<label>Password</label>
<input [abpShowPassword]="showPassword"/>
<i (click)="showPassword = !showPassword">icon</i>
</div>
`,
imports: [ShowPasswordDirective]
})
export class StandaloneComponent{
showPassword = false;
}
```
The `abpShowPassword` attribute has been added to the `<input>` element. Click icon to activate the `ShowPasswordDirective`.
See the result:
![Show Password directive](./images/showPasswordDirective1.png)
To see password input click icon.
![Show Password directive](./images/showPasswordDirective2.png)

BIN
docs/en/UI/Angular/images/CapsLockDirective1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
docs/en/UI/Angular/images/CapsLockDirective2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
docs/en/UI/Angular/images/showPasswordDirective1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
docs/en/UI/Angular/images/showPasswordDirective2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

4
docs/en/docs-nav.json

@ -1522,6 +1522,10 @@
}
]
},
{
"text": "API Documentation",
"path": "{ApiDocumentationUrl}"
},
{
"text": "Contribution Guide",
"path": "Contribution/Index.md"

5
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs

@ -227,10 +227,9 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
var attribute = TagHelper.AspFor.ModelExplorer.GetAttribute<Placeholder>();
if (attribute != null)
if (attribute != null || TagHelper.FloatingLabel)
{
var placeholderLocalized = _tagHelperLocalizer.GetLocalizedText(attribute.Value, TagHelper.AspFor.ModelExplorer);
var placeholderLocalized = _tagHelperLocalizer.GetLocalizedText(attribute?.Value ?? TagHelper.AspFor.Name, TagHelper.AspFor.ModelExplorer);
inputTagHelperOutput.Attributes.Add("placeholder", placeholderLocalized);
}
}

59
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs

@ -1,15 +1,14 @@
using Microsoft.AspNetCore.Mvc.Diagnostics;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Localization;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
using Volo.Abp.Localization;
@ -38,7 +37,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
_abpEnumLocalizer = abpEnumLocalizer;
}
public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
{
var childContent = await output.GetChildContentAsync();
@ -74,7 +73,8 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
var validation = await GetValidationAsHtmlAsync(context, output, selectTag);
var infoText = GetInfoAsHtml(context, output, selectTag);
return label + Environment.NewLine + selectAsHtml + Environment.NewLine + infoText + Environment.NewLine + validation;
return TagHelper.FloatingLabel ? selectAsHtml + Environment.NewLine + label + Environment.NewLine + infoText + Environment.NewLine + validation :
label + Environment.NewLine + selectAsHtml + Environment.NewLine + infoText + Environment.NewLine + validation;
}
protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml)
@ -156,23 +156,15 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
}
var selectItemsAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<SelectItems>();
if (selectItemsAttribute != null)
{
return GetSelectItemsFromAttribute(selectItemsAttribute, TagHelper.AspFor.ModelExplorer);
}
throw new Exception("No items provided for select attribute.");
return selectItemsAttribute != null
? GetSelectItemsFromAttribute(selectItemsAttribute, TagHelper.AspFor.ModelExplorer)
: throw new Exception("No items provided for select attribute.");
}
private bool IsEnum()
{
var value = TagHelper.AspFor.Model;
if (value != null && value.GetType().IsEnum)
{
return true;
}
return TagHelper.AspFor.ModelExplorer.Metadata.IsEnum;
return (value != null && value.GetType().IsEnum) || TagHelper.AspFor.ModelExplorer.Metadata.IsEnum;
}
protected virtual async Task<string> GetLabelAsHtmlAsync(TagHelperContext context, TagHelperOutput output, TagHelperOutput selectTag)
@ -296,12 +288,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
{
var selectItems = selectItemsAttribute.GetItems(explorer)?.ToList();
if (selectItems == null)
{
return new List<SelectListItem>();
}
return selectItems;
return selectItems ?? new List<SelectListItem>();
}
protected virtual async Task<string> GetLabelAsHtmlUsingTagHelperAsync(TagHelperContext context, TagHelperOutput output)
@ -337,17 +324,13 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
TagHelper.Size = attribute.Size;
}
switch (TagHelper.Size)
return TagHelper.Size switch
{
case AbpFormControlSize.Small:
return "form-select-sm";
case AbpFormControlSize.Medium:
return "form-select-md";
case AbpFormControlSize.Large:
return "form-select-lg";
}
return "";
AbpFormControlSize.Small => "form-select-sm",
AbpFormControlSize.Medium => "form-select-md",
AbpFormControlSize.Large => "form-select-lg",
_ => "",
};
}
protected virtual TagHelperAttributeList GetInputAttributes(TagHelperContext context, TagHelperOutput output)
@ -376,7 +359,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
foreach (var tagHelperAttribute in tagHelperAttributes)
{
var nameWithoutPrefix = tagHelperAttribute.Name.Substring(groupPrefix.Length);
var nameWithoutPrefix = tagHelperAttribute.Name[groupPrefix.Length..];
var newAttritube = new TagHelperAttribute(nameWithoutPrefix, tagHelperAttribute.Value);
output.Attributes.Add(newAttritube);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs

@ -83,7 +83,7 @@ public class AbpExceptionPageFilter : IAsyncPageFilter, ITransientDependency
remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
var logger = context.GetService<ILogger<AbpExceptionFilter>>(NullLogger<AbpExceptionFilter>.Instance)!;
var logger = context.GetService<ILogger<AbpExceptionPageFilter>>(NullLogger<AbpExceptionPageFilter>.Instance)!;
logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
logger.LogException(context.Exception!, logLevel);

2
framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs

@ -22,5 +22,5 @@ public interface IDeletionAuditedObject<TUser> : IDeletionAuditedObject
/// <summary>
/// Reference to the deleter user.
/// </summary>
TUser Deleter { get; }
TUser? Deleter { get; }
}

3
framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IMayHaveCreator.cs

@ -8,8 +8,7 @@ public interface IMayHaveCreator<TCreator>
/// <summary>
/// Reference to the creator.
/// </summary>
[CanBeNull]
TCreator Creator { get; }
TCreator? Creator { get; }
}
/// <summary>

2
framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs

@ -22,5 +22,5 @@ public interface IModificationAuditedObject<TUser> : IModificationAuditedObject
/// <summary>
/// Reference to the last modifier user of this entity.
/// </summary>
TUser LastModifier { get; }
TUser? LastModifier { get; }
}

2
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor

@ -9,7 +9,7 @@
<Autocomplete Data="@lookupItems"
TItem="SelectItem<object>"
TValue="object"
TextField="item => item?.Text"
TextField="item => item?.Text!"
ValueField="item => item?.Value"
SelectedValue="@SelectedValue"
SelectedValueChanged="@SelectedValueChanged"

2
framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.Dapper</AssemblyName>
<PackageId>Volo.Abp.Dapper</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

6
framework/src/Volo.Abp.Dapper/Volo/Abp/Domain/Repositories/Dapper/DapperRepository.cs

@ -16,7 +16,7 @@ namespace Volo.Abp.Domain.Repositories.Dapper;
public class DapperRepository<TDbContext> : IDapperRepository, IUnitOfWorkEnabled
where TDbContext : IEfCoreDbContext
{
public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
public IAbpLazyServiceProvider LazyServiceProvider { get; set; } = default!;
public IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
@ -39,9 +39,9 @@ public class DapperRepository<TDbContext> : IDapperRepository, IUnitOfWorkEnable
public virtual async Task<IDbConnection> GetDbConnectionAsync() => (await _dbContextProvider.GetDbContextAsync()).Database.GetDbConnection();
[Obsolete("Use GetDbTransactionAsync method.")]
public IDbTransaction DbTransaction => _dbContextProvider.GetDbContext().Database.CurrentTransaction?.GetDbTransaction();
public IDbTransaction? DbTransaction => _dbContextProvider.GetDbContext().Database.CurrentTransaction?.GetDbTransaction();
public virtual async Task<IDbTransaction> GetDbTransactionAsync() => (await _dbContextProvider.GetDbContextAsync()).Database.CurrentTransaction?.GetDbTransaction();
public virtual async Task<IDbTransaction?> GetDbTransactionAsync() => (await _dbContextProvider.GetDbContextAsync()).Database.CurrentTransaction?.GetDbTransaction();
protected virtual CancellationToken GetCancellationToken(CancellationToken preferredValue = default)
{

4
framework/src/Volo.Abp.Dapper/Volo/Abp/Domain/Repositories/Dapper/IDapperRepository.cs

@ -12,7 +12,7 @@ public interface IDapperRepository
Task<IDbConnection> GetDbConnectionAsync();
[Obsolete("Use GetDbTransactionAsync method.")]
IDbTransaction DbTransaction { get; }
IDbTransaction? DbTransaction { get; }
Task<IDbTransaction> GetDbTransactionAsync();
Task<IDbTransaction?> GetDbTransactionAsync();
}

2
framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<RootNamespace />
</PropertyGroup>

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs

@ -24,7 +24,7 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency
JsonSerializerOptions = CreateJsonSerializerOptions(systemTextJsonSerializerOptions.Value);
}
public virtual DaprClient Create(Action<DaprClientBuilder> builderAction = null)
public virtual DaprClient Create(Action<DaprClientBuilder>? builderAction = null)
{
var builder = new DaprClientBuilder()
.UseJsonSerializationOptions(JsonSerializerOptions);
@ -51,9 +51,9 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency
}
public virtual HttpClient CreateHttpClient(
string appId = null,
string daprEndpoint = null,
string daprApiToken = null)
string? appId = null,
string? daprEndpoint = null,
string? daprApiToken = null)
{
if(daprEndpoint.IsNullOrWhiteSpace() &&
!DaprOptions.HttpEndpoint.IsNullOrWhiteSpace())

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs

@ -33,14 +33,14 @@ public class AbpDaprModule : AbpModule
var confEnv = configuration["DAPR_API_TOKEN"];
if (!confEnv.IsNullOrWhiteSpace())
{
options.DaprApiToken = confEnv;
options.DaprApiToken = confEnv!;
}
else
{
var env = Environment.GetEnvironmentVariable("DAPR_API_TOKEN");
if (!env.IsNullOrWhiteSpace())
{
options.DaprApiToken = env;
options.DaprApiToken = env!;
}
}
}
@ -50,14 +50,14 @@ public class AbpDaprModule : AbpModule
var confEnv = configuration["APP_API_TOKEN"];
if (!confEnv.IsNullOrWhiteSpace())
{
options.AppApiToken = confEnv;
options.AppApiToken = confEnv!;
}
else
{
var env = Environment.GetEnvironmentVariable("APP_API_TOKEN");
if (!env.IsNullOrWhiteSpace())
{
options.AppApiToken = env;
options.AppApiToken = env!;
}
}
}

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs

@ -2,11 +2,11 @@
public class AbpDaprOptions
{
public string HttpEndpoint { get; set; }
public string? HttpEndpoint { get; set; }
public string GrpcEndpoint { get; set; }
public string? GrpcEndpoint { get; set; }
public string DaprApiToken { get; set; }
public string? DaprApiToken { get; set; }
public string AppApiToken { get; set; }
public string? AppApiToken { get; set; }
}

4
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs

@ -12,12 +12,12 @@ public class DaprApiTokenProvider : IDaprApiTokenProvider, ISingletonDependency
Options = options.Value;
}
public virtual string GetDaprApiToken()
public virtual string? GetDaprApiToken()
{
return Options.DaprApiToken;
}
public virtual string GetAppApiToken()
public virtual string? GetAppApiToken()
{
return Options.AppApiToken;
}

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs

@ -6,11 +6,11 @@ namespace Volo.Abp.Dapr;
public interface IAbpDaprClientFactory
{
DaprClient Create(Action<DaprClientBuilder> builderAction = null);
DaprClient Create(Action<DaprClientBuilder>? builderAction = null);
HttpClient CreateHttpClient(
string appId = null,
string daprEndpoint = null,
string daprApiToken = null
string? appId = null,
string? daprEndpoint = null,
string? daprApiToken = null
);
}

4
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs

@ -2,7 +2,7 @@ namespace Volo.Abp.Dapr;
public interface IDaprApiTokenProvider
{
string GetDaprApiToken();
string? GetDaprApiToken();
string GetAppApiToken();
string? GetAppApiToken();
}

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.Ddd.Application.Contracts</AssemblyName>
<PackageId>Volo.Abp.Ddd.Application.Contracts</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

8
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs

@ -12,10 +12,10 @@ namespace Volo.Abp.Application.Dtos;
public abstract class AuditedEntityWithUserDto<TUserDto> : AuditedEntityDto, IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
}
/// <summary>
@ -28,8 +28,8 @@ public abstract class AuditedEntityWithUserDto<TUserDto> : AuditedEntityDto, IAu
public abstract class AuditedEntityWithUserDto<TPrimaryKey, TUserDto> : AuditedEntityDto<TPrimaryKey>, IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
}

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.Application.Dtos;
[Serializable]
public abstract class CreationAuditedEntityWithUserDto<TUserDto> : CreationAuditedEntityDto, ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
}
/// <summary>
@ -23,5 +23,5 @@ public abstract class CreationAuditedEntityWithUserDto<TUserDto> : CreationAudit
[Serializable]
public abstract class CreationAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : CreationAuditedEntityDto<TPrimaryKey>, ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
}

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/EntityDto.cs

@ -17,7 +17,7 @@ public abstract class EntityDto<TKey> : EntityDto, IEntityDto<TKey>
/// <summary>
/// Id of the entity.
/// </summary>
public TKey Id { get; set; }
public TKey Id { get; set; } = default!;
public override string ToString()
{

8
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleAuditedEntityWithUserDto.cs

@ -15,10 +15,10 @@ namespace Volo.Abp.Application.Dtos;
public abstract class ExtensibleAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleAuditedEntityDto<TPrimaryKey>, IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
protected ExtensibleAuditedEntityWithUserDto()
: this(true)
@ -44,10 +44,10 @@ public abstract class ExtensibleAuditedEntityWithUserDto<TUserDto> : ExtensibleA
IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
protected ExtensibleAuditedEntityWithUserDto()
: this(true)

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleCreationAuditedEntityWithUserDto.cs

@ -14,7 +14,7 @@ namespace Volo.Abp.Application.Dtos;
[Serializable]
public abstract class ExtensibleCreationAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleCreationAuditedEntityDto<TPrimaryKey>, ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
protected ExtensibleCreationAuditedEntityWithUserDto()
: this(true)
@ -39,7 +39,7 @@ public abstract class ExtensibleCreationAuditedEntityWithUserDto<TPrimaryKey, TU
public abstract class ExtensibleCreationAuditedEntityWithUserDto<TUserDto> : ExtensibleCreationAuditedEntityDto,
ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
protected ExtensibleCreationAuditedEntityWithUserDto()
: this(true)

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleEntityDto.cs

@ -9,7 +9,7 @@ public abstract class ExtensibleEntityDto<TKey> : ExtensibleObject, IEntityDto<T
/// <summary>
/// Id of the entity.
/// </summary>
public TKey Id { get; set; }
public TKey Id { get; set; } = default!;
protected ExtensibleEntityDto()
: this(true)

12
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleFullAuditedEntityWithUserDto.cs

@ -15,13 +15,13 @@ namespace Volo.Abp.Application.Dtos;
public abstract class ExtensibleFullAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleFullAuditedEntityDto<TPrimaryKey>, IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
protected ExtensibleFullAuditedEntityWithUserDto()
: this(true)
@ -47,13 +47,13 @@ public abstract class ExtensibleFullAuditedEntityWithUserDto<TUserDto> : Extensi
IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
protected ExtensibleFullAuditedEntityWithUserDto()
: this(true)

12
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs

@ -12,13 +12,13 @@ namespace Volo.Abp.Application.Dtos;
public abstract class FullAuditedEntityWithUserDto<TUserDto> : FullAuditedEntityDto, IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
}
/// <summary>
@ -31,11 +31,11 @@ public abstract class FullAuditedEntityWithUserDto<TUserDto> : FullAuditedEntity
public abstract class FullAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : FullAuditedEntityDto<TPrimaryKey>, IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
}

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ISortedResultRequest.cs

@ -16,5 +16,5 @@ public interface ISortedResultRequest
/// "Name DESC"
/// "Name ASC, Age DESC"
/// </example>
string Sorting { get; set; }
string? Sorting { get; set; }
}

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs

@ -42,7 +42,7 @@ public class LimitedResultRequestDto : ILimitedResultRequest, IValidatableObject
"MaxResultCountExceededExceptionMessage",
nameof(MaxResultCount),
MaxMaxResultCount,
typeof(LimitedResultRequestDto).FullName,
typeof(LimitedResultRequestDto).FullName!,
nameof(MaxMaxResultCount)
],
new[] { nameof(MaxResultCount) });
@ -90,7 +90,7 @@ public class ExtensibleLimitedResultRequestDto : ExtensibleEntityDto, ILimitedRe
"MaxResultCountExceededExceptionMessage",
nameof(MaxResultCount),
MaxMaxResultCount,
typeof(ExtensibleLimitedResultRequestDto).FullName,
typeof(ExtensibleLimitedResultRequestDto).FullName!,
nameof(MaxMaxResultCount)
],
new[] { nameof(MaxResultCount) });

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ListResultDto.cs

@ -13,7 +13,7 @@ public class ListResultDto<T> : IListResult<T>
get { return _items ?? (_items = new List<T>()); }
set { _items = value; }
}
private IReadOnlyList<T> _items;
private IReadOnlyList<T>? _items;
/// <summary>
/// Creates a new <see cref="ListResultDto{T}"/> object.
@ -42,7 +42,7 @@ public class ExtensibleListResultDto<T> : ExtensibleObject, IListResult<T>
get { return _items ?? (_items = new List<T>()); }
set { _items = value; }
}
private IReadOnlyList<T> _items;
private IReadOnlyList<T>? _items;
/// <summary>
/// Creates a new <see cref="ListResultDto{T}"/> object.

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs

@ -8,7 +8,7 @@ namespace Volo.Abp.Application.Dtos;
[Serializable]
public class PagedAndSortedResultRequestDto : PagedResultRequestDto, IPagedAndSortedResultRequest
{
public virtual string Sorting { get; set; }
public virtual string? Sorting { get; set; }
}
/// <summary>
@ -17,5 +17,5 @@ public class PagedAndSortedResultRequestDto : PagedResultRequestDto, IPagedAndSo
[Serializable]
public class ExtensiblePagedAndSortedResultRequestDto : ExtensiblePagedResultRequestDto, IPagedAndSortedResultRequest
{
public virtual string Sorting { get; set; }
public virtual string? Sorting { get; set; }
}

2
framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.Ddd.Application</AssemblyName>
<PackageId>Volo.Abp.Ddd.Application</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

6
framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AbstractKeyCrudAppService.cs

@ -70,11 +70,11 @@ public abstract class AbstractKeyCrudAppService<TEntity, TGetOutputDto, TGetList
{
protected IRepository<TEntity> Repository { get; }
protected virtual string CreatePolicyName { get; set; }
protected virtual string? CreatePolicyName { get; set; }
protected virtual string UpdatePolicyName { get; set; }
protected virtual string? UpdatePolicyName { get; set; }
protected virtual string DeletePolicyName { get; set; }
protected virtual string? DeletePolicyName { get; set; }
protected AbstractKeyCrudAppService(IRepository<TEntity> repository)
: base(repository)

6
framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AbstractKeyReadOnlyAppService.cs

@ -40,9 +40,9 @@ public abstract class AbstractKeyReadOnlyAppService<TEntity, TGetOutputDto, TGet
{
protected IReadOnlyRepository<TEntity> ReadOnlyRepository { get; }
protected virtual string GetPolicyName { get; set; }
protected virtual string? GetPolicyName { get; set; }
protected virtual string GetListPolicyName { get; set; }
protected virtual string? GetListPolicyName { get; set; }
protected AbstractKeyReadOnlyAppService(IReadOnlyRepository<TEntity> repository)
{
@ -107,7 +107,7 @@ public abstract class AbstractKeyReadOnlyAppService<TEntity, TGetOutputDto, TGet
{
if (!sortInput.Sorting.IsNullOrWhiteSpace())
{
return query.OrderBy(sortInput.Sorting);
return query.OrderBy(sortInput.Sorting!);
}
}

20
framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs

@ -36,10 +36,10 @@ public abstract class ApplicationService :
IGlobalFeatureCheckingEnabled,
ITransientDependency
{
public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
public IAbpLazyServiceProvider LazyServiceProvider { get; set; } = default!;
[Obsolete("Use LazyServiceProvider instead.")]
public IServiceProvider ServiceProvider { get; set; }
public IServiceProvider ServiceProvider { get; set; } = default!;
public static string[] CommonPostfixes { get; set; } = { "AppService", "ApplicationService", "IntService", "IntegrationService", "Service" };
@ -49,7 +49,7 @@ public abstract class ApplicationService :
protected IAsyncQueryableExecuter AsyncExecuter => LazyServiceProvider.LazyGetRequiredService<IAsyncQueryableExecuter>();
protected Type ObjectMapperContext { get; set; }
protected Type? ObjectMapperContext { get; set; }
protected IObjectMapper ObjectMapper => LazyServiceProvider.LazyGetService<IObjectMapper>(provider =>
ObjectMapperContext == null
? provider.GetRequiredService<IObjectMapper>()
@ -85,34 +85,34 @@ public abstract class ApplicationService :
return _localizer;
}
}
private IStringLocalizer _localizer;
private IStringLocalizer? _localizer;
protected Type LocalizationResource {
protected Type? LocalizationResource {
get => _localizationResource;
set {
_localizationResource = value;
_localizer = null;
}
}
private Type _localizationResource = typeof(DefaultResource);
private Type? _localizationResource = typeof(DefaultResource);
protected IUnitOfWork CurrentUnitOfWork => UnitOfWorkManager?.Current;
protected IUnitOfWork? CurrentUnitOfWork => UnitOfWorkManager?.Current;
protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance);
protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
/// <summary>
/// Checks for given <paramref name="policyName"/>.
/// Throws <see cref="AbpAuthorizationException"/> if given policy has not been granted.
/// </summary>
/// <param name="policyName">The policy name. This method does nothing if given <paramref name="policyName"/> is null or empty.</param>
protected virtual async Task CheckPolicyAsync([CanBeNull] string policyName)
protected virtual async Task CheckPolicyAsync(string? policyName)
{
if (string.IsNullOrEmpty(policyName))
{
return;
}
await AuthorizationService.CheckAsync(policyName);
await AuthorizationService.CheckAsync(policyName!);
}
protected virtual IStringLocalizer CreateLocalizer()

2
framework/src/Volo.Abp.Ddd.Domain.Shared/Volo.Abp.Ddd.Domain.Shared.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.Ddd.Domain.Shared</AssemblyName>
<PackageId>Volo.Abp.Ddd.Domain.Shared</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

6
framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs

@ -5,9 +5,9 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed;
[Serializable]
public class EntityEto : EtoBase
{
public string EntityType { get; set; }
public string EntityType { get; set; } = default!;
public string KeysAsString { get; set; }
public string KeysAsString { get; set; } = default!;
public EntityEto()
{
@ -23,5 +23,5 @@ public class EntityEto : EtoBase
public abstract class EntityEto<TKey> : IEntityEto<TKey>
{
public TKey Id { get; set; }
public TKey Id { get; set; } = default!;
}

2
framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionary.cs

@ -5,7 +5,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed;
public class EtoMappingDictionary : Dictionary<Type, EtoMappingDictionaryItem>
{
public void Add<TEntity, TEntityEto>(Type objectMappingContextType = null)
public void Add<TEntity, TEntityEto>(Type? objectMappingContextType = null)
{
this[typeof(TEntity)] = new EtoMappingDictionaryItem(typeof(TEntityEto), objectMappingContextType);
}

4
framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionaryItem.cs

@ -6,9 +6,9 @@ public class EtoMappingDictionaryItem
{
public Type EtoType { get; }
public Type ObjectMappingContextType { get; }
public Type? ObjectMappingContextType { get; }
public EtoMappingDictionaryItem(Type etoType, Type objectMappingContextType = null)
public EtoMappingDictionaryItem(Type etoType, Type? objectMappingContextType = null)
{
EtoType = etoType;
ObjectMappingContextType = objectMappingContextType;

3
framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs

@ -4,6 +4,5 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed;
public interface IEntityToEtoMapper
{
[CanBeNull]
object Map(object entityObj);
object? Map(object entityObj);
}

2
framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.Ddd.Domain</AssemblyName>
<PackageId>Volo.Abp.Ddd.Domain</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

10
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs

@ -16,13 +16,13 @@ public abstract class AbpCommonDbContextRegistrationOptions : IAbpCommonDbContex
public IServiceCollection Services { get; }
public Dictionary<MultiTenantDbContextType, Type> ReplacedDbContextTypes { get; }
public Dictionary<MultiTenantDbContextType, Type?> ReplacedDbContextTypes { get; }
public Type DefaultRepositoryDbContextType { get; protected set; }
public Type DefaultRepositoryImplementationType { get; private set; }
public Type? DefaultRepositoryImplementationType { get; private set; }
public Type DefaultRepositoryImplementationTypeWithoutKey { get; private set; }
public Type? DefaultRepositoryImplementationTypeWithoutKey { get; private set; }
public bool RegisterDefaultRepositories { get; private set; }
@ -40,7 +40,7 @@ public abstract class AbpCommonDbContextRegistrationOptions : IAbpCommonDbContex
Services = services;
DefaultRepositoryDbContextType = originalDbContextType;
CustomRepositories = new Dictionary<Type, Type>();
ReplacedDbContextTypes = new Dictionary<MultiTenantDbContextType, Type>();
ReplacedDbContextTypes = new Dictionary<MultiTenantDbContextType, Type?>();
SpecifiedDefaultRepositories = new List<Type>();
}
@ -54,7 +54,7 @@ public abstract class AbpCommonDbContextRegistrationOptions : IAbpCommonDbContex
return ReplaceDbContext(typeof(TOtherDbContext), typeof(TTargetDbContext), multiTenancySides);
}
public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type targetDbContextType = null, MultiTenancySides multiTenancySides = MultiTenancySides.Both)
public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type? targetDbContextType = null, MultiTenancySides multiTenancySides = MultiTenancySides.Both)
{
if (!otherDbContextType.IsAssignableFrom(OriginalDbContextType))
{

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs

@ -90,5 +90,5 @@ public interface IAbpCommonDbContextRegistrationOptionsBuilder
/// <param name="otherDbContextType">The DbContext type to be replaced</param>
/// <param name="targetDbContextType">The target DbContext type (optional, used this DbContext type if not provided)</param>
/// <param name="multiTenancySides">MultiTenancy side</param>
IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type targetDbContextType = null, MultiTenancySides multiTenancySides = MultiTenancySides.Both);
IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type? targetDbContextType = null, MultiTenancySides multiTenancySides = MultiTenancySides.Both);
}

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/MultiTenantDbContextType.cs

@ -15,7 +15,7 @@ public class MultiTenantDbContextType
MultiTenancySide = multiTenancySide;
}
public override bool Equals(object obj)
public override bool Equals(object? obj)
{
var other = obj as MultiTenantDbContextType;

8
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs

@ -12,10 +12,10 @@ public abstract class AuditedAggregateRootWithUser<TUser> : AuditedAggregateRoot
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
}
/// <summary>
@ -28,10 +28,10 @@ public abstract class AuditedAggregateRootWithUser<TKey, TUser> : AuditedAggrega
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
protected AuditedAggregateRootWithUser()
{

8
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs

@ -12,10 +12,10 @@ public abstract class AuditedEntityWithUser<TUser> : AuditedEntity, IAuditedObje
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
}
/// <summary>
@ -28,10 +28,10 @@ public abstract class AuditedEntityWithUser<TKey, TUser> : AuditedEntity<TKey>,
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
protected AuditedEntityWithUser()
{

4
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRootWithUser.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.Domain.Entities.Auditing;
public abstract class CreationAuditedAggregateRootWithUser<TUser> : CreationAuditedAggregateRoot, ICreationAuditedObject<TUser>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
}
/// <summary>
@ -23,7 +23,7 @@ public abstract class CreationAuditedAggregateRootWithUser<TUser> : CreationAudi
public abstract class CreationAuditedAggregateRootWithUser<TKey, TUser> : CreationAuditedAggregateRoot<TKey>, ICreationAuditedObject<TUser>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
protected CreationAuditedAggregateRootWithUser()
{

4
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntityWithUser.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.Domain.Entities.Auditing;
public abstract class CreationAuditedEntityWithUser<TUser> : CreationAuditedEntity, ICreationAuditedObject<TUser>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
}
/// <summary>
@ -23,7 +23,7 @@ public abstract class CreationAuditedEntityWithUser<TUser> : CreationAuditedEnti
public abstract class CreationAuditedEntityWithUser<TKey, TUser> : CreationAuditedEntity<TKey>, ICreationAuditedObject<TUser>
{
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
protected CreationAuditedEntityWithUser()
{

12
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs

@ -12,13 +12,13 @@ public abstract class FullAuditedAggregateRootWithUser<TUser> : FullAuditedAggre
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Deleter { get; set; }
public virtual TUser? Deleter { get; set; }
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
}
/// <summary>
@ -31,13 +31,13 @@ public abstract class FullAuditedAggregateRootWithUser<TKey, TUser> : FullAudite
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Deleter { get; set; }
public virtual TUser? Deleter { get; set; }
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
protected FullAuditedAggregateRootWithUser()
{

12
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs

@ -12,13 +12,13 @@ public abstract class FullAuditedEntityWithUser<TUser> : FullAuditedEntity, IFul
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Deleter { get; set; }
public virtual TUser? Deleter { get; set; }
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
}
/// <summary>
@ -31,13 +31,13 @@ public abstract class FullAuditedEntityWithUser<TKey, TUser> : FullAuditedEntity
where TUser : IEntity<Guid>
{
/// <inheritdoc />
public virtual TUser Deleter { get; set; }
public virtual TUser? Deleter { get; set; }
/// <inheritdoc />
public virtual TUser Creator { get; protected set; }
public virtual TUser? Creator { get; protected set; }
/// <inheritdoc />
public virtual TUser LastModifier { get; set; }
public virtual TUser? LastModifier { get; set; }
protected FullAuditedEntityWithUser()
{

12
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheBase.cs

@ -27,23 +27,23 @@ public abstract class EntityCacheBase<TEntity, TEntityCacheItem, TKey> :
UnitOfWorkManager = unitOfWorkManager;
}
public virtual async Task<TEntityCacheItem> FindAsync(TKey id)
public virtual async Task<TEntityCacheItem?> FindAsync(TKey id)
{
return await Cache.GetOrAddAsync(
id,
async () => MapToCacheItem(await Repository.FindAsync(id))
async () => MapToCacheItem(await Repository.FindAsync(id))!
);
}
public virtual async Task<TEntityCacheItem> GetAsync(TKey id)
{
return await Cache.GetOrAddAsync(
return (await Cache.GetOrAddAsync(
id,
async () => MapToCacheItem(await Repository.GetAsync(id))
);
async () => MapToCacheItem(await Repository.GetAsync(id))!
))!;
}
protected abstract TEntityCacheItem MapToCacheItem(TEntity entity);
protected abstract TEntityCacheItem? MapToCacheItem(TEntity? entity);
public async Task HandleEventAsync(EntityChangedEventData<TEntity> eventData)
{

6
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheServiceCollectionExtensions.cs

@ -13,7 +13,7 @@ public static class EntityCacheServiceCollectionExtensions
{
public static IServiceCollection AddEntityCache<TEntity, TKey>(
this IServiceCollection services,
[CanBeNull] DistributedCacheEntryOptions cacheOptions = null)
DistributedCacheEntryOptions? cacheOptions = null)
where TEntity : Entity<TKey>
{
services
@ -39,7 +39,7 @@ public static class EntityCacheServiceCollectionExtensions
public static IServiceCollection AddEntityCache<TEntity, TEntityCacheItem, TKey>(
this IServiceCollection services,
[CanBeNull] DistributedCacheEntryOptions cacheOptions = null)
DistributedCacheEntryOptions? cacheOptions = null)
where TEntity : Entity<TKey>
where TEntityCacheItem : class
{
@ -61,7 +61,7 @@ public static class EntityCacheServiceCollectionExtensions
public static IServiceCollection AddEntityCache<TObjectMapperContext, TEntity, TEntityCacheItem, TKey>(
this IServiceCollection services,
[CanBeNull] DistributedCacheEntryOptions cacheOptions = null)
DistributedCacheEntryOptions? cacheOptions = null)
where TEntity : Entity<TKey>
where TEntityCacheItem : class
{

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheWithObjectMapper.cs

@ -23,7 +23,7 @@ public class EntityCacheWithObjectMapper<TEntity, TEntityCacheItem, TKey> :
ObjectMapper = objectMapper;
}
protected override TEntityCacheItem MapToCacheItem(TEntity entity)
protected override TEntityCacheItem? MapToCacheItem(TEntity? entity)
{
if (entity == null)
{

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/EntityCacheWithoutCacheItem.cs

@ -16,7 +16,7 @@ public class EntityCacheWithoutCacheItem<TEntity, TKey> :
{
}
protected override TEntity MapToCacheItem(TEntity entity)
protected override TEntity? MapToCacheItem(TEntity? entity)
{
return entity;
}

3
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Caching/IEntityCache.cs

@ -10,8 +10,7 @@ public interface IEntityCache<TEntityCacheItem, in TKey>
/// Gets the entity with given <paramref name="id"/>,
/// or returns null if the entity was not found.
/// </summary>
[ItemCanBeNull]
Task<TEntityCacheItem> FindAsync(TKey id);
Task<TEntityCacheItem?> FindAsync(TKey id);
/// <summary>
/// Gets the entity with given <paramref name="id"/>,

8
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs

@ -18,7 +18,7 @@ public abstract class Entity : IEntity
return $"[ENTITY: {GetType().Name}] Keys = {GetKeys().JoinAsString(", ")}";
}
public abstract object[] GetKeys();
public abstract object?[] GetKeys();
public bool EntityEquals(IEntity other)
{
@ -31,7 +31,7 @@ public abstract class Entity : IEntity
public abstract class Entity<TKey> : Entity, IEntity<TKey>
{
/// <inheritdoc/>
public virtual TKey Id { get; protected set; }
public virtual TKey Id { get; protected set; } = default!;
protected Entity()
{
@ -43,9 +43,9 @@ public abstract class Entity<TKey> : Entity, IEntity<TKey>
Id = id;
}
public override object[] GetKeys()
public override object?[] GetKeys()
{
return new object[] { Id };
return new object?[] { Id };
}
/// <inheritdoc/>

16
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs

@ -25,7 +25,7 @@ public static class EntityHelper
return typeof(IMultiTenant).IsAssignableFrom(type);
}
public static bool EntityEquals(IEntity entity1, IEntity entity2)
public static bool EntityEquals(IEntity? entity1, IEntity? entity2)
{
if (entity1 == null || entity2 == null)
{
@ -131,7 +131,7 @@ public static class EntityHelper
return IsValueObjectPredicate(type);
}
public static bool IsValueObject(object obj)
public static bool IsValueObject(object? obj)
{
return obj != null && IsValueObject(obj.GetType());
}
@ -161,7 +161,7 @@ public static class EntityHelper
public static bool HasDefaultId<TKey>(IEntity<TKey> entity)
{
if (EqualityComparer<TKey>.Default.Equals(entity.Id, default))
if (EqualityComparer<TKey>.Default.Equals(entity.Id, default!))
{
return true;
}
@ -180,7 +180,7 @@ public static class EntityHelper
return false;
}
private static bool IsDefaultKeyValue(object value)
private static bool IsDefaultKeyValue(object? value)
{
if (value == null)
{
@ -222,8 +222,7 @@ public static class EntityHelper
/// Tries to find the primary key type of the given entity type.
/// May return null if given type does not implement <see cref="IEntity{TKey}"/>
/// </summary>
[CanBeNull]
public static Type FindPrimaryKeyType<TEntity>()
public static Type? FindPrimaryKeyType<TEntity>()
where TEntity : IEntity
{
return FindPrimaryKeyType(typeof(TEntity));
@ -233,8 +232,7 @@ public static class EntityHelper
/// Tries to find the primary key type of the given entity type.
/// May return null if given type does not implement <see cref="IEntity{TKey}"/>
/// </summary>
[CanBeNull]
public static Type FindPrimaryKeyType([NotNull] Type entityType)
public static Type? FindPrimaryKeyType([NotNull] Type entityType)
{
if (!typeof(IEntity).IsAssignableFrom(entityType))
{
@ -260,7 +258,7 @@ public static class EntityHelper
var lambdaParam = Expression.Parameter(typeof(TEntity));
var leftExpression = Expression.PropertyOrField(lambdaParam, "Id");
var idValue = Convert.ChangeType(id, typeof(TKey));
Expression<Func<object>> closure = () => idValue;
Expression<Func<object?>> closure = () => idValue;
var rightExpression = Expression.Convert(closure.Body, leftExpression.Type);
var lambdaBody = Expression.Equal(leftExpression, rightExpression);
return Expression.Lambda<Func<TEntity, bool>>(lambdaBody, lambdaParam);

7
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntitySynchronizer.cs

@ -22,7 +22,7 @@ public abstract class EntitySynchronizer<TEntity, TKey, TSourceEntityEto> :
Repository = repository;
}
protected override Task<TEntity> FindLocalEntityAsync(TSourceEntityEto eto)
protected override Task<TEntity?> FindLocalEntityAsync(TSourceEntityEto eto)
{
return Repository.FindAsync(eto.Id);
}
@ -154,10 +154,9 @@ public abstract class EntitySynchronizer<TEntity, TSourceEntityEto> :
return true;
}
[ItemCanBeNull]
protected abstract Task<TEntity> FindLocalEntityAsync(TSourceEntityEto eto);
protected abstract Task<TEntity?> FindLocalEntityAsync(TSourceEntityEto eto);
protected virtual Task<bool> IsEtoNewerAsync(TSourceEntityEto eto, [CanBeNull] TEntity localEntity)
protected virtual Task<bool> IsEtoNewerAsync(TSourceEntityEto eto, TEntity? localEntity)
{
if (localEntity is IHasEntityVersion versionedLocalEntity && eto is IHasEntityVersion versionedEto)
{

4
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs

@ -21,7 +21,7 @@ public class EntityToEtoMapper : IEntityToEtoMapper, ITransientDependency
Options = options.Value;
}
public object Map(object entityObj)
public object? Map(object entityObj)
{
Check.NotNull(entityObj, nameof(entityObj));
@ -36,7 +36,7 @@ public class EntityToEtoMapper : IEntityToEtoMapper, ITransientDependency
if (etoMappingItem == null)
{
var keys = entity.GetKeys().JoinAsString(",");
return new EntityEto(entityType.FullName, keys);
return new EntityEto(entityType.FullName!, keys);
}
using (var scope = HybridServiceScopeFactory.CreateScope())

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs

@ -133,7 +133,7 @@ public class EntityChangeEventHelper : IEntityChangeEventHelper, ITransientDepen
{
var entityType = ProxyHelper.UnProxy(entityOrEto).GetType();
var eventType = genericEventType.MakeGenericType(entityType);
var eventData = Activator.CreateInstance(eventType, entityOrEto);
var eventData = Activator.CreateInstance(eventType, entityOrEto)!;
var currentUow = UnitOfWorkManager.Current;
if (currentUow == null)

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityEventData.cs

@ -27,7 +27,7 @@ public class EntityEventData<TEntity> : IEventDataWithInheritableGenericArgument
public virtual object[] GetConstructorArgs()
{
return new object[] { Entity };
return new object[] { Entity! };
}
public virtual bool IsMultiTenant(out Guid? tenantId)

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntity.cs

@ -10,7 +10,7 @@ public interface IEntity
/// Returns an array of ordered keys for this entity.
/// </summary>
/// <returns></returns>
object[] GetKeys();
object?[] GetKeys();
}
/// <summary>

6
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/BasicRepositoryBase.cs

@ -20,9 +20,9 @@ public abstract class BasicRepositoryBase<TEntity> :
IUnitOfWorkEnabled
where TEntity : class, IEntity
{
public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
public IAbpLazyServiceProvider LazyServiceProvider { get; set; } = default!;
public IServiceProvider ServiceProvider { get; set; }
public IServiceProvider ServiceProvider { get; set; } = default!;
public IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
@ -123,7 +123,7 @@ public abstract class BasicRepositoryBase<TEntity, TKey> : BasicRepositoryBase<T
return entity;
}
public abstract Task<TEntity> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default);
public abstract Task<TEntity?> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default);
public virtual async Task DeleteAsync(TKey id, bool autoSave = false, CancellationToken cancellationToken = default)
{

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IReadOnlyBasicRepository.cs

@ -51,5 +51,5 @@ public interface IReadOnlyBasicRepository<TEntity, TKey> : IReadOnlyBasicReposit
/// <param name="includeDetails">Set true to include all children of this entity</param>
/// <param name="cancellationToken">A <see cref="T:System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
/// <returns>Entity or null</returns>
Task<TEntity> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default);
Task<TEntity?> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default);
}

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs

@ -28,7 +28,7 @@ public interface IRepository<TEntity> : IReadOnlyRepository<TEntity>, IBasicRepo
/// <param name="predicate">A condition to find the entity</param>
/// <param name="includeDetails">Set true to include all children of this entity</param>
/// <param name="cancellationToken">A <see cref="T:System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
Task<TEntity> FindAsync(
Task<TEntity?> FindAsync(
[NotNull] Expression<Func<TEntity, bool>> predicate,
bool includeDetails = true,
CancellationToken cancellationToken = default

12
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryAsyncExtensions.cs

@ -120,7 +120,7 @@ public static class RepositoryAsyncExtensions
return await repository.AsyncExecuter.FirstAsync(queryable, predicate, cancellationToken);
}
public static async Task<T> FirstOrDefaultAsync<T>(
public static async Task<T?> FirstOrDefaultAsync<T>(
[NotNull] this IReadOnlyRepository<T> repository,
CancellationToken cancellationToken = default)
where T : class, IEntity
@ -129,7 +129,7 @@ public static class RepositoryAsyncExtensions
return await repository.AsyncExecuter.FirstOrDefaultAsync(queryable, cancellationToken);
}
public static async Task<T> FirstOrDefaultAsync<T>(
public static async Task<T?> FirstOrDefaultAsync<T>(
[NotNull] this IReadOnlyRepository<T> repository,
[NotNull] Expression<Func<T, bool>> predicate,
CancellationToken cancellationToken = default)
@ -162,7 +162,7 @@ public static class RepositoryAsyncExtensions
return await repository.AsyncExecuter.LastAsync(queryable, predicate, cancellationToken);
}
public static async Task<T> LastOrDefaultAsync<T>(
public static async Task<T?> LastOrDefaultAsync<T>(
[NotNull] this IReadOnlyRepository<T> repository,
CancellationToken cancellationToken = default)
where T : class, IEntity
@ -171,7 +171,7 @@ public static class RepositoryAsyncExtensions
return await repository.AsyncExecuter.LastOrDefaultAsync(queryable, cancellationToken);
}
public static async Task<T> LastOrDefaultAsync<T>(
public static async Task<T?> LastOrDefaultAsync<T>(
[NotNull] this IReadOnlyRepository<T> repository,
[NotNull] Expression<Func<T, bool>> predicate,
CancellationToken cancellationToken = default)
@ -204,7 +204,7 @@ public static class RepositoryAsyncExtensions
return await repository.AsyncExecuter.SingleAsync(queryable, predicate, cancellationToken);
}
public static async Task<T> SingleOrDefaultAsync<T>(
public static async Task<T?> SingleOrDefaultAsync<T>(
[NotNull] this IReadOnlyRepository<T> repository,
CancellationToken cancellationToken = default)
where T : class, IEntity
@ -213,7 +213,7 @@ public static class RepositoryAsyncExtensions
return await repository.AsyncExecuter.SingleOrDefaultAsync(queryable, cancellationToken);
}
public static async Task<T> SingleOrDefaultAsync<T>(
public static async Task<T?> SingleOrDefaultAsync<T>(
[NotNull] this IReadOnlyRepository<T> repository,
[NotNull] Expression<Func<T, bool>> predicate,
CancellationToken cancellationToken = default)

8
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryBase.cs

@ -41,7 +41,7 @@ public abstract class RepositoryBase<TEntity> : BasicRepositoryBase<TEntity>, IR
public abstract Task<IQueryable<TEntity>> GetQueryableAsync();
public abstract Task<TEntity> FindAsync(
public abstract Task<TEntity?> FindAsync(
Expression<Func<TEntity, bool>> predicate,
bool includeDetails = true,
CancellationToken cancellationToken = default);
@ -76,13 +76,13 @@ public abstract class RepositoryBase<TEntity> : BasicRepositoryBase<TEntity>, IR
{
if (typeof(ISoftDelete).IsAssignableFrom(typeof(TOtherEntity)))
{
query = (TQueryable)query.WhereIf(DataFilter.IsEnabled<ISoftDelete>(), e => ((ISoftDelete)e).IsDeleted == false);
query = (TQueryable)query.WhereIf(DataFilter.IsEnabled<ISoftDelete>(), e => ((ISoftDelete)e!).IsDeleted == false);
}
if (typeof(IMultiTenant).IsAssignableFrom(typeof(TOtherEntity)))
{
var tenantId = CurrentTenant.Id;
query = (TQueryable)query.WhereIf(DataFilter.IsEnabled<IMultiTenant>(), e => ((IMultiTenant)e).TenantId == tenantId);
query = (TQueryable)query.WhereIf(DataFilter.IsEnabled<IMultiTenant>(), e => ((IMultiTenant)e!).TenantId == tenantId);
}
return query;
@ -94,7 +94,7 @@ public abstract class RepositoryBase<TEntity, TKey> : RepositoryBase<TEntity>, I
{
public abstract Task<TEntity> GetAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default);
public abstract Task<TEntity> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default);
public abstract Task<TEntity?> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default);
public virtual async Task DeleteAsync(TKey id, bool autoSave = false, CancellationToken cancellationToken = default)
{

8
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs

@ -54,7 +54,7 @@ public static class RepositoryExtensions
)
where TEntity : class, IEntity<TKey>
{
if (!await repository.AnyAsync(x => x.Id.Equals(id), cancellationToken))
if (!await repository.AnyAsync(x => x.Id!.Equals(id), cancellationToken))
{
throw new EntityNotFoundException(typeof(TEntity), id);
}
@ -87,7 +87,7 @@ public static class RepositoryExtensions
{
using (var uow = uowManager.Begin())
{
await HardDeleteWithUnitOfWorkAsync(repository, predicate, autoSave, cancellationToken, uowManager.Current);
await HardDeleteWithUnitOfWorkAsync(repository, predicate, autoSave, cancellationToken, uowManager.Current!);
await uow.CompleteAsync(cancellationToken);
}
}
@ -111,7 +111,7 @@ public static class RepositoryExtensions
{
using (var uow = uowManager.Begin())
{
await HardDeleteWithUnitOfWorkAsync(repository, entities, autoSave, cancellationToken, uowManager.Current);
await HardDeleteWithUnitOfWorkAsync(repository, entities, autoSave, cancellationToken, uowManager.Current!);
await uow.CompleteAsync(cancellationToken);
}
}
@ -135,7 +135,7 @@ public static class RepositoryExtensions
{
using (var uow = uowManager.Begin())
{
await HardDeleteWithUnitOfWorkAsync(repository, entity, autoSave, cancellationToken, uowManager.Current);
await HardDeleteWithUnitOfWorkAsync(repository, entity, autoSave, cancellationToken, uowManager.Current!);
await uow.CompleteAsync(cancellationToken);
}
}

4
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs

@ -75,12 +75,12 @@ public abstract class RepositoryRegistrarBase<TOptions>
if (primaryKeyType == null)
{
return Options.SpecifiedDefaultRepositoryTypes
? Options.DefaultRepositoryImplementationTypeWithoutKey.MakeGenericType(entityType)
? Options.DefaultRepositoryImplementationTypeWithoutKey!.MakeGenericType(entityType)
: GetRepositoryType(Options.DefaultRepositoryDbContextType, entityType);
}
return Options.SpecifiedDefaultRepositoryTypes
? Options.DefaultRepositoryImplementationType.MakeGenericType(entityType, primaryKeyType)
? Options.DefaultRepositoryImplementationType!.MakeGenericType(entityType, primaryKeyType)
: GetRepositoryType(Options.DefaultRepositoryDbContextType, entityType, primaryKeyType);
}

6
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs

@ -11,10 +11,10 @@ namespace Volo.Abp.Domain.Services;
public abstract class DomainService : IDomainService
{
public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
public IAbpLazyServiceProvider LazyServiceProvider { get; set; } = default!;
[Obsolete("Use LazyServiceProvider instead.")]
public IServiceProvider ServiceProvider { get; set; }
public IServiceProvider ServiceProvider { get; set; } = default!;
protected IClock Clock => LazyServiceProvider.LazyGetRequiredService<IClock>();
@ -26,5 +26,5 @@ public abstract class DomainService : IDomainService
protected IAsyncQueryableExecuter AsyncExecuter => LazyServiceProvider.LazyGetRequiredService<IAsyncQueryableExecuter>();
protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance);
protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
}

2
framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.DistributedLocking.Abstractions</AssemblyName>
<PackageId>Volo.Abp.DistributedLocking.Abstractions</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

3
framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/IAbpDistributedLock.cs

@ -16,8 +16,7 @@ public interface IAbpDistributedLock
/// <param name="name">The name of the lock</param>
/// <param name="timeout">How long to wait before giving up on the acquisition attempt. Defaults to 0</param>
/// <param name="cancellationToken">Cancellation token</param>
[ItemCanBeNull]
Task<IAbpDistributedLockHandle> TryAcquireAsync(
Task<IAbpDistributedLockHandle?> TryAcquireAsync(
[NotNull] string name,
TimeSpan timeout = default,
CancellationToken cancellationToken = default

2
framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/LocalAbpDistributedLock.cs

@ -22,7 +22,7 @@ public class LocalAbpDistributedLock : IAbpDistributedLock, ISingletonDependency
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public async Task<IAbpDistributedLockHandle> TryAcquireAsync(
public async Task<IAbpDistributedLockHandle?> TryAcquireAsync(
string name,
TimeSpan timeout = default,
CancellationToken cancellationToken = default)

2
framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<RootNamespace />
</PropertyGroup>

2
framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/AbpDistributedLockDaprOptions.cs

@ -4,7 +4,7 @@ namespace Volo.Abp.DistributedLocking.Dapr;
public class AbpDistributedLockDaprOptions
{
public string StoreName { get; set; }
public string StoreName { get; set; } = default!;
public string? Owner { get; set; }

2
framework/src/Volo.Abp.DistributedLocking.Dapr/Volo/Abp/DistributedLocking/Dapr/DaprAbpDistributedLock.cs

@ -24,7 +24,7 @@ public class DaprAbpDistributedLock : IAbpDistributedLock, ITransientDependency
DistributedLockDaprOptions = distributedLockDaprOptions.Value;
}
public async Task<IAbpDistributedLockHandle> TryAcquireAsync(
public async Task<IAbpDistributedLockHandle?> TryAcquireAsync(
string name,
TimeSpan timeout = default,
CancellationToken cancellationToken = default)

2
framework/src/Volo.Abp.DistributedLocking/Volo.Abp.DistributedLocking.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.DistributedLocking</AssemblyName>
<PackageId>Volo.Abp.DistributedLocking</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

2
framework/src/Volo.Abp.DistributedLocking/Volo/Abp/DistributedLocking/MedallionAbpDistributedLock.cs

@ -25,7 +25,7 @@ public class MedallionAbpDistributedLock : IAbpDistributedLock, ITransientDepend
DistributedLockKeyNormalizer = distributedLockKeyNormalizer;
}
public async Task<IAbpDistributedLockHandle> TryAcquireAsync(
public async Task<IAbpDistributedLockHandle?> TryAcquireAsync(
string name,
TimeSpan timeout = default,
CancellationToken cancellationToken = default)

8
framework/src/Volo.Abp.Threading/Volo/Abp/Linq/AsyncQueryableExecuter.cs

@ -209,7 +209,7 @@ public class AsyncQueryableExecuter : IAsyncQueryableExecuter, ISingletonDepende
return Task.FromResult(queryable.SingleOrDefault(predicate))!;
}
public Task<T?> MinAsync<T>(IQueryable<T> queryable, CancellationToken cancellationToken = default)
public Task<T> MinAsync<T>(IQueryable<T> queryable, CancellationToken cancellationToken = default)
{
var provider = FindProvider(queryable);
@ -221,7 +221,7 @@ public class AsyncQueryableExecuter : IAsyncQueryableExecuter, ISingletonDepende
return Task.FromResult(queryable.Min())!;
}
public Task<TResult?> MinAsync<T, TResult>(IQueryable<T> queryable, Expression<Func<T, TResult>> selector, CancellationToken cancellationToken = default)
public Task<TResult> MinAsync<T, TResult>(IQueryable<T> queryable, Expression<Func<T, TResult>> selector, CancellationToken cancellationToken = default)
{
var provider = FindProvider(queryable);
@ -233,7 +233,7 @@ public class AsyncQueryableExecuter : IAsyncQueryableExecuter, ISingletonDepende
return Task.FromResult(queryable.Min(selector))!;
}
public Task<T?> MaxAsync<T>(IQueryable<T> queryable, CancellationToken cancellationToken = default)
public Task<T> MaxAsync<T>(IQueryable<T> queryable, CancellationToken cancellationToken = default)
{
var provider = FindProvider(queryable);
@ -245,7 +245,7 @@ public class AsyncQueryableExecuter : IAsyncQueryableExecuter, ISingletonDepende
return Task.FromResult(queryable.Max())!;
}
public Task<TResult?> MaxAsync<T, TResult>(IQueryable<T> queryable, Expression<Func<T, TResult>> selector, CancellationToken cancellationToken = default)
public Task<TResult> MaxAsync<T, TResult>(IQueryable<T> queryable, Expression<Func<T, TResult>> selector, CancellationToken cancellationToken = default)
{
var provider = FindProvider(queryable);

8
framework/src/Volo.Abp.Threading/Volo/Abp/Linq/IAsyncQueryableExecuter.cs

@ -137,12 +137,12 @@ public interface IAsyncQueryableExecuter
#region Min
Task<T?> MinAsync<T>(
Task<T> MinAsync<T>(
[NotNull] IQueryable<T> queryable,
CancellationToken cancellationToken = default);
Task<TResult?> MinAsync<T, TResult>(
Task<TResult> MinAsync<T, TResult>(
[NotNull] IQueryable<T> queryable,
[NotNull] Expression<Func<T, TResult>> selector,
CancellationToken cancellationToken = default);
@ -151,12 +151,12 @@ public interface IAsyncQueryableExecuter
#region Max
Task<T?> MaxAsync<T>(
Task<T> MaxAsync<T>(
[NotNull] IQueryable<T> queryable,
CancellationToken cancellationToken = default);
Task<TResult?> MaxAsync<T, TResult>(
Task<TResult> MaxAsync<T, TResult>(
[NotNull] IQueryable<T> queryable,
[NotNull] Expression<Func<T, TResult>> selector,
CancellationToken cancellationToken = default);

8
framework/src/Volo.Abp.Threading/Volo/Abp/Linq/IAsyncQueryableProvider.cs

@ -139,12 +139,12 @@ public interface IAsyncQueryableProvider
#region Min
Task<T?> MinAsync<T>(
Task<T> MinAsync<T>(
[NotNull] IQueryable<T> queryable,
CancellationToken cancellationToken = default);
Task<TResult?> MinAsync<T, TResult>(
Task<TResult> MinAsync<T, TResult>(
[NotNull] IQueryable<T> queryable,
[NotNull] Expression<Func<T, TResult>> selector,
CancellationToken cancellationToken = default);
@ -153,12 +153,12 @@ public interface IAsyncQueryableProvider
#region Max
Task<T?> MaxAsync<T>(
Task<T> MaxAsync<T>(
[NotNull] IQueryable<T> queryable,
CancellationToken cancellationToken = default);
Task<TResult?> MaxAsync<T, TResult>(
Task<TResult> MaxAsync<T, TResult>(
[NotNull] IQueryable<T> queryable,
[NotNull] Expression<Func<T, TResult>> selector,
CancellationToken cancellationToken = default);

2
latest-versions.json

@ -1,6 +1,6 @@
[
{
"version": "7.3.1",
"version": "7.3.2",
"releaseDate": "",
"type": "stable",
"message": ""

6
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json

@ -3,9 +3,9 @@
"name": "asp.net",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.shared": "~7.3.1",
"@abp/prismjs": "^~7.3.1",
"@abp/highlight.js": "^~7.3.1"
"@abp/aspnetcore.mvc.ui.theme.shared": "~7.3.2",
"@abp/prismjs": "^~7.3.2",
"@abp/highlight.js": "^~7.3.2"
},
"devDependencies": {}
}

2622
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock

File diff suppressed because it is too large

4
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json

@ -3,8 +3,8 @@
"name": "asp.net",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~7.3.1",
"@abp/prismjs": "~7.3.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "~7.3.2",
"@abp/prismjs": "~7.3.2"
},
"devDependencies": {}
}

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

Loading…
Cancel
Save