From 8c44264cb57444d9d5cdec7ec3d078493542aed6 Mon Sep 17 00:00:00 2001
From: muhammedaltug <muhammetaltug@gmail.com>
Date: Wed, 29 Dec 2021 17:47:30 +0300
Subject: [PATCH 01/12] add abp packages to package jon

---
 npm/ng-packs/package.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index eca26a6b0f..e49dbd2ce1 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -56,6 +56,17 @@
     "@angular/platform-browser": "12.2.13",
     "@angular/platform-browser-dynamic": "12.2.13",
     "@angular/router": "12.2.13",
+    "@abp/ng.account": "~5.0.1",
+    "@abp/ng.account.core": "~5.0.1",
+    "@abp/ng.core": "~5.0.1",
+    "@abp/ng.feature-management": "~5.0.1",
+    "@abp/ng.identity": "~5.0.1",
+    "@abp/ng.permission-management": "~5.0.1",
+    "@abp/ng.schematics": "~5.0.1",
+    "@abp/ng.setting-management": "~5.0.1",
+    "@abp/ng.tenant-management": "~5.0.1",
+    "@abp/ng.theme.basic": "~5.0.1",
+    "@abp/ng.theme.shared": "~5.0.1",
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@ng-bootstrap/ng-bootstrap": "11.0.0-beta.2",
     "@ngneat/spectator": "^8.0.3",

From 5840dd3f27901f2c8a8919ee0e45d6d260da22a4 Mon Sep 17 00:00:00 2001
From: muhammedaltug <muhammetaltug@gmail.com>
Date: Wed, 29 Dec 2021 18:05:05 +0300
Subject: [PATCH 02/12] update broken test

---
 .../packages/core/src/lib/tests/dynamic-layout.component.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
index ba4fd361c2..2076be84b4 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
@@ -198,6 +198,5 @@ describe('DynamicLayoutComponent', () => {
     spectator.detectComponentChanges();
 
     expect(spectator.query('abp-layout-empty')).toBeFalsy();
-    expect(spectator.query('abp-dynamic-layout').children[0].tagName).toEqual('ROUTER-OUTLET');
   });
 });

From 9f9f503127dc5734a86814005776ce91fea1d8c7 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 30 Dec 2021 10:37:15 +0800
Subject: [PATCH 03/12] Enhanced `AbpHttpClientProxyServiceConvention`.

Compatible with special situations.
---
 .../AbpHttpClientProxyServiceConvention.cs    | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs
index 656c361062..bb0db66509 100644
--- a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs
+++ b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs
@@ -21,6 +21,7 @@ namespace Volo.Abp.Http.Client.Web.Conventions
     public class AbpHttpClientProxyServiceConvention : AbpServiceConvention
     {
         protected readonly IClientProxyApiDescriptionFinder ClientProxyApiDescriptionFinder;
+        protected readonly List<ControllerModel> ControllerWithAttributeRoute;
         protected readonly List<ActionModel> ActionWithAttributeRoute;
 
         public AbpHttpClientProxyServiceConvention(
@@ -30,6 +31,7 @@ namespace Volo.Abp.Http.Client.Web.Conventions
             : base(options, conventionalRouteBuilder)
         {
             ClientProxyApiDescriptionFinder = clientProxyApiDescriptionFinder;
+            ControllerWithAttributeRoute = new List<ControllerModel>();
             ActionWithAttributeRoute = new List<ActionModel>();
         }
 
@@ -51,15 +53,6 @@ namespace Volo.Abp.Http.Client.Web.Conventions
             {
                 controller.ControllerName = controller.ControllerName.RemovePostFix("ClientProxy");
 
-                var moduleApiDescription = FindModuleApiDescriptionModel(controller);
-
-                if (moduleApiDescription != null && !moduleApiDescription.RootPath.IsNullOrWhiteSpace())
-                {
-                    var selector = controller.Selectors.FirstOrDefault();
-                    selector?.EndpointMetadata.Add(new AreaAttribute(moduleApiDescription.RootPath));
-                    controller.RouteValues.Add(new KeyValuePair<string, string>("area", moduleApiDescription.RootPath));
-                }
-
                 var controllerApiDescription = FindControllerApiDescriptionModel(controller);
                 if (controllerApiDescription != null &&
                     !controllerApiDescription.ControllerGroupName.IsNullOrWhiteSpace())
@@ -77,6 +70,14 @@ namespace Volo.Abp.Http.Client.Web.Conventions
         {
             RemoveEmptySelectors(controller.Selectors);
 
+            var moduleApiDescription = FindModuleApiDescriptionModel(controller);
+            if (moduleApiDescription != null && !moduleApiDescription.RootPath.IsNullOrWhiteSpace())
+            {
+                var selector = controller.Selectors.FirstOrDefault();
+                selector?.EndpointMetadata.Add(new AreaAttribute(moduleApiDescription.RootPath));
+                controller.RouteValues.Add(new KeyValuePair<string, string>("area", moduleApiDescription.RootPath));
+            }
+
             var controllerType = controller.ControllerType.AsType();
             var remoteServiceAtt = ReflectionHelper.GetSingleAttributeOrDefault<RemoteServiceAttribute>(controllerType.GetTypeInfo());
             if (remoteServiceAtt != null && !remoteServiceAtt.IsEnabledFor(controllerType))
@@ -111,15 +112,14 @@ namespace Volo.Abp.Http.Client.Web.Conventions
                 return;;
             }
 
+            ControllerWithAttributeRoute.Add(controller);
             ActionWithAttributeRoute.Add(action);
 
             if (!action.Selectors.Any())
             {
                 var abpServiceSelectorModel = new SelectorModel
                 {
-                    AttributeRouteModel = new AttributeRouteModel(
-                        new RouteAttribute(template: actionApiDescriptionModel.Url)
-                    ),
+                    AttributeRouteModel = new AttributeRouteModel(new RouteAttribute(template: actionApiDescriptionModel.Url)),
                     ActionConstraints = { new HttpMethodActionConstraint(new[] { actionApiDescriptionModel.HttpMethod }) }
                 };
 
@@ -142,9 +142,7 @@ namespace Volo.Abp.Http.Client.Web.Conventions
 
                     if (selector.AttributeRouteModel == null)
                     {
-                        selector.AttributeRouteModel = new AttributeRouteModel(
-                            new RouteAttribute(template: actionApiDescriptionModel.Url)
-                        );
+                        selector.AttributeRouteModel = new AttributeRouteModel(new RouteAttribute(template: actionApiDescriptionModel.Url));
                     }
 
                     if (!selector.ActionConstraints.OfType<HttpMethodActionConstraint>().Any())
@@ -157,14 +155,17 @@ namespace Volo.Abp.Http.Client.Web.Conventions
 
         protected virtual void ConfigureClientProxyApiExplorer(ControllerModel controller)
         {
-            if (controller.ApiExplorer.GroupName.IsNullOrEmpty())
+            if (ControllerWithAttributeRoute.Contains(controller))
             {
-                controller.ApiExplorer.GroupName = controller.ControllerName;
-            }
+                if (controller.ApiExplorer.GroupName.IsNullOrEmpty())
+                {
+                    controller.ApiExplorer.GroupName = controller.ControllerName;
+                }
 
-            if (controller.ApiExplorer.IsVisible == null)
-            {
-                controller.ApiExplorer.IsVisible = IsVisibleRemoteService(controller.ControllerType);
+                if (controller.ApiExplorer.IsVisible == null)
+                {
+                    controller.ApiExplorer.IsVisible = IsVisibleRemoteService(controller.ControllerType);
+                }
             }
 
             foreach (var action in controller.Actions)

From eae8d6340fe2a63cc6ccb78cf3675044d02edd02 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 30 Dec 2021 12:14:02 +0800
Subject: [PATCH 04/12] Publish event when uow completed,

Resolve #11100
---
 .../Distributed/LocalDistributedEventBus.cs   | 56 ++++++++++++---
 .../LocalDistributedEventBus_Test.cs          | 72 ++++++++++++++++++-
 2 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs
index d5dd961802..3389c2d243 100644
--- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs
+++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.Collections;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Local;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.EventBus.Distributed
 {
@@ -15,16 +16,19 @@ namespace Volo.Abp.EventBus.Distributed
     {
         private readonly ILocalEventBus _localEventBus;
 
+        protected IUnitOfWorkManager UnitOfWorkManager { get; }
         protected IServiceScopeFactory ServiceScopeFactory { get; }
 
         protected AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; }
 
         public LocalDistributedEventBus(
             ILocalEventBus localEventBus,
+            IUnitOfWorkManager unitOfWorkManager,
             IServiceScopeFactory serviceScopeFactory,
             IOptions<AbpDistributedEventBusOptions> distributedEventBusOptions)
         {
             _localEventBus = localEventBus;
+            UnitOfWorkManager = unitOfWorkManager;
             ServiceScopeFactory = serviceScopeFactory;
             AbpDistributedEventBusOptions = distributedEventBusOptions.Value;
             Subscribe(distributedEventBusOptions.Value.Handlers);
@@ -122,25 +126,57 @@ namespace Volo.Abp.EventBus.Distributed
             _localEventBus.UnsubscribeAll(eventType);
         }
 
-        public Task PublishAsync<TEvent>(TEvent eventData, bool onUnitOfWorkComplete = true)
+        public async Task PublishAsync<TEvent>(TEvent eventData, bool onUnitOfWorkComplete = true)
             where TEvent : class
         {
-            return _localEventBus.PublishAsync(eventData, onUnitOfWorkComplete);
+            await PublishAsync(typeof(TEvent), eventData, onUnitOfWorkComplete);
         }
 
-        public Task PublishAsync(Type eventType, object eventData, bool onUnitOfWorkComplete = true)
+        public async Task PublishAsync(Type eventType, object eventData, bool onUnitOfWorkComplete = true)
         {
-            return _localEventBus.PublishAsync(eventType, eventData, onUnitOfWorkComplete);
+            if (onUnitOfWorkComplete && UnitOfWorkManager.Current != null)
+            {
+                AddToUnitOfWork(
+                    UnitOfWorkManager.Current,
+                    new UnitOfWorkEventRecord(eventType, eventData, EventOrderGenerator.GetNext())
+                );
+                return;
+            }
+
+            await _localEventBus.PublishAsync(eventType, eventData, onUnitOfWorkComplete: false);
+        }
+
+        public async Task PublishAsync<TEvent>(TEvent eventData, bool onUnitOfWorkComplete = true, bool useOutbox = true)
+            where TEvent : class
+        {
+            await PublishAsync(typeof(TEvent), eventData, onUnitOfWorkComplete, useOutbox);
         }
-        
-        public Task PublishAsync<TEvent>(TEvent eventData, bool onUnitOfWorkComplete = true, bool useOutbox = true) where TEvent : class
+
+        public async Task PublishAsync(Type eventType, object eventData, bool onUnitOfWorkComplete = true, bool useOutbox = true)
         {
-            return _localEventBus.PublishAsync(eventData, onUnitOfWorkComplete);
+            if (onUnitOfWorkComplete && UnitOfWorkManager.Current != null)
+            {
+                AddToUnitOfWork(
+                    UnitOfWorkManager.Current,
+                    new UnitOfWorkEventRecord(eventType, eventData, EventOrderGenerator.GetNext(), useOutbox)
+                );
+                return;
+            }
+
+            if (useOutbox && UnitOfWorkManager.Current != null)
+            {
+                UnitOfWorkManager.Current.OnCompleted(async() => {
+                    await _localEventBus.PublishAsync(eventType, eventData, onUnitOfWorkComplete: false);
+                });
+                return;
+            }
+
+            await _localEventBus.PublishAsync(eventType, eventData, onUnitOfWorkComplete: false);
         }
 
-        public Task PublishAsync(Type eventType, object eventData, bool onUnitOfWorkComplete = true, bool useOutbox = true)
+        protected virtual void AddToUnitOfWork(IUnitOfWork unitOfWork, UnitOfWorkEventRecord eventRecord)
         {
-            return _localEventBus.PublishAsync(eventType, eventData, onUnitOfWorkComplete);
+            unitOfWork.AddOrReplaceDistributedEvent(eventRecord);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus_Test.cs b/framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus_Test.cs
index 5bea07fc44..9d768f1054 100644
--- a/framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus_Test.cs
+++ b/framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus_Test.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Threading.Tasks;
+using Shouldly;
 using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Uow;
 using Xunit;
 
 namespace Volo.Abp.EventBus.Distributed
@@ -44,12 +46,12 @@ namespace Volo.Abp.EventBus.Distributed
 
             Assert.Equal(tenantId, MySimpleDistributedSingleInstanceEventHandler.TenantId);
         }
-        
+
         [Fact]
         public async Task Should_Get_TenantId_From_EventEto_Extra_Property()
         {
             var tenantId = Guid.NewGuid();
-            
+
             DistributedEventBus.Subscribe<MySimpleEto>(GetRequiredService<MySimpleDistributedSingleInstanceEventHandler>());
 
             await DistributedEventBus.PublishAsync(new MySimpleEto
@@ -59,8 +61,72 @@ namespace Volo.Abp.EventBus.Distributed
                     {"TenantId", tenantId.ToString()}
                 }
             });
-            
+
             Assert.Equal(tenantId, MySimpleDistributedSingleInstanceEventHandler.TenantId);
         }
+
+        [Fact]
+        public async Task Event_Should_Published_On_UnitOfWorkComplete()
+        {
+            var id = 0;
+            DistributedEventBus.Subscribe<MySimpleEventData>(data =>
+            {
+                id = data.Value;
+                return Task.CompletedTask;
+            });
+
+            var unitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
+            using (var uow = unitOfWorkManager.Begin())
+            {
+                await DistributedEventBus.PublishAsync(new MySimpleEventData(3), onUnitOfWorkComplete: true, useOutbox: false);
+            }
+            id.ShouldBe(0);
+
+            using (var uow = unitOfWorkManager.Begin())
+            {
+                await DistributedEventBus.PublishAsync(new MySimpleEventData(3), onUnitOfWorkComplete: true, useOutbox: false);
+                await uow.CompleteAsync();
+            }
+            id.ShouldBe(3);
+
+            id = 0;
+            using (var uow = unitOfWorkManager.Begin())
+            {
+                await DistributedEventBus.PublishAsync(new MySimpleEventData(3), onUnitOfWorkComplete: false, useOutbox: false);
+            }
+            id.ShouldBe(3);
+        }
+
+        [Fact]
+        public async Task Event_Should_Published_On_UnitOfWorkComplete_UseOutbox()
+        {
+            var id = 0;
+            DistributedEventBus.Subscribe<MySimpleEventData>(data =>
+            {
+                id = data.Value;
+                return Task.CompletedTask;
+            });
+
+            var unitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
+            using (var uow = unitOfWorkManager.Begin())
+            {
+                await DistributedEventBus.PublishAsync(new MySimpleEventData(3), onUnitOfWorkComplete: false, useOutbox: true);
+            }
+            id.ShouldBe(0);
+
+            using (var uow = unitOfWorkManager.Begin())
+            {
+                await DistributedEventBus.PublishAsync(new MySimpleEventData(3), onUnitOfWorkComplete: false, useOutbox: true);
+                await uow.CompleteAsync();
+            }
+            id.ShouldBe(3);
+
+            id = 0;
+            using (var uow = unitOfWorkManager.Begin())
+            {
+                await DistributedEventBus.PublishAsync(new MySimpleEventData(3), onUnitOfWorkComplete: false, useOutbox: false);
+            }
+            id.ShouldBe(3);
+        }
     }
 }

From b75b633e6d5c4da8e4b03d5068b9deb286695178 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Thu, 30 Dec 2021 15:21:33 +0800
Subject: [PATCH 05/12] Make generate-proxy.json files embedded

---
 .../Volo.Abp.Account.HttpApi.Client.csproj                   | 5 +++++
 .../Volo.Blogging.Admin.HttpApi.Client.csproj                | 5 +++++
 .../Volo.Blogging.HttpApi.Client.csproj                      | 5 +++++
 .../Volo.CmsKit.Admin.HttpApi.Client.csproj                  | 5 +++++
 .../Volo.CmsKit.Common.HttpApi.Client.csproj                 | 5 +++++
 .../Volo.CmsKit.HttpApi.Client.csproj                        | 5 +++++
 .../Volo.CmsKit.Public.HttpApi.Client.csproj                 | 5 +++++
 .../Volo.Docs.Admin.HttpApi.Client.csproj                    | 5 +++++
 .../Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj | 5 +++++
 .../Volo.Abp.FeatureManagement.HttpApi.Client.csproj         | 5 +++++
 .../Volo.Abp.Identity.HttpApi.Client.csproj                  | 5 +++++
 .../Volo.Abp.PermissionManagement.HttpApi.Client.csproj      | 5 +++++
 .../Volo.Abp.SettingManagement.HttpApi.Client.csproj         | 5 +++++
 .../Volo.Abp.TenantManagement.HttpApi.Client.csproj          | 5 +++++
 14 files changed, 70 insertions(+)

diff --git a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj
index aef884dbe2..b42d191b62 100644
--- a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj
+++ b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj
@@ -15,4 +15,9 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj
index 55b11f728d..20fba0d22b 100644
--- a/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj
+++ b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj
@@ -15,4 +15,9 @@
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
     </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj
index 68b3775baa..941afd504f 100644
--- a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj
+++ b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj
@@ -15,4 +15,9 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
index 1fb91747a2..171bc7d71f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
@@ -13,4 +13,9 @@
     <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi.Client\Volo.CmsKit.Common.HttpApi.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj
index dd5b656fb6..e02fa708c7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj
@@ -13,4 +13,9 @@
         <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
     </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
index 1d2f34b26c..11b9ad7422 100644
--- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
@@ -14,4 +14,9 @@
     <ProjectReference Include="..\Volo.CmsKit.Public.HttpApi.Client\Volo.CmsKit.Public.HttpApi.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
index 74087990f5..bc4b6c59fd 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
@@ -13,4 +13,9 @@
     <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
index 00b0e26d75..2344d6d3f9 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
@@ -16,4 +16,9 @@
 
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
index ed9acfaf20..11e24755d7 100644
--- a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
+++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
@@ -15,4 +15,9 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj
index a6dd5772e8..1d52c65e1f 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj
@@ -13,4 +13,9 @@
     <ProjectReference Include="..\Volo.Abp.FeatureManagement.Application.Contracts\Volo.Abp.FeatureManagement.Application.Contracts.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj
index 5bff2432a7..d2eff9ffd5 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj
@@ -19,4 +19,9 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj
index a198deb9eb..e2bd86a8cf 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj
@@ -19,4 +19,9 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj
index 26c0fd77f7..403605c1f5 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj
@@ -13,4 +13,9 @@
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
     </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj
index 6e60e283ad..3049906edb 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj
@@ -19,4 +19,9 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>

From a80bce697d65eb89e5b307b3054ec3479e1d9226 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 30 Dec 2021 15:31:17 +0800
Subject: [PATCH 06/12] Get the configured actions in advance.

---
 .../Volo/Abp/Options/PreConfigureActionList.cs           | 9 ++++++++-
 .../Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs    | 7 +++----
 .../Volo/Abp/Hangfire/AbpHangfireModule.cs               | 3 ++-
 .../src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs     | 5 ++---
 .../Versioning/AbpAspNetCoreMvcVersioningTestModule.cs   | 6 +++---
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs
index 00222d6399..30b96eac2c 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs
@@ -12,5 +12,12 @@ namespace Volo.Abp.Options
                 action(options);
             }
         }
+
+        public TOptions Configure()
+        {
+            var options = Activator.CreateInstance<TOptions>();
+            Configure(options);
+            return options;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs
index 1ad835c122..806d60bb13 100644
--- a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs
+++ b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs
@@ -11,18 +11,17 @@ namespace Volo.Abp.EventBus.Rebus
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var options = context.Services.ExecutePreConfiguredActions<AbpRebusEventBusOptions>();;
-
             context.Services.AddTransient(typeof(IHandleMessages<>), typeof(RebusDistributedEventHandlerAdapter<>));
 
+            var preActions = context.Services.GetPreConfigureActions<AbpRebusEventBusOptions>();
             Configure<AbpRebusEventBusOptions>(rebusOptions =>
             {
-                context.Services.ExecutePreConfiguredActions(rebusOptions);
+                preActions.Configure(rebusOptions);
             });
 
             context.Services.AddRebus(configure =>
             {
-                options.Configurer?.Invoke(configure);
+                preActions.Configure().Configurer?.Invoke(configure);
                 return configure;
             });
         }
diff --git a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs
index 1628d2f37f..3cfe62f13d 100644
--- a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs
+++ b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs
@@ -13,9 +13,10 @@ namespace Volo.Abp.Hangfire
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            var preActions = context.Services.GetPreConfigureActions<IGlobalConfiguration>();
             context.Services.AddHangfire(configuration =>
             {
-                context.Services.ExecutePreConfiguredActions(configuration);
+                preActions.Configure(configuration);
             });
         }
 
diff --git a/framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs b/framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs
index a4a08ce274..4e92d7e3b5 100644
--- a/framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs
+++ b/framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs
@@ -16,12 +16,11 @@ namespace Volo.Abp.Json
             context.Services.TryAddEnumerable(ServiceDescriptor
                 .Transient<IConfigureOptions<AbpSystemTextJsonSerializerOptions>, AbpSystemTextJsonSerializerOptionsSetup>());
 
+            var preActions = context.Services.GetPreConfigureActions<AbpJsonOptions>();
             Configure<AbpJsonOptions>(options =>
             {
                 options.Providers.Add<AbpNewtonsoftJsonSerializerProvider>();
-
-                var abpJsonOptions = context.Services.ExecutePreConfiguredActions<AbpJsonOptions>();
-                if (abpJsonOptions.UseHybridSerializer)
+                if (preActions.Configure().UseHybridSerializer)
                 {
                     options.Providers.Add<AbpSystemTextJsonSerializerProvider>();
                 }
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs
index 4e28d77a0a..8e7ed9bba2 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs
@@ -38,9 +38,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            var preActions = context.Services.GetPreConfigureActions<AbpAspNetCoreMvcOptions>();
             Configure<AbpAspNetCoreMvcOptions>(options =>
             {
-                context.Services.ExecutePreConfiguredActions(options);
+                preActions.Configure(options);
             });
 
             context.Services.AddAbpApiVersioning(options =>
@@ -51,8 +52,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning
                 //options.ApiVersionReader = new HeaderApiVersionReader("api-version"); //Supports header too
                 //options.ApiVersionReader = new MediaTypeApiVersionReader(); //Supports accept header too
 
-                var mvcOptions = context.Services.ExecutePreConfiguredActions<AbpAspNetCoreMvcOptions>();
-                options.ConfigureAbp(mvcOptions);
+                options.ConfigureAbp(preActions.Configure());
             });
 
             context.Services.AddHttpClientProxies(typeof(AbpAspNetCoreMvcVersioningTestModule).Assembly);

From d7503ba0eab56a42e25d6fa14474302dad5d4cb7 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Thu, 30 Dec 2021 15:21:33 +0800
Subject: [PATCH 07/12] Revert "Make generate-proxy.json files embedded"

This reverts commit b75b633e6d5c4da8e4b03d5068b9deb286695178.
---
 .../Volo.Abp.Account.HttpApi.Client.csproj                   | 5 -----
 .../Volo.Blogging.Admin.HttpApi.Client.csproj                | 5 -----
 .../Volo.Blogging.HttpApi.Client.csproj                      | 5 -----
 .../Volo.CmsKit.Admin.HttpApi.Client.csproj                  | 5 -----
 .../Volo.CmsKit.Common.HttpApi.Client.csproj                 | 5 -----
 .../Volo.CmsKit.HttpApi.Client.csproj                        | 5 -----
 .../Volo.CmsKit.Public.HttpApi.Client.csproj                 | 5 -----
 .../Volo.Docs.Admin.HttpApi.Client.csproj                    | 5 -----
 .../Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj | 5 -----
 .../Volo.Abp.FeatureManagement.HttpApi.Client.csproj         | 5 -----
 .../Volo.Abp.Identity.HttpApi.Client.csproj                  | 5 -----
 .../Volo.Abp.PermissionManagement.HttpApi.Client.csproj      | 5 -----
 .../Volo.Abp.SettingManagement.HttpApi.Client.csproj         | 5 -----
 .../Volo.Abp.TenantManagement.HttpApi.Client.csproj          | 5 -----
 14 files changed, 70 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj
index b42d191b62..aef884dbe2 100644
--- a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj
+++ b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj
@@ -15,9 +15,4 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj
index 20fba0d22b..55b11f728d 100644
--- a/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj
+++ b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.csproj
@@ -15,9 +15,4 @@
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
     </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj
index 941afd504f..68b3775baa 100644
--- a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj
+++ b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj
@@ -15,9 +15,4 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
index 171bc7d71f..1fb91747a2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
@@ -13,9 +13,4 @@
     <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi.Client\Volo.CmsKit.Common.HttpApi.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj
index e02fa708c7..dd5b656fb6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.csproj
@@ -13,9 +13,4 @@
         <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
     </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
index 11b9ad7422..1d2f34b26c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
@@ -14,9 +14,4 @@
     <ProjectReference Include="..\Volo.CmsKit.Public.HttpApi.Client\Volo.CmsKit.Public.HttpApi.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
index bc4b6c59fd..74087990f5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
@@ -13,9 +13,4 @@
     <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
index 2344d6d3f9..00b0e26d75 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
@@ -16,9 +16,4 @@
 
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
index 11e24755d7..ed9acfaf20 100644
--- a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
+++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
@@ -15,9 +15,4 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj
index 1d52c65e1f..a6dd5772e8 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.csproj
@@ -13,9 +13,4 @@
     <ProjectReference Include="..\Volo.Abp.FeatureManagement.Application.Contracts\Volo.Abp.FeatureManagement.Application.Contracts.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj
index d2eff9ffd5..5bff2432a7 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj
@@ -19,9 +19,4 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj
index e2bd86a8cf..a198deb9eb 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.csproj
@@ -19,9 +19,4 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj
index 403605c1f5..26c0fd77f7 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.csproj
@@ -13,9 +13,4 @@
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
     </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj
index 3049906edb..6e60e283ad 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.csproj
@@ -19,9 +19,4 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
 </Project>

From cb0b7233eafcb87c1d6c4f13b5c2868074e8521c Mon Sep 17 00:00:00 2001
From: Luke Ni <ning.ni@commscope.com>
Date: Thu, 30 Dec 2021 15:53:09 +0800
Subject: [PATCH 08/12] translate to zh-Hans

---
 docs/zh-Hans/Tutorials/Part-7.md              | 239 +++++++++++++++++-
 .../bookstore-efcore-migration-authors.png    | Bin 0 -> 7937 bytes
 2 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 docs/zh-Hans/Tutorials/images/bookstore-efcore-migration-authors.png

diff --git a/docs/zh-Hans/Tutorials/Part-7.md b/docs/zh-Hans/Tutorials/Part-7.md
index 602306c484..95b016e451 100644
--- a/docs/zh-Hans/Tutorials/Part-7.md
+++ b/docs/zh-Hans/Tutorials/Part-7.md
@@ -1 +1,238 @@
-TODO..
\ No newline at end of file
+# Web应用程序开发教程 - 第七章: 数据库集成
+````json
+//[doc-params]
+{
+    "UI": ["MVC","Blazor","BlazorServer","NG"],
+    "DB": ["EF","Mongo"]
+}
+````
+## 关于本教程
+
+在本系列教程中, 你将构建一个名为 `Acme.BookStore` 的用于管理书籍及其作者列表的基于ABP的应用程序.  它是使用以下技术开发的:
+
+* **{{DB_Text}}** 做为ORM提供程序.
+* **{{UI_Value}}** 做为UI框架.
+
+本教程分为以下部分:
+
+- [Part 1: 创建服务端](Part-1.md)
+- [Part 2: 图书列表页面](Part-2.md)
+- [Part 3: 创建,更新和删除图书](Part-2.md)
+- [Part 4: 集成测试](Part-4.md)
+- [Part 5: 授权](Part-5.md)
+- [Part 6: 作者: 领域层](Part-6.md)
+- **Part 7: 数据库集成**(本章)
+- [Part 8: 作者: 应用服务层](Part-8.md)
+- [Part 9: 作者: 用户页面](Part-9.md)
+- [Part 10: 图书到作者的关系](Part-10.md)
+
+## 下载源码
+
+本教程根据你的**UI** 和 **数据库**偏好有多个版本,我们准备了几种可供下载的源码组合:
+
+* [MVC (Razor Pages) UI 与 EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
+* [Blazor UI 与 EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
+* [Angular UI 与 MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
+
+> 如果你在Windows中遇到 "文件名太长" or "解压错误", 很可能与Windows最大文件路径限制有关. Windows文件路径的最大长度为250字符. 为了解决这个问题,参阅 [在Windows 10中启用长路径](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> 如果你遇到与Git相关的长路径错误, 尝试使用下面的命令在Windows中启用长路径. 参阅 https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
+## 简介
+
+这章阐述如何为前一章介绍的 `作者` 实体配置数据库集成.
+
+{{if DB=="EF"}}
+
+## DB Context
+
+打开 `Acme.BookStore.EntityFrameworkCore` 项目中的 `BookStoreDbContext` 加入 `DbSet` 属性:
+
+````csharp
+public DbSet<Author> Authors { get; set; }
+````
+
+定位到相同项目中的 `BookStoreDbContext` 类中的 `OnModelCreating` 方法, 加入以下代码到方法的结尾:
+
+````csharp
+builder.Entity<Author>(b =>
+{
+    b.ToTable(BookStoreConsts.DbTablePrefix + "Authors",
+        BookStoreConsts.DbSchema);
+
+    b.ConfigureByConvention();
+
+    b.Property(x => x.Name)
+        .IsRequired()
+        .HasMaxLength(AuthorConsts.MaxNameLength);
+
+    b.HasIndex(x => x.Name);
+});
+````
+
+这和前面的 `Book` 实体做的一样, 所以不再赘述.
+
+## 创建数据库迁移
+
+配置启动解决方案为使用 [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). 因为我们还没有修改数据库映射配置，所以需要创建一个新的迁移并对数据库应用变更.
+
+打开命令行终端, 切换当前目录为 `Acme.BookStore.EntityFrameworkCore` 项目目录, 输入以下命令:
+
+````bash
+dotnet ef migrations add Added_Authors
+````
+
+这会在项目中添加一个迁移类:
+
+![bookstore-efcore-migration-authors](./images/bookstore-efcore-migration-authors.png)
+
+你可以在同一个命令行终端中使用以下命令对数据库应用更改:
+
+````bash
+dotnet ef database update
+````
+
+> 如果你使用 Visual Studio, 可能希望在 *Package Manager Console (PMC)* 使用 `Add-Migration Added_Authors -c BookStoreMigrationsDbContext` 和 `Update-Database -c BookStoreMigrationsDbContext` 命令. 如果这样, 保证 {{if UI=="MVC"}}`Acme.BookStore.Web`{{else if UI=="BlazorServer"}}`Acme.BookStore.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`Acme.BookStore.HttpApi.Host`{{end}} 是启动项目并且在PMC中 `Acme.BookStore.EntityFrameworkCore` 是 *默认项目* .
+
+{{else if DB=="Mongo"}}
+
+## DB Context
+
+打开 `Acme.BookStore.MongoDB` 项目 `MongoDb 文件夹`中的 `BookStoreMongoDbContext`, 在类中加入以下属性:
+
+````csharp
+public IMongoCollection<Author> Authors => Collection<Author>();
+````
+
+{{end}}
+
+## 实现 IAuthorRepository
+
+{{if DB=="EF"}}
+
+在 `Acme.BookStore.EntityFrameworkCore` 项目 (`Authors` 文件夹)中创建一个新类 `EfCoreAuthorRepository`, 粘贴以下代码:
+
+````csharp
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading.Tasks;
+using Acme.BookStore.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Acme.BookStore.Authors
+{
+    public class EfCoreAuthorRepository
+        : EfCoreRepository<BookStoreDbContext, Author, Guid>,
+            IAuthorRepository
+    {
+        public EfCoreAuthorRepository(
+            IDbContextProvider<BookStoreDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public async Task<Author> FindByNameAsync(string name)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet.FirstOrDefaultAsync(author => author.Name == name);
+        }
+
+        public async Task<List<Author>> GetListAsync(
+            int skipCount,
+            int maxResultCount,
+            string sorting,
+            string filter = null)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet
+                .WhereIf(
+                    !filter.IsNullOrWhiteSpace(),
+                    author => author.Name.Contains(filter)
+                 )
+                .OrderBy(sorting)
+                .Skip(skipCount)
+                .Take(maxResultCount)
+                .ToListAsync();
+        }
+    }
+}
+````
+
+* 继承自 `EfCoreRepository`, 所以继承了标准repository的方法实现.
+* `WhereIf` 是ABP 框架的快捷扩展方法. 它仅当第一个条件满足时, 执行 `Where` 查询. (根据名字查询, 仅当 filter 不为空). 你可以不使用这个方法, 但这些快捷方法可以提高效率.
+* `sorting` 可以是一个字符串, 如 `Name`, `Name ASC` 或 `Name DESC`. 通过使用 [System.Linq.Dynamic.Core](https://www.nuget.org/packages/System.Linq.Dynamic.Core) NuGet 包是可能的.
+
+> 参阅 [EF Core 集成文档](../Entity-Framework-Core.md) 获得基于EF Core的repositories的更多信息.
+
+{{else if DB=="Mongo"}}
+
+在 `Acme.BookStore.MongoDB` 项目 (`Authors` 文件夹)中创建一个新类 `MongoDbAuthorRepository`, 粘贴以下代码:
+
+```csharp
+using System;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Acme.BookStore.MongoDB;
+using MongoDB.Driver;
+using MongoDB.Driver.Linq;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+
+namespace Acme.BookStore.Authors
+{
+    public class MongoDbAuthorRepository
+        : MongoDbRepository<BookStoreMongoDbContext, Author, Guid>,
+        IAuthorRepository
+    {
+        public MongoDbAuthorRepository(
+            IMongoDbContextProvider<BookStoreMongoDbContext> dbContextProvider
+            ) : base(dbContextProvider)
+        {
+        }
+
+        public async Task<Author> FindByNameAsync(string name)
+        {
+            var queryable = await GetMongoQueryableAsync();
+            return await queryable.FirstOrDefaultAsync(author => author.Name == name);
+        }
+
+        public async Task<List<Author>> GetListAsync(
+            int skipCount,
+            int maxResultCount,
+            string sorting,
+            string filter = null)
+        {
+            var queryable = await GetMongoQueryableAsync();
+            return await queryable
+                .WhereIf<Author, IMongoQueryable<Author>>(
+                    !filter.IsNullOrWhiteSpace(),
+                    author => author.Name.Contains(filter)
+                )
+                .OrderBy(sorting)
+                .As<IMongoQueryable<Author>>()
+                .Skip(skipCount)
+                .Take(maxResultCount)
+                .ToListAsync();
+        }
+    }
+}
+```
+
+* 继承自 `MongoDbRepository`, 所以继承了标准repository的方法实现.
+* `WhereIf` 是ABP 框架的快捷扩展方法. 它仅当第一个条件满足时, 执行 `Where` 查询. (根据名字查询, 仅当 filter 不为空). 你可以不使用这个方法, 但这些快捷方法可以提高效率.
+* `sorting` 可以是一个字符串, 如 `Name`, `Name ASC` 或 `Name DESC`. 通过使用 [System.Linq.Dynamic.Core](https://www.nuget.org/packages/System.Linq.Dynamic.Core) NuGet 包是可能的.
+
+> 参阅 [MongoDB 集成文档](../MongoDB.md) 获得基于MongoDB的repositories的更多信息.
+
+{{end}}
+
+## 下一章
+
+查看本教程的[下一章](Part-8.md).
diff --git a/docs/zh-Hans/Tutorials/images/bookstore-efcore-migration-authors.png b/docs/zh-Hans/Tutorials/images/bookstore-efcore-migration-authors.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cfb29f86f8d2d54e6cfbfe85f973525179ec51d
GIT binary patch
literal 7937
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
M$3(m4uH)1H0|TMr3;+NC

literal 0
HcmV?d00001


From b4e4c92ffc42803585b3266ad07020cab83efd9c Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Thu, 30 Dec 2021 16:34:11 +0800
Subject: [PATCH 09/12] Add MakeProxyJsonFileEmbeddedStep

---
 .../ModuleProjectBuildPipelineBuilder.cs      |  1 +
 .../Steps/MakeProxyJsonFileEmbeddedStep.cs    | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MakeProxyJsonFileEmbeddedStep.cs

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs
index d4a74d9364..a5f5cb6d7d 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs
@@ -12,6 +12,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
             pipeline.Steps.Add(new FileEntryListReadStep());
             pipeline.Steps.Add(new ProjectReferenceReplaceStep());
             pipeline.Steps.Add(new ReplaceCommonPropsStep());
+            pipeline.Steps.Add(new MakeProxyJsonFileEmbeddedStep());
             pipeline.Steps.Add(new ReplaceConfigureAwaitPropsStep());
             pipeline.Steps.Add(new UpdateNuGetConfigStep("/NuGet.Config"));
             pipeline.Steps.Add(new CreateProjectResultZipStep());
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MakeProxyJsonFileEmbeddedStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MakeProxyJsonFileEmbeddedStep.cs
new file mode 100644
index 0000000000..f8de452172
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MakeProxyJsonFileEmbeddedStep.cs
@@ -0,0 +1,38 @@
+using System.Linq;
+using System.Xml.Linq;
+using Volo.Abp.Cli.Utils;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+public class MakeProxyJsonFileEmbeddedStep : ProjectBuildPipelineStep
+{
+    public override void Execute(ProjectBuildContext context)
+    {
+        foreach (var file in context.Files.Where(x => x.Name.EndsWith(".HttpApi.Client.csproj")))
+        {
+            using (var stream = StreamHelper.GenerateStreamFromString(file.Content))
+            {
+                var doc = XDocument.Load(stream);
+
+                if (doc.Root == null)
+                {
+                    continue;
+                }
+
+                var itemGroupNode =
+                    new XElement("ItemGroup",
+                        new XElement("EmbeddedResource",
+                            new XAttribute("Include", @"**\*generate-proxy.json")
+                        ),
+                        new XElement("Content",
+                            new XAttribute("Remove", @"**\*generate-proxy.json")
+                        )
+                    );
+
+                doc.Root.Add(itemGroupNode);
+
+                file.SetContent(doc.ToString());
+            }
+        }
+    }
+}

From 9b6d427dc74d30868a5d658179a35a713c4c6da3 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 31 Dec 2021 10:36:39 +0800
Subject: [PATCH 10/12] Fix the problem of background workers integration

---
 .../Hangfire/AbpBackgroundWorkersHangfireModule.cs |  2 +-
 .../Hangfire/HangfireBackgroundWorkerManager.cs    | 14 +++++++++++---
 .../QuartzPeriodicBackgroundWorkerAdapter.cs       | 14 +++++++++++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs
index 4efbdcffb7..c454c9f6e6 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.BackgroundWorkers.Hangfire
     [DependsOn(
         typeof(AbpBackgroundWorkersModule),
         typeof(AbpHangfireModule))]
-    public class AbpBackgroundWorkerHangfireModule : AbpModule
+    public class AbpBackgroundWorkersHangfireModule : AbpModule
     {
         public override void OnPreApplicationInitialization(ApplicationInitializationContext context)
         {
diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs
index 272cc3cdcd..2a9cb33a10 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs
@@ -42,9 +42,17 @@ namespace Volo.Abp.BackgroundWorkers.Hangfire
 
                 if (worker is AsyncPeriodicBackgroundWorkerBase or PeriodicBackgroundWorkerBase)
                 {
-                    var timer = (AbpAsyncTimer) worker.GetType()
+                    var timer = worker.GetType()
                         .GetProperty("Timer", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(worker);
-                    period = timer?.Period;
+
+                    if (worker is AsyncPeriodicBackgroundWorkerBase)
+                    {
+                        period = ((AbpAsyncTimer)timer)?.Period;
+                    }
+                    else
+                    {
+                        period = ((AbpTimer)timer)?.Period;
+                    }
                 }
                 else
                 {
@@ -82,7 +90,7 @@ namespace Volo.Abp.BackgroundWorkers.Hangfire
             }
             else
             {
-                cron = $"0 0 */{time.TotalDays} * *";
+                throw new AbpException($"Cannot convert period: {period} to cron expression, use HangfireBackgroundWorkerBase to define worker");
             }
 
             return cron;
diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzPeriodicBackgroundWorkerAdapter.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzPeriodicBackgroundWorkerAdapter.cs
index aa99434ed5..16286d3153 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzPeriodicBackgroundWorkerAdapter.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzPeriodicBackgroundWorkerAdapter.cs
@@ -28,15 +28,23 @@ namespace Volo.Abp.BackgroundWorkers.Quartz
             int? period;
             var workerType = worker.GetType();
 
-            if (worker is AsyncPeriodicBackgroundWorkerBase || worker is PeriodicBackgroundWorkerBase)
+            if (worker is AsyncPeriodicBackgroundWorkerBase or PeriodicBackgroundWorkerBase)
             {
                 if (typeof(TWorker) != worker.GetType())
                 {
                     throw new ArgumentException($"{nameof(worker)} type is different from the generic type");
                 }
 
-                var timer = (AbpAsyncTimer) worker.GetType().GetProperty("Timer", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(worker);
-                period = timer?.Period;
+                var timer = worker.GetType().GetProperty("Timer", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(worker);
+
+                if (worker is AsyncPeriodicBackgroundWorkerBase)
+                {
+                    period = ((AbpAsyncTimer)timer)?.Period;
+                }
+                else
+                {
+                    period = ((AbpTimer)timer)?.Period;
+                }
             }
             else
             {

From 6cd448baa7b3aeb2928fd590e82258c7a1d8e074 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 31 Dec 2021 11:28:25 +0800
Subject: [PATCH 11/12] Update PreConfigureActionList.cs

---
 .../Volo/Abp/Options/PreConfigureActionList.cs       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs
index 4792cfc668..bf8bb90f55 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Options/PreConfigureActionList.cs
@@ -11,12 +11,12 @@ public class PreConfigureActionList<TOptions> : List<Action<TOptions>>
         {
             action(options);
         }
+    }
 
-        public TOptions Configure()
-        {
-            var options = Activator.CreateInstance<TOptions>();
-            Configure(options);
-            return options;
-        }
+    public TOptions Configure()
+    {
+        var options = Activator.CreateInstance<TOptions>();
+        Configure(options);
+        return options;
     }
 }

From e914ff859f3e9cbb0f630d376f7d7da27cd34fa6 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 31 Dec 2021 12:18:28 +0800
Subject: [PATCH 12/12] Update HangfireBackgroundWorkerManager.cs

---
 .../Hangfire/HangfireBackgroundWorkerManager.cs           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs
index e7c92f1296..33e0ebde4c 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs
@@ -21,7 +21,7 @@ public class HangfireBackgroundWorkerManager : IBackgroundWorkerManager, ISingle
         return Task.CompletedTask;
     }
 
-    public void Add(IBackgroundWorker worker)
+    public Task AddAsync(IBackgroundWorker worker)
     {
         if (worker is IHangfireBackgroundWorker hangfireBackgroundWorker)
         {
@@ -56,12 +56,12 @@ public class HangfireBackgroundWorkerManager : IBackgroundWorkerManager, ISingle
             }
             else
             {
-                return;
+                return Task.CompletedTask;
             }
 
             if (period == null)
             {
-                return;
+                return Task.CompletedTask;
             }
 
             var adapterType = typeof(HangfirePeriodicBackgroundWorkerAdapter<>).MakeGenericType(worker.GetType());
@@ -69,6 +69,8 @@ public class HangfireBackgroundWorkerManager : IBackgroundWorkerManager, ISingle
 
             RecurringJob.AddOrUpdate(() => workerAdapter.DoWorkAsync(), GetCron(period.Value));
         }
+
+        return Task.CompletedTask;
     }
 
     protected virtual string GetCron(int period)