Merge pull request #13594 from abpframework/auto-merge/rel-6-0/1253

Merge branch dev with rel-6.0

docs/en/Road-Map.md

@@ -4,18 +4,18 @@ This document provides a road map, release schedule and planned features for the
 
 ## Next Versions
 
-### v6.0
+### v7.0
 
-In [6.0 milestone](https://github.com/abpframework/abp/milestone/61), we will be mostly working on the following topics:
+In the [7.0 milestone](https://github.com/abpframework/abp/milestone/75), we will be mostly working on the following topics:
 
-* Providing an OpenIddict integration to replace current IdentityServer4 integration.
+* Dapr integration ([#13337](https://github.com/abpframework/abp/issues/13337))
+* Upgrade to .NET 7.0 ([#13336](https://github.com/abpframework/abp/issues/13336))
+* Integration Services ([#12470](https://github.com/abpframework/abp/issues/12470))
 * Maturing and documenting the [eShopOnAbp](https://github.com/abpframework/eShopOnAbp) project, writing a free e-book that explains the solution.
-* Working on the [LeptonX](https://blog.abp.io/abp/LeptonX-Theme-for-ABP-Framework-Alpha-Release) theme and making it as the default theme for the ABP Framework UI options.
+* Working on the [LeptonX](https://blog.abp.io/abp/LeptonX-Theme-for-ABP-Framework-Alpha-Release) theme.
 * Improvements on the existing features and providing more guides.
 
-The planned stable release date for v6.0 is **July, 2022**.
-
-> After the version 6.0, we will be working for ABP 7.0 which will be released in the end of 2022 based on .NET 7.0.
+The planned stable release date for v7.0 is **December, 2022**. We will be publishing more than one pre-release versions before that date.
 
 ## Backlog Items
 
@@ -23,7 +23,6 @@ The *Next Versions* section above shows the main focus of the planned versions.
 
 Here, a list of major items in the backlog we are considering to work on in the next versions.
 
-* [#2183](https://github.com/abpframework/abp/issues/2183) / Dapr integration
 * [#6655](https://github.com/abpframework/abp/pull/6655) / Use Typescript for the MVC UI
 * [#236](https://github.com/abpframework/abp/issues/236) / Resource based authorization system
 * [#2882](https://github.com/abpframework/abp/issues/2882) / Providing a gRPC integration infrastructure (while it is [already possible](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) to create or consume gRPC endpoints for your application, we plan to create endpoints for the [standard application modules](https://docs.abp.io/en/abp/latest/Modules/Index))