From 175b6a416e813e963e88435ef415a719b129099b Mon Sep 17 00:00:00 2001
From: suravi999 <suravipk@gmail.com>
Date: Thu, 19 Mar 2020 20:17:28 +0530
Subject: [PATCH 01/68] Update Background-Jobs-Hangfire.md

Add Hangfire Configuration
---
 docs/en/Background-Jobs-Hangfire.md | 47 ++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/docs/en/Background-Jobs-Hangfire.md b/docs/en/Background-Jobs-Hangfire.md
index 588fcace9e..ebaf8271b8 100644
--- a/docs/en/Background-Jobs-Hangfire.md
+++ b/docs/en/Background-Jobs-Hangfire.md
@@ -39,5 +39,50 @@ public class YourModule : AbpModule
 ````
 
 ## Configuration
+You can install any storage for Hangfire. The most common one is SQL Server (see the [Hangfire.SqlServer](https://www.nuget.org/packages/Hangfire.SqlServer) NuGet package).
 
-TODO...
\ No newline at end of file
+After you have installed these NuGet packages, you need to configure your project to use Hangfire.
+
+1.First, we change the `<YourProjectName>HttpApiHostModule` class to add Hangfire configuration of the storage and connection string in the `ConfigureServices` method:
+
+
+````csharp
+  public override void ConfigureServices(ServiceConfigurationContext context)
+  {
+      var configuration = context.Services.GetConfiguration();
+      var hostingEnvironment = context.Services.GetHostingEnvironment();
+
+      //... other configarations 
+
+      ConfigureHangfire(context, configuration);
+  }
+
+  private void ConfigureHangfire(ServiceConfigurationContext context, IConfiguration configuration)
+  {
+      context.Services.AddHangfire(config =>
+      {
+          config.UsePostgreSqlStorage(configuration.GetConnectionString("Default"));
+      });
+  }
+````
+
+2. We need to add `UseHangfireServer` call in the Configure method in `Startup` class
+
+If you want to use hangfire's dashboard, you can add it, too: by `UseHangfireDashboard`
+
+````csharp
+ public class Startup
+ {
+     public void ConfigureServices(IServiceCollection services)
+     {
+         services.AddApplication<IOSampleAngulerHttpApiHostModule>();            
+     }
+
+     public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
+     {
+         app.InitializeApplication();
+         app.UseHangfireServer();
+         app.UseHangfireDashboard();
+     }
+ }
+````

From 0e70f9e9b6fc8fc19a8e88a4eaba8eccf9180e40 Mon Sep 17 00:00:00 2001
From: suravi999 <suravipk@gmail.com>
Date: Fri, 20 Mar 2020 12:33:59 +0530
Subject: [PATCH 02/68] Update Background-Jobs-Hangfire.md

Add requested changes in documentation.
---
 docs/en/Background-Jobs-Hangfire.md | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/docs/en/Background-Jobs-Hangfire.md b/docs/en/Background-Jobs-Hangfire.md
index ebaf8271b8..622558ac68 100644
--- a/docs/en/Background-Jobs-Hangfire.md
+++ b/docs/en/Background-Jobs-Hangfire.md
@@ -43,7 +43,7 @@ You can install any storage for Hangfire. The most common one is SQL Server (see
 
 After you have installed these NuGet packages, you need to configure your project to use Hangfire.
 
-1.First, we change the `<YourProjectName>HttpApiHostModule` class to add Hangfire configuration of the storage and connection string in the `ConfigureServices` method:
+1.First, we change the `Module` class (example: `<YourProjectName>HttpApiHostModule`) to add Hangfire configuration of the storage and connection string in the `ConfigureServices` method:
 
 
 ````csharp
@@ -61,28 +61,24 @@ After you have installed these NuGet packages, you need to configure your projec
   {
       context.Services.AddHangfire(config =>
       {
-          config.UsePostgreSqlStorage(configuration.GetConnectionString("Default"));
+          config.UseSqlServerStorage(configuration.GetConnectionString("Default"));
       });
   }
 ````
 
-2. We need to add `UseHangfireServer` call in the Configure method in `Startup` class
+2. We need to add `UseHangfireServer` call in the `OnApplicationInitialization` method in `Module` class
 
 If you want to use hangfire's dashboard, you can add it, too: by `UseHangfireDashboard`
 
 ````csharp
- public class Startup
+ public override void OnApplicationInitialization(ApplicationInitializationContext context)
  {
-     public void ConfigureServices(IServiceCollection services)
-     {
-         services.AddApplication<IOSampleAngulerHttpApiHostModule>();            
-     }
-
-     public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
-     {
-         app.InitializeApplication();
-         app.UseHangfireServer();
-         app.UseHangfireDashboard();
-     }
+    var app = context.GetApplicationBuilder();
+            
+    // ... others
+    
+    app.UseHangfireServer();
+    app.UseHangfireDashboard();
+ 
  }
 ````

From 3613f906627ea311a8dd89890051ac2cf2a28c76 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 21 Mar 2020 01:59:10 +0300
Subject: [PATCH 03/68] Added popover tag helper hoverable functionality

---
 .../TagHelpers/Popover/AbpPopoverTagHelper.cs          |  2 ++
 .../TagHelpers/Popover/AbpPopoverTagHelperService.cs   | 10 ++++++++++
 .../Pages/Components/Popovers.cshtml                   |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelper.cs
index d23ac6c912..dfa2c2cfb1 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelper.cs
@@ -18,6 +18,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
 
         public bool? Dismissible { get; set; }
 
+        public bool? Hoverable { get; set; }
+
         public string AbpPopover { get; set; }
 
         public string AbpPopoverRight { get; set; }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
index b7bda04134..de5e844888 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
@@ -23,6 +23,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
         protected virtual void SetDisabled(TagHelperContext context, TagHelperOutput output)
         {
             var triggerAsHtml = TagHelper.Dismissible ?? false ? "datatrigger=\"focus\" " : "";
+            // If not dismissable for hoverable condition
+            if (string.IsNullOrEmpty(triggerAsHtml))
+            {
+                triggerAsHtml = TagHelper.Hoverable ?? false ? "data-trigger=\"hover\" " : string.Empty;
+            }
             var dataPlacementAsHtml = "data-placement=\"" + GetDirectory().ToString().ToLowerInvariant() + "\" ";
             var titleAttribute = output.Attributes.FirstOrDefault(at => at.Name == "title");
             var titleAsHtml = titleAttribute == null ? "" : "title=\"" + titleAttribute.Value + "\" ";
@@ -40,6 +45,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
             if (TagHelper.Dismissible ?? false)
             {
                 output.Attributes.Add("data-trigger", "focus");
+            }
+            // Dismissible has priority over hoverable
+            else if (TagHelper.Hoverable ?? false)
+            {
+                output.Attributes.Add("data-trigger", "hover");
             }
         }
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
index b221ebc4f6..624f17cf20 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
@@ -36,7 +36,7 @@
         <abp-button abp-popover="Hi, i'm popover content!">
             Popover Default
         </abp-button>
-        <abp-button abp-popover-top="Hi, i'm popover content!" title="Popover Title">
+        <abp-button abp-popover-top="Hi, i'm popover content!" title="Popover Title" hoverable="true">
             Popover With Title
         </abp-button>
         <abp-button abp-popover-right="Hi, i'm popover content!" title="Popover Title" dismissible="true">

From c4a1dd6be70920ffd8d7fcf76ebcb973c948d010 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 23 Mar 2020 10:16:16 +0300
Subject: [PATCH 04/68] Update AbpPopoverTagHelperService.cs

---
 .../Popover/AbpPopoverTagHelperService.cs     | 218 +++++++++---------
 1 file changed, 109 insertions(+), 109 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
index de5e844888..168d2a5a96 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
@@ -1,115 +1,115 @@
-using System.Linq;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
-{
-    public class AbpPopoverTagHelperService : AbpTagHelperService<AbpPopoverTagHelper>
-    {
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            if (!TagHelper.Disabled ?? true)
-            {
-                SetDataToggle(context, output);
-                SetDataPlacement(context, output);
-                SetPopoverData(context, output);
-                SetDataTriggerIfDismissible(context, output);
-            }
-            else
-            {
-                SetDisabled(context, output);
-            }
-        }
-
-        protected virtual void SetDisabled(TagHelperContext context, TagHelperOutput output)
-        {
-            var triggerAsHtml = TagHelper.Dismissible ?? false ? "datatrigger=\"focus\" " : "";
-            // If not dismissable for hoverable condition
+using System.Linq;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
+{
+    public class AbpPopoverTagHelperService : AbpTagHelperService<AbpPopoverTagHelper>
+    {
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (!TagHelper.Disabled ?? true)
+            {
+                SetDataToggle(context, output);
+                SetDataPlacement(context, output);
+                SetPopoverData(context, output);
+                SetDataTriggerIfDismissible(context, output);
+            }
+            else
+            {
+                SetDisabled(context, output);
+            }
+        }
+
+        protected virtual void SetDisabled(TagHelperContext context, TagHelperOutput output)
+        {
+            var triggerAsHtml = TagHelper.Dismissible ?? false ? "data-trigger=\"focus\" " : "";
+            // If not dismissable for hoverable condition
             if (string.IsNullOrEmpty(triggerAsHtml))
             {
                 triggerAsHtml = TagHelper.Hoverable ?? false ? "data-trigger=\"hover\" " : string.Empty;
-            }
-            var dataPlacementAsHtml = "data-placement=\"" + GetDirectory().ToString().ToLowerInvariant() + "\" ";
-            var titleAttribute = output.Attributes.FirstOrDefault(at => at.Name == "title");
-            var titleAsHtml = titleAttribute == null ? "" : "title=\"" + titleAttribute.Value + "\" ";
-            var preElementHtml = "<span class=\"d-inline-block\" " + titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" + GetDataContent() + "\">";
-            var postElementHtml = "</span>";
-
-            output.PreElement.SetHtmlContent(preElementHtml);
-            output.PostElement.SetHtmlContent(postElementHtml);
-
-            output.Attributes.Add("style", "pointer-events: none;");
-        }
-
-        protected virtual void SetDataTriggerIfDismissible(TagHelperContext context, TagHelperOutput output)
-        {
-            if (TagHelper.Dismissible ?? false)
-            {
-                output.Attributes.Add("data-trigger", "focus");
+            }
+            var dataPlacementAsHtml = "data-placement=\"" + GetDirectory().ToString().ToLowerInvariant() + "\" ";
+            var titleAttribute = output.Attributes.FirstOrDefault(at => at.Name == "title");
+            var titleAsHtml = titleAttribute == null ? "" : "title=\"" + titleAttribute.Value + "\" ";
+            var preElementHtml = "<span class=\"d-inline-block\" " + titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" + GetDataContent() + "\">";
+            var postElementHtml = "</span>";
+
+            output.PreElement.SetHtmlContent(preElementHtml);
+            output.PostElement.SetHtmlContent(postElementHtml);
+
+            output.Attributes.Add("style", "pointer-events: none;");
+        }
+
+        protected virtual void SetDataTriggerIfDismissible(TagHelperContext context, TagHelperOutput output)
+        {
+            if (TagHelper.Dismissible ?? false)
+            {
+                output.Attributes.Add("data-trigger", "focus");
             }
             // Dismissible has priority over hoverable
             else if (TagHelper.Hoverable ?? false)
-            {
-                output.Attributes.Add("data-trigger", "hover");
-            }
-        }
-
-        protected virtual void SetDataToggle(TagHelperContext context, TagHelperOutput output)
-        {
-            output.Attributes.Add("data-toggle", "popover");
-        }
-
-        protected virtual void SetDataPlacement(TagHelperContext context, TagHelperOutput output)
-        {
-            var directory = GetDirectory();
-            if (directory == PopoverDirectory.Default)
-            {
-                directory = PopoverDirectory.Bottom;
-            }
-            output.Attributes.Add("data-placement", directory.ToString().ToLowerInvariant());
-        }
-
-        protected virtual void SetPopoverData(TagHelperContext context, TagHelperOutput output)
-        {
-            output.Attributes.Add("data-content", GetDataContent());
-        }
-
-        protected virtual string GetDataContent()
-        {
-            switch (GetDirectory())
-            {
-                case PopoverDirectory.Top:
-                    return TagHelper.AbpPopoverTop;
-                case PopoverDirectory.Right:
-                    return TagHelper.AbpPopoverRight;
-                case PopoverDirectory.Bottom:
-                    return TagHelper.AbpPopoverBottom;
-                case PopoverDirectory.Left:
-                    return TagHelper.AbpPopoverLeft;
-                default:
-                    return TagHelper.AbpPopover;
-            }
-        }
-
-        protected virtual PopoverDirectory GetDirectory()
-        {
-            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverTop))
-            {
-                return PopoverDirectory.Top;
-            }
-            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverBottom))
-            {
-                return PopoverDirectory.Bottom;
-            }
-            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverRight))
-            {
-                return PopoverDirectory.Right;
-            }
-            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverLeft))
-            {
-                return PopoverDirectory.Left;
-            }
-
-            return PopoverDirectory.Default;
-        }
-    }
-}
\ No newline at end of file
+            {
+                output.Attributes.Add("data-trigger", "hover");
+            }
+        }
+
+        protected virtual void SetDataToggle(TagHelperContext context, TagHelperOutput output)
+        {
+            output.Attributes.Add("data-toggle", "popover");
+        }
+
+        protected virtual void SetDataPlacement(TagHelperContext context, TagHelperOutput output)
+        {
+            var directory = GetDirectory();
+            if (directory == PopoverDirectory.Default)
+            {
+                directory = PopoverDirectory.Bottom;
+            }
+            output.Attributes.Add("data-placement", directory.ToString().ToLowerInvariant());
+        }
+
+        protected virtual void SetPopoverData(TagHelperContext context, TagHelperOutput output)
+        {
+            output.Attributes.Add("data-content", GetDataContent());
+        }
+
+        protected virtual string GetDataContent()
+        {
+            switch (GetDirectory())
+            {
+                case PopoverDirectory.Top:
+                    return TagHelper.AbpPopoverTop;
+                case PopoverDirectory.Right:
+                    return TagHelper.AbpPopoverRight;
+                case PopoverDirectory.Bottom:
+                    return TagHelper.AbpPopoverBottom;
+                case PopoverDirectory.Left:
+                    return TagHelper.AbpPopoverLeft;
+                default:
+                    return TagHelper.AbpPopover;
+            }
+        }
+
+        protected virtual PopoverDirectory GetDirectory()
+        {
+            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverTop))
+            {
+                return PopoverDirectory.Top;
+            }
+            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverBottom))
+            {
+                return PopoverDirectory.Bottom;
+            }
+            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverRight))
+            {
+                return PopoverDirectory.Right;
+            }
+            if (!string.IsNullOrWhiteSpace(TagHelper.AbpPopoverLeft))
+            {
+                return PopoverDirectory.Left;
+            }
+
+            return PopoverDirectory.Default;
+        }
+    }
+}

From 6d0759ff76e8f99f7dd9b3c62fbc77ef2ffa3f72 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Mon, 23 Mar 2020 14:44:45 +0300
Subject: [PATCH 05/68] Added multi usage attributes together

---
 .../Popover/AbpPopoverTagHelperService.cs     | 66 ++++++++++++++-----
 .../Pages/Components/Popovers.cshtml          | 31 +++++----
 2 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
index de5e844888..7ecb351290 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
@@ -13,44 +14,67 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
                 SetDataPlacement(context, output);
                 SetPopoverData(context, output);
                 SetDataTriggerIfDismissible(context, output);
+                SetDataTriggerIfHoverable(context, output);
             }
             else
             {
                 SetDisabled(context, output);
             }
-        }
-
+        }
         protected virtual void SetDisabled(TagHelperContext context, TagHelperOutput output)
         {
-            var triggerAsHtml = TagHelper.Dismissible ?? false ? "datatrigger=\"focus\" " : "";
-            // If not dismissable for hoverable condition
-            if (string.IsNullOrEmpty(triggerAsHtml))
+            var triggerAsHtml = TagHelper.Dismissible ?? false ? "data-trigger=\"focus\" " : "";
+            if (TagHelper.Hoverable ?? false)
             {
-                triggerAsHtml = TagHelper.Hoverable ?? false ? "data-trigger=\"hover\" " : string.Empty;
+                if (triggerAsHtml.Contains("focus"))
+                {
+                    triggerAsHtml = triggerAsHtml.Replace("focus", "focus hover");
+                }
+                else
+                {
+                    triggerAsHtml = "data-trigger=\"hover\" ";
+                }
             }
             var dataPlacementAsHtml = "data-placement=\"" + GetDirectory().ToString().ToLowerInvariant() + "\" ";
+
+            // data-placement="default" with data-trigger="focus" causes Cannot read property 'indexOf' of undefined at computeAutoPlacement(bootstrap.bundle.js?_v=637146714627330435:2185) error
+            if (IsDismissibleOrHoverable() && GetDirectory() == PopoverDirectory.Default)
+            {
+                //dataPlacementAsHtml = string.Empty; //bootstrap default placement is right, abp's is top.
+                dataPlacementAsHtml = dataPlacementAsHtml.Replace("default", "top");
+            }
             var titleAttribute = output.Attributes.FirstOrDefault(at => at.Name == "title");
             var titleAsHtml = titleAttribute == null ? "" : "title=\"" + titleAttribute.Value + "\" ";
-            var preElementHtml = "<span class=\"d-inline-block\" " + titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" + GetDataContent() + "\">";
+            var preElementHtml = "<span tabindex=\"0\" class=\"d-inline-block\" " + titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" + GetDataContent() + "\">";
             var postElementHtml = "</span>";
 
             output.PreElement.SetHtmlContent(preElementHtml);
             output.PostElement.SetHtmlContent(postElementHtml);
 
             output.Attributes.Add("style", "pointer-events: none;");
-        }
-
+        }
         protected virtual void SetDataTriggerIfDismissible(TagHelperContext context, TagHelperOutput output)
         {
             if (TagHelper.Dismissible ?? false)
             {
                 output.Attributes.Add("data-trigger", "focus");
-            }
-            // Dismissible has priority over hoverable
-            else if (TagHelper.Hoverable ?? false)
-            {
-                output.Attributes.Add("data-trigger", "hover");
             }
+        }
+
+        protected virtual void SetDataTriggerIfHoverable(TagHelperContext context, TagHelperOutput output)
+        {
+            if (TagHelper.Hoverable ?? false)
+            {
+                //If already has focus data trigger
+                if (output.Attributes.TryGetAttribute("data-trigger", out _))
+                {
+                    output.Attributes.SetAttribute(new TagHelperAttribute("data-trigger", "focus hover"));
+                }
+                else
+                {
+                    output.Attributes.Add("data-trigger", "hover");
+                }
+            }
         }
 
         protected virtual void SetDataToggle(TagHelperContext context, TagHelperOutput output)
@@ -111,5 +135,17 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
 
             return PopoverDirectory.Default;
         }
+        protected virtual bool IsDismissibleOrHoverable()
+        {
+            if (TagHelper.Dismissible ?? false)
+            {
+                return true;
+            }
+            if (TagHelper.Hoverable ?? false)
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
index 624f17cf20..779494d70f 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
@@ -31,20 +31,23 @@
 <h4>Example</h4>
 
 <div class="demo-with-code">
-    <div class="demo-area">
-
-        <abp-button abp-popover="Hi, i'm popover content!">
-            Popover Default
-        </abp-button>
-        <abp-button abp-popover-top="Hi, i'm popover content!" title="Popover Title" hoverable="true">
-            Popover With Title
-        </abp-button>
-        <abp-button abp-popover-right="Hi, i'm popover content!" title="Popover Title" dismissible="true">
-            Dismissible Popover
-        </abp-button>
-        <abp-button abp-popover-left="Hi, i'm popover content!" title="Popover Title" disabled="true">
-            Disabled Popover
-        </abp-button>
+    <div class="demo-area">
+
+        <abp-button abp-popover="Hi, i'm popover content!">
+            Popover Default
+        </abp-button>
+        <abp-button abp-popover-top="Hi, i'm hoverable popover content!" title="Popover Title" hoverable="true">
+            Popover With Title
+        </abp-button>
+        <abp-button abp-popover-right="Hi, i'm dismissible popover content!" title="Popover Title" dismissible="true">
+            Dismissible Popover
+        </abp-button>
+        <abp-button abp-popover-left="Hi, i'm disabled popover content!" title="Popover Title" disabled="true">
+            Disabled Popover
+        </abp-button>
+        <abp-button abp-popover="Hi, i'm disabled dismissible hoverable popover content!" title="Popover Title" disabled="true" dismissible="true" hoverable="true">
+            Disabled Popover
+        </abp-button>
     </div>
     <div class="code-area">
         <abp-tabs>

From 0f1db55c8e35a1ba9f5a275e16b87b2769d41a90 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 24 Mar 2020 17:34:56 +0800
Subject: [PATCH 06/68] Update outdated documentation.

Resolve #3327
---
 docs/en/Application-Services.md      | 47 +++++++++++++++++++++++++---
 docs/zh-Hans/Application-Services.md | 47 +++++++++++++++++++++++++---
 2 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/docs/en/Application-Services.md b/docs/en/Application-Services.md
index 3fb52377b3..da22479593 100644
--- a/docs/en/Application-Services.md
+++ b/docs/en/Application-Services.md
@@ -146,7 +146,6 @@ public interface IBookAppService : IApplicationService
 `BookDto` is a simple [DTO](Data-Transfer-Objects.md) class defined as below:
 
 ````csharp
-[AbpAutoMapFrom(typeof(Book))] //Defines the mapping
 public class BookDto
 {
     public Guid Id { get; set; }
@@ -159,7 +158,36 @@ public class BookDto
 }
 ````
 
-* `BookDto` defines `[AbpAutoMapFrom(typeof(Book))]` attribute to create the object mapping from `Book` to `BookDto`.
+we creating a [Profile](https://docs.automapper.org/en/stable/Configuration.html#profile-instances) class. Example:
+
+````csharp
+public class MyProfile : Profile
+{
+    public MyProfile()
+    {
+        CreateMap<Book, BookDto>();
+    }
+}
+````
+
+You should then register profiles using the `AbpAutoMapperOptions`:
+
+````csharp
+[DependsOn(typeof(AbpAutoMapperModule))]
+public class MyModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpAutoMapperOptions>(options =>
+        {
+            //Add all mappings defined in the assembly of the MyModule class
+            options.AddMaps<MyModule>();
+        });
+    }
+}
+````
+
+`AddMaps` registers all profile classes defined in the assembly of the given class, typically your module class. It also registers for the [attribute mapping](https://docs.automapper.org/en/stable/Attribute-mapping.html). For more information, please refer to the [object to object mapping](Object-To-Object-Mapping.md) document.
 
 Then you can implement the `GetAsync` method as shown below:
 
@@ -250,7 +278,6 @@ public interface ICrudAppService<
 DTO classes used in this example are `BookDto` and `CreateUpdateBookDto`:
 
 ````csharp
-[AbpAutoMapFrom(typeof(Book))]
 public class BookDto : AuditedEntityDto<Guid>
 {
     public string Name { get; set; }
@@ -260,7 +287,6 @@ public class BookDto : AuditedEntityDto<Guid>
     public float Price { get; set; }
 }
 
-[AbpAutoMapTo(typeof(Book))]
 public class CreateUpdateBookDto
 {
     [Required]
@@ -275,6 +301,19 @@ public class CreateUpdateBookDto
 }
 ````
 
+[Profile](https://docs.automapper.org/en/stable/Configuration.html#profile-instances) class of DTO class.
+
+```csharp
+public class MyProfile : Profile
+{
+    public MyProfile()
+    {
+        CreateMap<Book, BookDto>();
+        CreateMap<CreateUpdateBookDto, Book>();
+    }
+}
+```
+
 * `CreateUpdateBookDto` is shared by create and update operations, but you could use separated DTO classes as well.
 
 And finally, the `BookAppService` implementation is very simple:
diff --git a/docs/zh-Hans/Application-Services.md b/docs/zh-Hans/Application-Services.md
index e51f0af87b..72e0319cde 100644
--- a/docs/zh-Hans/Application-Services.md
+++ b/docs/zh-Hans/Application-Services.md
@@ -146,7 +146,6 @@ public interface IBookAppService : IApplicationService
 `BookDto`是一个简单的[DTO](Data-Transfer-Objects.md)类, 定义如下:
 
 ````csharp
-[AbpAutoMapFrom(typeof(Book))] //Defines the mapping
 public class BookDto
 {
     public Guid Id { get; set; }
@@ -159,7 +158,36 @@ public class BookDto
 }
 ````
 
-* `BookDto`定义了`[AbpAutoMapFrom(typeof(Book))]`属性来从创建对象映射Book到BookDto.
+我们创建一个Automapper的[Profile](https://docs.automapper.org/en/stable/Configuration.html#profile-instances)类. 例如:
+
+```csharp
+public class MyProfile : Profile
+{
+    public MyProfile()
+    {
+        CreateMap<Book, BookDto>();
+    }
+}
+```
+
+然后使用`AbpAutoMapperOptions`注册配置文件:
+
+````csharp
+[DependsOn(typeof(AbpAutoMapperModule))]
+public class MyModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpAutoMapperOptions>(options =>
+        {
+            //Add all mappings defined in the assembly of the MyModule class
+            options.AddMaps<MyModule>();
+        });
+    }
+}
+````
+
+`AddMaps` 注册给定类的程序集中所有的配置类,通常使用模块类. 它还会注册 [attribute 映射](https://docs.automapper.org/en/stable/Attribute-mapping.html). 更多信息请参考[对象到对象映射](Object-To-Object-Mapping.md)文档
 
 然后你可以实现`GetAsync`方法. 如下所示:
 
@@ -249,7 +277,6 @@ public interface ICrudAppService<
 示例中使用的DTO类是`BookDto`和`CreateUpdateBookDto`:
 
 ````csharp
-[AbpAutoMapFrom(typeof(Book))]
 public class BookDto : AuditedEntityDto<Guid>
 {
     public string Name { get; set; }
@@ -259,7 +286,6 @@ public class BookDto : AuditedEntityDto<Guid>
     public float Price { get; set; }
 }
 
-[AbpAutoMapTo(typeof(Book))]
 public class CreateUpdateBookDto
 {
     [Required]
@@ -274,6 +300,19 @@ public class CreateUpdateBookDto
 }
 ````
 
+DTO类的[Profile](https://docs.automapper.org/en/stable/Configuration.html#profile-instances)类.
+
+```csharp
+public class MyProfile : Profile
+{
+    public MyProfile()
+    {
+        CreateMap<Book, BookDto>();
+        CreateMap<CreateUpdateBookDto, Book>();
+    }
+}
+```
+
 * `CreateUpdateBookDto`由创建和更新操作共享,但你也可以使用单独的DTO类.
 
 最后`BookAppService`实现非常简单:

From a8d4e7c229d8e76f7a174a30de31a02e475d9fe4 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 25 Mar 2020 15:38:37 +0800
Subject: [PATCH 07/68] Use Exists property to determine if the file exists.

Resolve #3341
---
 .../Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
index 73b6e025ea..40fd3e6ea5 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
@@ -63,7 +63,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             foreach (var bundleFile in bundleFiles)
             {
                 var file = WebContentFileProvider.GetFileInfo(bundleFile);
-                if (file == null)
+                if (!file.Exists)
                 {
                     throw new AbpException($"Could not find the bundle file from {nameof(IWebContentFileProvider)}");
                 }

From 283da6783b632bf5d00d834dd8f7b10c098a0b6c Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 26 Mar 2020 14:45:46 +0800
Subject: [PATCH 08/68] Apply Entity Extension System for samples

Resolve #3361
---
 .../Acme.BookStore.Domain/Users/AppUser.cs    | 16 ++++++--
 .../Acme.BookStore.Domain/Users/AppUser.cs    | 16 ++++++--
 .../BookStoreMigrationsDbContext.cs           |  7 ----
 .../BookStoreMigrationsDbContextFactory.cs    |  2 +
 .../EntityFrameworkCore/BookStoreDbContext.cs |  8 ++--
 ...okStoreDbContextModelCreatingExtensions.cs |  8 ----
 .../BookStoreEntityExtensions.cs              | 33 +++++++++++++++
 .../BookStoreEntityFrameworkCoreModule.cs     |  5 +++
 .../BookManagementEntityExtensions.cs         | 32 +++++++++++++++
 ...BookManagementEntityFrameworkCoreModule.cs |  5 +++
 .../Acme.BookStore.Domain/Users/AppUser.cs    | 16 ++++++--
 .../BookStoreMigrationsDbContext.cs           |  7 ----
 .../BookStoreMigrationsDbContextFactory.cs    |  2 +
 .../EntityFrameworkCore/BookStoreDbContext.cs |  8 ++--
 ...okStoreDbContextModelCreatingExtensions.cs |  8 ----
 .../BookStoreEntityExtensions.cs              | 33 +++++++++++++++
 .../BookStoreEntityFrameworkCoreModule.cs     |  5 +++
 .../src/DashboardDemo.Domain/Users/AppUser.cs | 16 ++++++--
 .../DashboardDemoMigrationsDbContext.cs       |  7 ----
 ...DashboardDemoMigrationsDbContextFactory.cs |  2 +
 .../DashboardDemoDbContext.cs                 |  8 ++--
 ...ardDemoDbContextModelCreatingExtensions.cs |  8 ----
 .../DashboardDemoEntityExtensions.cs          | 33 +++++++++++++++
 .../DashboardDemoEntityFrameworkCoreModule.cs |  5 +++
 .../Acme.BookStore.Domain/Users/AppUser.cs    | 16 ++++++--
 .../BookStoreMigrationsDbContext.cs           | 13 ------
 .../BookStoreMigrationsDbContextFactory.cs    |  2 +
 .../EntityFrameworkCore/BookStoreDbContext.cs |  8 ++--
 ...okStoreDbContextModelCreatingExtensions.cs | 19 +--------
 .../BookStoreEntityExtensions.cs              | 40 +++++++++++++++++++
 .../BookStoreEntityFrameworkCoreModule.cs     |  5 +++
 31 files changed, 290 insertions(+), 103 deletions(-)
 create mode 100644 samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
 create mode 100644 samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityExtensions.cs
 create mode 100644 samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
 create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityExtensions.cs
 create mode 100644 samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs

diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs
index 9068cfbcd5..37f67ba60a 100644
--- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -41,9 +41,19 @@ namespace Acme.BookStore.Users
         #endregion
 
         /* Add your own properties here. Example:
-         *
-         * public virtual string MyProperty { get; set; }
-         */
+        *
+        * public string MyProperty { get; set; }
+        *
+        * If you add a property and using the EF Core, remember these;
+        *
+        * 1. update BookStoreDbContext.OnModelCreating
+        * to configure the mapping for your new property
+        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * and add your new property to the migration.
+        * 3. Use the Add-Migration to add a new database migration.
+        * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
+        * schema change to the database.
+        */
 
         private AppUser()
         {
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs
index 9068cfbcd5..37f67ba60a 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -41,9 +41,19 @@ namespace Acme.BookStore.Users
         #endregion
 
         /* Add your own properties here. Example:
-         *
-         * public virtual string MyProperty { get; set; }
-         */
+        *
+        * public string MyProperty { get; set; }
+        *
+        * If you add a property and using the EF Core, remember these;
+        *
+        * 1. update BookStoreDbContext.OnModelCreating
+        * to configure the mapping for your new property
+        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * and add your new property to the migration.
+        * 3. Use the Add-Migration to add a new database migration.
+        * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
+        * schema change to the database.
+        */
 
         private AppUser()
         {
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
index 6a74deef7e..7d7b1cb243 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
@@ -42,13 +42,6 @@ namespace Acme.BookStore.EntityFrameworkCore
             builder.ConfigureTenantManagement();
             builder.ConfigureBookManagement();
 
-            /* Configure customizations for entities from the modules included  */
-
-            builder.Entity<IdentityUser>(b =>
-            {
-                b.ConfigureCustomUserProperties();
-            });
-
             /* Configure your own tables/entities inside the ConfigureBookStore method */
 
             builder.ConfigureBookStore();
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
index 7212eb7340..4f285e597e 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
@@ -11,6 +11,8 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public BookStoreMigrationsDbContext CreateDbContext(string[] args)
         {
+            BookStoreEntityExtensions.Configure();
+            
             var configuration = BuildConfiguration();
 
             var builder = new DbContextOptionsBuilder<BookStoreMigrationsDbContext>()
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
index 85644bf40a..7ddeab7a5f 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
@@ -3,6 +3,7 @@ using Acme.BookStore.Users;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
+using Volo.Abp.Identity;
 using Volo.Abp.Users.EntityFrameworkCore;
 
 namespace Acme.BookStore.EntityFrameworkCore
@@ -39,12 +40,13 @@ namespace Acme.BookStore.EntityFrameworkCore
 
             builder.Entity<AppUser>(b =>
             {
-                b.ToTable("AbpUsers"); //Sharing the same table "AbpUsers" with the IdentityUser
+                b.ToTable(AbpIdentityDbProperties.DbTablePrefix + "Users"); //Sharing the same table "AbpUsers" with the IdentityUser
                 b.ConfigureByConvention();
                 b.ConfigureAbpUser();
 
-                //Moved customization to a method so we can share it with the BookStoreMigrationsDbContext class
-                b.ConfigureCustomUserProperties();
+                /* Configure mappings for your additional properties
+                 * Also see the BookStoreEntityExtensions class
+                 */
             });
 
             /* Configure your own tables/entities inside the ConfigureBookStore method */
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
index 1510809d5f..c132d297a4 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp;
-using Volo.Abp.Users;
 
 namespace Acme.BookStore.EntityFrameworkCore
 {
@@ -20,11 +18,5 @@ namespace Acme.BookStore.EntityFrameworkCore
             //    //...
             //});
         }
-
-        public static void ConfigureCustomUserProperties<TUser>(this EntityTypeBuilder<TUser> b)
-            where TUser: class, IUser
-        {
-            //b.Property<string>(nameof(AppUser.MyProperty))...
-        }
     }
 }
\ No newline at end of file
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
new file mode 100644
index 0000000000..771390698f
--- /dev/null
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
@@ -0,0 +1,33 @@
+using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.Identity;
+using Volo.Abp.Threading;
+
+namespace Acme.BookStore.EntityFrameworkCore
+{
+    public static class BookStoreEntityExtensions
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public static void Configure()
+        {
+            OneTimeRunner.Run(() =>
+            {
+                /* You can configure entity extension properties for the
+                 * entities defined in the used modules.
+                 *
+                 * Example:
+                 *
+                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
+                 *     "MyProperty",
+                 *     b =>
+                 *     {
+                 *         b.HasMaxLength(128);
+                 *     });
+                 *
+                 * See the documentation for more:
+                 * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
+                 */
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
index 5cb2a6dc7e..c8142b8088 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
@@ -29,6 +29,11 @@ namespace Acme.BookStore.EntityFrameworkCore
         )]
     public class BookStoreEntityFrameworkCoreModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            BookStoreEntityExtensions.Configure();
+        }
+        
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAbpDbContext<BookStoreDbContext>(options =>
diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityExtensions.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityExtensions.cs
new file mode 100644
index 0000000000..b7a3871453
--- /dev/null
+++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityExtensions.cs
@@ -0,0 +1,32 @@
+using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.Threading;
+
+namespace Acme.BookStore.BookManagement.EntityFrameworkCore
+{
+    public static class BookManagementEntityExtensions
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public static void Configure()
+        {
+            OneTimeRunner.Run(() =>
+            {
+                /* You can configure entity extension properties for the
+                 * entities defined in the used modules.
+                 *
+                 * Example:
+                 *
+                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
+                 *     "MyProperty",
+                 *     b =>
+                 *     {
+                 *         b.HasMaxLength(128);
+                 *     });
+                 *
+                 * See the documentation for more:
+                 * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
+                 */
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs
index c2b2867938..3734551e73 100644
--- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs
+++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs
@@ -10,6 +10,11 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore
     )]
     public class BookManagementEntityFrameworkCoreModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            BookManagementEntityExtensions.Configure();
+        }
+        
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAbpDbContext<BookManagementDbContext>(options =>
diff --git a/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs
index 9068cfbcd5..37f67ba60a 100644
--- a/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -41,9 +41,19 @@ namespace Acme.BookStore.Users
         #endregion
 
         /* Add your own properties here. Example:
-         *
-         * public virtual string MyProperty { get; set; }
-         */
+        *
+        * public string MyProperty { get; set; }
+        *
+        * If you add a property and using the EF Core, remember these;
+        *
+        * 1. update BookStoreDbContext.OnModelCreating
+        * to configure the mapping for your new property
+        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * and add your new property to the migration.
+        * 3. Use the Add-Migration to add a new database migration.
+        * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
+        * schema change to the database.
+        */
 
         private AppUser()
         {
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
index 541a91a0fd..5287d6f535 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
@@ -40,13 +40,6 @@ namespace Acme.BookStore.EntityFrameworkCore
             builder.ConfigureFeatureManagement();
             builder.ConfigureTenantManagement();
 
-            /* Configure customizations for entities from the modules included  */
-
-            builder.Entity<IdentityUser>(b =>
-            {
-                b.ConfigureCustomUserProperties();
-            });
-
             /* Configure your own tables/entities inside the ConfigureBookStore method */
 
             builder.ConfigureBookStore();
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
index da72e6fb21..cf8a18e468 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
@@ -11,6 +11,8 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public BookStoreMigrationsDbContext CreateDbContext(string[] args)
         {
+            BookStoreEntityExtensions.Configure();
+            
             var configuration = BuildConfiguration();
 
             var builder = new DbContextOptionsBuilder<BookStoreMigrationsDbContext>()
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
index 386eb2623b..5849e12137 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
@@ -3,6 +3,7 @@ using Acme.BookStore.Users;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
+using Volo.Abp.Identity;
 using Volo.Abp.Users.EntityFrameworkCore;
 
 namespace Acme.BookStore.EntityFrameworkCore
@@ -41,15 +42,16 @@ namespace Acme.BookStore.EntityFrameworkCore
 
             builder.Entity<AppUser>(b =>
             {
-                b.ToTable("AbpUsers"); //Sharing the same table "AbpUsers" with the IdentityUser
+                b.ToTable(AbpIdentityDbProperties.DbTablePrefix + "Users"); //Sharing the same table "AbpUsers" with the IdentityUser
 
                 b.ConfigureFullAudited();
                 b.ConfigureExtraProperties();
                 b.ConfigureConcurrencyStamp();
                 b.ConfigureAbpUser();
 
-                //Moved customization to a method so we can share it with the BookStoreMigrationsDbContext class
-                b.ConfigureCustomUserProperties();
+                /* Configure mappings for your additional properties
+                 * Also see the BookStoreEntityExtensions class
+                 */
             });
 
             /* Configure your own tables/entities inside the ConfigureBookStore method */
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
index 922793e029..f11ec0d00a 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
@@ -1,8 +1,6 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore.Modeling;
-using Volo.Abp.Users;
 
 namespace Acme.BookStore.EntityFrameworkCore
 {
@@ -21,11 +19,5 @@ namespace Acme.BookStore.EntityFrameworkCore
                 b.Property(x => x.Name).IsRequired().HasMaxLength(128);
             });
         }
-
-        public static void ConfigureCustomUserProperties<TUser>(this EntityTypeBuilder<TUser> b)
-            where TUser: class, IUser
-        {
-            //b.Property<string>(nameof(AppUser.MyProperty))...
-        }
     }
 }
\ No newline at end of file
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
new file mode 100644
index 0000000000..771390698f
--- /dev/null
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
@@ -0,0 +1,33 @@
+using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.Identity;
+using Volo.Abp.Threading;
+
+namespace Acme.BookStore.EntityFrameworkCore
+{
+    public static class BookStoreEntityExtensions
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public static void Configure()
+        {
+            OneTimeRunner.Run(() =>
+            {
+                /* You can configure entity extension properties for the
+                 * entities defined in the used modules.
+                 *
+                 * Example:
+                 *
+                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
+                 *     "MyProperty",
+                 *     b =>
+                 *     {
+                 *         b.HasMaxLength(128);
+                 *     });
+                 *
+                 * See the documentation for more:
+                 * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
+                 */
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
index 156a4207cb..be5f6039b4 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
@@ -27,6 +27,11 @@ namespace Acme.BookStore.EntityFrameworkCore
         )]
     public class BookStoreEntityFrameworkCoreModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            BookStoreEntityExtensions.Configure();
+        }
+        
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAbpDbContext<BookStoreDbContext>(options =>
diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs
index 2f2ba91689..cfad912abe 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs
@@ -41,9 +41,19 @@ namespace DashboardDemo.Users
         #endregion
 
         /* Add your own properties here. Example:
-         *
-         * public virtual string MyProperty { get; set; }
-         */
+        *
+        * public string MyProperty { get; set; }
+        *
+        * If you add a property and using the EF Core, remember these;
+        *
+        * 1. update BookStoreDbContext.OnModelCreating
+        * to configure the mapping for your new property
+        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * and add your new property to the migration.
+        * 3. Use the Add-Migration to add a new database migration.
+        * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
+        * schema change to the database.
+        */
 
         private AppUser()
         {
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs
index c94d27faf0..ccec84b7e1 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs
@@ -40,13 +40,6 @@ namespace DashboardDemo.EntityFrameworkCore
             builder.ConfigureFeatureManagement();
             builder.ConfigureTenantManagement();
 
-            /* Configure customizations for entities from the modules included  */
-
-            builder.Entity<IdentityUser>(b =>
-            {
-                b.ConfigureCustomUserProperties();
-            });
-
             /* Configure your own tables/entities inside the ConfigureDashboardDemo method */
 
             builder.ConfigureDashboardDemo();
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs
index 0773892abc..10ce7b7da1 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs
@@ -11,6 +11,8 @@ namespace DashboardDemo.EntityFrameworkCore
     {
         public DashboardDemoMigrationsDbContext CreateDbContext(string[] args)
         {
+            DashboardDemoEntityExtensions.Configure();
+            
             var configuration = BuildConfiguration();
 
             var builder = new DbContextOptionsBuilder<DashboardDemoMigrationsDbContext>()
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs
index 94ec22abb3..33c1ddb82d 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs
@@ -3,6 +3,7 @@ using DashboardDemo.Users;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
+using Volo.Abp.Identity;
 using Volo.Abp.Users.EntityFrameworkCore;
 
 namespace DashboardDemo.EntityFrameworkCore
@@ -39,15 +40,16 @@ namespace DashboardDemo.EntityFrameworkCore
 
             builder.Entity<AppUser>(b =>
             {
-                b.ToTable("AbpUsers"); //Sharing the same table "AbpUsers" with the IdentityUser
+                b.ToTable(AbpIdentityDbProperties.DbTablePrefix + "Users"); //Sharing the same table "AbpUsers" with the IdentityUser
 
                 b.ConfigureFullAudited();
                 b.ConfigureExtraProperties();
                 b.ConfigureConcurrencyStamp();
                 b.ConfigureAbpUser();
 
-                //Moved customization to a method so we can share it with the DashboardDemoMigrationsDbContext class
-                b.ConfigureCustomUserProperties();
+                /* Configure mappings for your additional properties
+                 * Also see the DashboardDemoEntityExtensions class
+                 */
             });
 
             /* Configure your own tables/entities inside the ConfigureDashboardDemo method */
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs
index 60dae7c4cf..0a5d05f6bc 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs
@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp;
-using Volo.Abp.Users;
 
 namespace DashboardDemo.EntityFrameworkCore
 {
@@ -20,11 +18,5 @@ namespace DashboardDemo.EntityFrameworkCore
             //    //...
             //});
         }
-
-        public static void ConfigureCustomUserProperties<TUser>(this EntityTypeBuilder<TUser> b)
-            where TUser: class, IUser
-        {
-            //b.Property<string>(nameof(AppUser.MyProperty))...
-        }
     }
 }
\ No newline at end of file
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityExtensions.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityExtensions.cs
new file mode 100644
index 0000000000..b41ccb8ac8
--- /dev/null
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityExtensions.cs
@@ -0,0 +1,33 @@
+using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.Identity;
+using Volo.Abp.Threading;
+
+namespace DashboardDemo.EntityFrameworkCore
+{
+    public static class DashboardDemoEntityExtensions
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public static void Configure()
+        {
+            OneTimeRunner.Run(() =>
+            {
+                /* You can configure entity extension properties for the
+                 * entities defined in the used modules.
+                 *
+                 * Example:
+                 *
+                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
+                 *     "MyProperty",
+                 *     b =>
+                 *     {
+                 *         b.HasMaxLength(128);
+                 *     });
+                 *
+                 * See the documentation for more:
+                 * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
+                 */
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs
index de03726a20..b183c49446 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs
@@ -27,6 +27,11 @@ namespace DashboardDemo.EntityFrameworkCore
         )]
     public class DashboardDemoEntityFrameworkCoreModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            DashboardDemoEntityExtensions.Configure();
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAbpDbContext<DashboardDemoDbContext>(options =>
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs
index 9068cfbcd5..37f67ba60a 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -41,9 +41,19 @@ namespace Acme.BookStore.Users
         #endregion
 
         /* Add your own properties here. Example:
-         *
-         * public virtual string MyProperty { get; set; }
-         */
+        *
+        * public string MyProperty { get; set; }
+        *
+        * If you add a property and using the EF Core, remember these;
+        *
+        * 1. update BookStoreDbContext.OnModelCreating
+        * to configure the mapping for your new property
+        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * and add your new property to the migration.
+        * 3. Use the Add-Migration to add a new database migration.
+        * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
+        * schema change to the database.
+        */
 
         private AppUser()
         {
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
index 7a83a323d8..8064243388 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
@@ -34,19 +34,6 @@ namespace Acme.BookStore.EntityFrameworkCore
             builder.ConfigureFeatureManagement();
             builder.ConfigureTenantManagement();
 
-            /* Configure customizations for entities from the modules included  */
-
-            //CONFIGURE THE CUSTOM ROLE PROPERTIES
-            builder.Entity<IdentityRole>(b =>
-            {
-                b.ConfigureCustomRoleProperties();
-            });
-
-            builder.Entity<IdentityUser>(b =>
-            {
-                b.ConfigureCustomUserProperties();
-            });
-
             /* Configure your own tables/entities inside the ConfigureBookStore method */
 
             builder.ConfigureBookStore();
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
index da72e6fb21..cf8a18e468 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
@@ -11,6 +11,8 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public BookStoreMigrationsDbContext CreateDbContext(string[] args)
         {
+            BookStoreEntityExtensions.Configure();
+            
             var configuration = BuildConfiguration();
 
             var builder = new DbContextOptionsBuilder<BookStoreMigrationsDbContext>()
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
index 091e5820fc..d3726865cd 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
@@ -4,6 +4,7 @@ using Acme.BookStore.Users;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
+using Volo.Abp.Identity;
 using Volo.Abp.Users.EntityFrameworkCore;
 
 namespace Acme.BookStore.EntityFrameworkCore
@@ -51,12 +52,13 @@ namespace Acme.BookStore.EntityFrameworkCore
 
             builder.Entity<AppUser>(b =>
             {
-                b.ToTable("AbpUsers"); //Sharing the same table "AbpUsers" with the IdentityUser
+                b.ToTable(AbpIdentityDbProperties.DbTablePrefix + "Users"); //Sharing the same table "AbpUsers" with the IdentityUser
                 b.ConfigureByConvention();
                 b.ConfigureAbpUser();
 
-                //Moved customization to a method so we can share it with the BookStoreMigrationsDbContext class
-                b.ConfigureCustomUserProperties();
+                /* Configure mappings for your additional properties
+                 * Also see the BookStoreEntityExtensions class
+                 */
             });
 
             /* Configure your own tables/entities inside the ConfigureBookStore method */
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
index 345bde14a0..c132d297a4 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
@@ -1,10 +1,5 @@
-using System;
-using Acme.BookStore.Roles;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Users;
 
 namespace Acme.BookStore.EntityFrameworkCore
 {
@@ -23,17 +18,5 @@ namespace Acme.BookStore.EntityFrameworkCore
             //    //...
             //});
         }
-
-        public static void ConfigureCustomUserProperties<TUser>(this EntityTypeBuilder<TUser> b)
-            where TUser: class, IUser
-        {
-            //b.Property<string>(nameof(AppUser.MyProperty))...
-        }
-
-        public static void ConfigureCustomRoleProperties<TRole>(this EntityTypeBuilder<TRole> b)
-            where TRole : class, IEntity<Guid>
-        {
-            b.Property<string>(nameof(AppRole.Title)).HasMaxLength(128);
-        }
     }
 }
\ No newline at end of file
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
new file mode 100644
index 0000000000..9d59942de8
--- /dev/null
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
@@ -0,0 +1,40 @@
+using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.Identity;
+using Volo.Abp.Threading;
+
+namespace Acme.BookStore.EntityFrameworkCore
+{
+    public static class BookStoreEntityExtensions
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public static void Configure()
+        {
+            OneTimeRunner.Run(() =>
+            {
+                /* You can configure entity extension properties for the
+                 * entities defined in the used modules.
+                 *
+                 * Example:
+                 *
+                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
+                 *     "MyProperty",
+                 *     b =>
+                 *     {
+                 *         b.HasMaxLength(128);
+                 *     });
+                 *
+                 * See the documentation for more:
+                 * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
+                 */
+                
+                EntityExtensionManager.AddProperty<IdentityRole, string>(
+                    nameof(AppRole.Title),
+                     b =>
+                     {
+                         b.HasMaxLength(128);
+                     });
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
index 156a4207cb..be5f6039b4 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
@@ -27,6 +27,11 @@ namespace Acme.BookStore.EntityFrameworkCore
         )]
     public class BookStoreEntityFrameworkCoreModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            BookStoreEntityExtensions.Configure();
+        }
+        
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAbpDbContext<BookStoreDbContext>(options =>

From 3d85fd01417a5e141c06847b90124e82f78868fc Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 26 Mar 2020 15:48:30 +0800
Subject: [PATCH 09/68] Undo changes to EfCoreMigrationDemo.

---
 build/common.ps1                              |  1 +
 .../Acme.BookStore.Domain/Users/AppUser.cs    | 16 ++------
 .../BookStoreMigrationsDbContext.cs           | 13 ++++++
 .../BookStoreMigrationsDbContextFactory.cs    |  3 +-
 .../EntityFrameworkCore/BookStoreDbContext.cs |  8 ++--
 ...okStoreDbContextModelCreatingExtensions.cs | 19 ++++++++-
 .../BookStoreEntityExtensions.cs              | 40 -------------------
 .../BookStoreEntityFrameworkCoreModule.cs     |  5 ---
 ...BookStore.EntityFrameworkCore.Tests.csproj |  1 +
 .../BookStoreEntityFrameworkCoreTestModule.cs | 12 +++++-
 .../BookStoreWebTestModule.cs                 |  8 ++++
 11 files changed, 59 insertions(+), 67 deletions(-)
 delete mode 100644 samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs

diff --git a/build/common.ps1 b/build/common.ps1
index e4ba6a8adc..06fa20b35e 100644
--- a/build/common.ps1
+++ b/build/common.ps1
@@ -28,6 +28,7 @@ $solutionPaths = (
     "../samples/BookStore-Modular/modules/book-management",
     "../samples/BookStore-Modular/application",
     "../samples/DashboardDemo",
+    "../samples/EfCoreMigrationDemo",
     "../samples/MicroserviceDemo",
     "../samples/RabbitMqEventBus",
     "../abp_io/AbpIoLocalization"
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs
index 37f67ba60a..9068cfbcd5 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -41,19 +41,9 @@ namespace Acme.BookStore.Users
         #endregion
 
         /* Add your own properties here. Example:
-        *
-        * public string MyProperty { get; set; }
-        *
-        * If you add a property and using the EF Core, remember these;
-        *
-        * 1. update BookStoreDbContext.OnModelCreating
-        * to configure the mapping for your new property
-        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
-        * and add your new property to the migration.
-        * 3. Use the Add-Migration to add a new database migration.
-        * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
-        * schema change to the database.
-        */
+         *
+         * public virtual string MyProperty { get; set; }
+         */
 
         private AppUser()
         {
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
index 8064243388..7a83a323d8 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContext.cs
@@ -34,6 +34,19 @@ namespace Acme.BookStore.EntityFrameworkCore
             builder.ConfigureFeatureManagement();
             builder.ConfigureTenantManagement();
 
+            /* Configure customizations for entities from the modules included  */
+
+            //CONFIGURE THE CUSTOM ROLE PROPERTIES
+            builder.Entity<IdentityRole>(b =>
+            {
+                b.ConfigureCustomRoleProperties();
+            });
+
+            builder.Entity<IdentityUser>(b =>
+            {
+                b.ConfigureCustomUserProperties();
+            });
+
             /* Configure your own tables/entities inside the ConfigureBookStore method */
 
             builder.ConfigureBookStore();
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
index cf8a18e468..7364cd29ab 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
@@ -11,8 +11,7 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public BookStoreMigrationsDbContext CreateDbContext(string[] args)
         {
-            BookStoreEntityExtensions.Configure();
-            
+
             var configuration = BuildConfiguration();
 
             var builder = new DbContextOptionsBuilder<BookStoreMigrationsDbContext>()
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
index d3726865cd..091e5820fc 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
@@ -4,7 +4,6 @@ using Acme.BookStore.Users;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
-using Volo.Abp.Identity;
 using Volo.Abp.Users.EntityFrameworkCore;
 
 namespace Acme.BookStore.EntityFrameworkCore
@@ -52,13 +51,12 @@ namespace Acme.BookStore.EntityFrameworkCore
 
             builder.Entity<AppUser>(b =>
             {
-                b.ToTable(AbpIdentityDbProperties.DbTablePrefix + "Users"); //Sharing the same table "AbpUsers" with the IdentityUser
+                b.ToTable("AbpUsers"); //Sharing the same table "AbpUsers" with the IdentityUser
                 b.ConfigureByConvention();
                 b.ConfigureAbpUser();
 
-                /* Configure mappings for your additional properties
-                 * Also see the BookStoreEntityExtensions class
-                 */
+                //Moved customization to a method so we can share it with the BookStoreMigrationsDbContext class
+                b.ConfigureCustomUserProperties();
             });
 
             /* Configure your own tables/entities inside the ConfigureBookStore method */
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
index c132d297a4..345bde14a0 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs
@@ -1,5 +1,10 @@
-using Microsoft.EntityFrameworkCore;
+using System;
+using Acme.BookStore.Roles;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Users;
 
 namespace Acme.BookStore.EntityFrameworkCore
 {
@@ -18,5 +23,17 @@ namespace Acme.BookStore.EntityFrameworkCore
             //    //...
             //});
         }
+
+        public static void ConfigureCustomUserProperties<TUser>(this EntityTypeBuilder<TUser> b)
+            where TUser: class, IUser
+        {
+            //b.Property<string>(nameof(AppUser.MyProperty))...
+        }
+
+        public static void ConfigureCustomRoleProperties<TRole>(this EntityTypeBuilder<TRole> b)
+            where TRole : class, IEntity<Guid>
+        {
+            b.Property<string>(nameof(AppRole.Title)).HasMaxLength(128);
+        }
     }
 }
\ No newline at end of file
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
deleted file mode 100644
index 9d59942de8..0000000000
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Volo.Abp.EntityFrameworkCore.Extensions;
-using Volo.Abp.Identity;
-using Volo.Abp.Threading;
-
-namespace Acme.BookStore.EntityFrameworkCore
-{
-    public static class BookStoreEntityExtensions
-    {
-        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
-        public static void Configure()
-        {
-            OneTimeRunner.Run(() =>
-            {
-                /* You can configure entity extension properties for the
-                 * entities defined in the used modules.
-                 *
-                 * Example:
-                 *
-                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
-                 *     "MyProperty",
-                 *     b =>
-                 *     {
-                 *         b.HasMaxLength(128);
-                 *     });
-                 *
-                 * See the documentation for more:
-                 * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
-                 */
-                
-                EntityExtensionManager.AddProperty<IdentityRole, string>(
-                    nameof(AppRole.Title),
-                     b =>
-                     {
-                         b.HasMaxLength(128);
-                     });
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
index be5f6039b4..156a4207cb 100644
--- a/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
+++ b/samples/EfCoreMigrationDemo/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
@@ -27,11 +27,6 @@ namespace Acme.BookStore.EntityFrameworkCore
         )]
     public class BookStoreEntityFrameworkCoreModule : AbpModule
     {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            BookStoreEntityExtensions.Configure();
-        }
-        
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAbpDbContext<BookStoreDbContext>(options =>
diff --git a/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/Acme.BookStore.EntityFrameworkCore.Tests.csproj b/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/Acme.BookStore.EntityFrameworkCore.Tests.csproj
index dd2137ad06..b03b0ed22d 100644
--- a/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/Acme.BookStore.EntityFrameworkCore.Tests.csproj
+++ b/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/Acme.BookStore.EntityFrameworkCore.Tests.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Acme.BookStore.EntityFrameworkCore.DbMigrations\Acme.BookStore.EntityFrameworkCore.DbMigrations.csproj" />
+    <ProjectReference Include="..\..\src\Acme.BookStore.EntityFrameworkCore.DbMigrationsForSecondDb\Acme.BookStore.EntityFrameworkCore.DbMigrationsForSecondDb.csproj" />
     <ProjectReference Include="..\Acme.BookStore.TestBase\Acme.BookStore.TestBase.csproj" />
   </ItemGroup>
 
diff --git a/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/EntityFrameworkCore/BookStoreEntityFrameworkCoreTestModule.cs b/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/EntityFrameworkCore/BookStoreEntityFrameworkCoreTestModule.cs
index e1171d6d90..a3f2bb5aa7 100644
--- a/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/EntityFrameworkCore/BookStoreEntityFrameworkCoreTestModule.cs
+++ b/samples/EfCoreMigrationDemo/test/Acme.BookStore.EntityFrameworkCore.Tests/EntityFrameworkCore/BookStoreEntityFrameworkCoreTestModule.cs
@@ -1,4 +1,5 @@
-using Microsoft.Data.Sqlite;
+using Acme.BookStore.DbMigrationsForSecondDb.EntityFrameworkCore;
+using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -51,6 +52,15 @@ namespace Acme.BookStore.EntityFrameworkCore
                 context.GetService<IRelationalDatabaseCreator>().CreateTables();
             }
 
+            var secondOptions = new DbContextOptionsBuilder<BookStoreSecondMigrationsDbContext>()
+                .UseSqlite(connection)
+                .Options;
+            
+            using (var context = new BookStoreSecondMigrationsDbContext(secondOptions))
+            {
+                context.GetService<IRelationalDatabaseCreator>().CreateTables();
+            }
+
             return connection;
         }
     }
diff --git a/samples/EfCoreMigrationDemo/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs b/samples/EfCoreMigrationDemo/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs
index 46e4312035..786015d18b 100644
--- a/samples/EfCoreMigrationDemo/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs
+++ b/samples/EfCoreMigrationDemo/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs
@@ -12,6 +12,7 @@ using Acme.BookStore.Web;
 using Acme.BookStore.Web.Menus;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.TestBase;
+using Volo.Abp.Data;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -38,6 +39,13 @@ namespace Acme.BookStore
         {
             ConfigureLocalizationServices(context.Services);
             ConfigureNavigationServices(context.Services);
+            
+            Configure<AbpDbConnectionOptions>(options =>
+            {
+                //SqliteConnection does not support nested transactions. 
+                //So Dbcontext and connectionString need be same.
+                options.ConnectionStrings.Clear();
+            });
         }
 
         private static void ConfigureLocalizationServices(IServiceCollection services)

From 272ca7b315c224ebd71929c12826ab78172c2f2e Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 05:13:28 +0300
Subject: [PATCH 10/68] added initial post

---
 docs/en/Blog-Posts/2020-04-01/Post.md | 176 ++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 docs/en/Blog-Posts/2020-04-01/Post.md

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/Blog-Posts/2020-04-01/Post.md
new file mode 100644
index 0000000000..bc3148ec5e
--- /dev/null
+++ b/docs/en/Blog-Posts/2020-04-01/Post.md
@@ -0,0 +1,176 @@
+# Using Azure Active Directory Authentication in ABP Applications
+
+## Introduction
+
+This post demonstrates how to  integrate AzureAD to an ABP application that enables users to sign in using OAuth 2.0 with credentials from Azure Active Directory. 
+
+Adding Azure Active Directory is pretty straightforward in Abp framework. Couple of configurations needs to be done correctly. 
+
+There will be two samples of connections for better covarage;
+
+- **AddOpenIdConnect** (Default Microsoft.AspNetCore.Authentication.OpenIdConnect package)
+- **AddAzureAD** (Microsoft.AspNetCore.Authentication.AzureAD.UI package)
+
+
+
+## AddOpenIdConnect 
+
+#### **Update your `appsettings.json`**
+
+In your **.Web** application, add the following section filled with your AzureAD application settings.
+
+````xml
+  "AzureAd": {
+    "Instance": "https://login.microsoftonline.com/",
+    "TenantId": "<your-tenant-id",
+    "ClientId": "<your-client-id>",
+	"ClientSecret": "<your-client-secret>",
+    "Domain": "domain.onmicrosoft.com",
+    "CallbackPath": "/signin-azuread-oidc"	
+  }
+````
+
+Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
+
+````xml
+private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
+
+            context.Services.AddAuthentication()
+                .AddIdentityServerAuthentication(options =>
+                {
+                    options.Authority = configuration["AuthServer:Authority"];
+                    options.RequireHttpsMetadata = false;
+                    options.ApiName = "BookStore";
+                })
+                .AddOpenIdConnect("AzureOpenId", "AzureAD", options =>
+                 {
+                     options.Authority = "https://login.microsoftonline.com/" + configuration["AzureAd:TenantId"];
+                     options.ClientId = configuration["AzureAd:ClientId"];
+                     options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+                     options.CallbackPath = configuration["AzureAd:CallbackPath"];
+                     options.ClientSecret = configuration["AzureAd:ClientSecret"];
+                     options.RequireHttpsMetadata = false;
+                     options.SaveTokens = true;
+                     options.GetClaimsFromUserInfoEndpoint = true;
+                 });
+        }
+````
+
+
+
+## AddAzureAD
+
+#### **Update your `appsettings.json`**
+
+Install `Microsoft.AspNetCore.Authentication.AzureAD.UI` package to your **.Web** application.
+
+In your **.Web** application, add the following section filled with your AzureAD application settings. 
+
+Notice that <u>you don't need</u> to add `ClientSecret` when you are using `Microsoft.AspNetCore.Authentication.AzureAD.UI` package.
+
+````xml
+  "AzureAd": {
+    "Instance": "https://login.microsoftonline.com/",
+    "TenantId": "<your-tenant-id",
+    "ClientId": "<your-client-id>",
+    "Domain": "domain.onmicrosoft.com",
+    "CallbackPath": "/signin-azuread-oidc"	
+  }
+````
+
+Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
+
+````xml
+private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
+            context.Services.AddAuthentication()
+                .AddIdentityServerAuthentication(options =>
+                {
+                    options.Authority = configuration["AuthServer:Authority"];
+                    options.RequireHttpsMetadata = false;
+                    options.ApiName = "Acme.BookStore";
+                })
+            .AddAzureAD(options => configuration.Bind("AzureAd", options));
+
+            context.Services.Configure<OpenIdConnectOptions>(AzureADDefaults.OpenIdScheme, options =>
+            {
+                options.Authority = options.Authority + "/v2.0/";         
+                options.ClientId = configuration["AzureAd:ClientId"];
+                options.CallbackPath = configuration["AzureAd:CallbackPath"];
+                options.ResponseType = OpenIdConnectResponseType.IdToken;
+                options.RequireHttpsMetadata = false;
+
+                options.TokenValidationParameters.ValidateIssuer = false; 
+                options.GetClaimsFromUserInfoEndpoint = true;
+                options.SaveTokens = true;
+                options.SignInScheme = IdentityConstants.ExternalScheme;
+
+                options.Scope.Add("email");
+            });
+		}
+````
+
+
+
+# FAQ
+
+* Help! `GetExternalLoginInfoAsync` returns `null`!
+
+  * There can be 2 reasons for this;
+
+    1. You are trying to authenticate against wrong scheme. Check if you set **SignInScheme** to `IdentityConstants.ExternalScheme`:
+
+       ````xml
+       options.SignInScheme = IdentityConstants.ExternalScheme;
+       ````
+
+    2. Your `ClaimTypes.NameIdentifier` is null. Check if you added claim mapping: 
+
+       ````xml
+       JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+       JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
+       ````
+
+
+* Help! I keep getting ***AADSTS50011: The reply URL specified in the request does not match the reply URLs configured for the application*** error!
+
+  * If you set your **CallbackPath** in appsettings as:
+
+    ````xml
+      "AzureAd": {
+        ...
+        "CallbackPath": "/signin-azuread-oidc"	
+      }
+    ````
+
+    your **Redirect URI** of your application in azure portal must be with <u>domain</u> like `https://localhost:44320/signin-azuread-oidc`, not only `/signin-azuread-oidc`. 
+
+* How can I **debug/watch** which claims I get before they get mapped?
+
+  * You can add a simple event under openid configuration to debug before mapping like: 
+
+    ````xml
+    options.Events.OnTokenValidated = (async context =>
+    {
+    	var claimsFromOidcProvider = context.Principal.Claims.ToList();
+    	await Task.CompletedTask;
+    });
+    ````
+
+* I want to debug further, how can I implement my custom **SignInManager**?
+
+  * You can check [Customizing SignInManager in Abp Framework](link here) post.
+
+* I want to add extra properties to user while they are being created. How can I do that?
+
+  * You can check [Customizing Login Page in Abp Framework]() post.
+
+* Why can't I see **External Register Page** after I sign in from external provider for the first time?
+
+  * ABP framework automatically registers your user with supported email claim from your external authentication provider. You can change this behaviour by [Customizing Login Page in Abp Framework](will be link here).
+

From a6099b10fd59e3fea4473d2390664e39b7bf6ad5 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 05:30:01 +0300
Subject: [PATCH 11/68] added post

---
 docs/en/Blog-Posts/2020-04-02/Post.md | 74 +++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 docs/en/Blog-Posts/2020-04-02/Post.md

diff --git a/docs/en/Blog-Posts/2020-04-02/Post.md b/docs/en/Blog-Posts/2020-04-02/Post.md
new file mode 100644
index 0000000000..a2df997091
--- /dev/null
+++ b/docs/en/Blog-Posts/2020-04-02/Post.md
@@ -0,0 +1,74 @@
+# Custom SignIn Manager
+
+ABP Framework uses Microsoft Identity underneath hence supports customization as much as Microsoft Identity does.
+
+### Creating CustomSignInManager
+
+To create your own custom SignIn Manager, you need to inherit `SignInManager<Volo.Abp.Identity.IdentityUser>`.
+
+````xml
+public class CustomSignInManager : SignInManager<Volo.Abp.Identity.IdentityUser>
+{
+    public CustomSigninManager(
+    UserManager<Volo.Abp.Identity.IdentityUser> userManager,
+    IHttpContextAccessor contextAccessor,
+    IUserClaimsPrincipalFactory<Volo.Abp.Identity.IdentityUser> claimsFactory,
+    IOptions<IdentityOptions> optionsAccessor,
+    ILogger<SignInManager<Volo.Abp.Identity.IdentityUser>> logger,
+    IAuthenticationSchemeProvider schemes,
+    IUserConfirmation<Volo.Abp.Identity.IdentityUser> confirmation) 
+    : base(userManager, contextAccessor, claimsFactory, optionsAccessor, logger, schemes, confirmation)
+    {
+    }
+}
+````
+
+### Overriding Methods
+
+Afterwards you can override a method like `GetExternalLoginInfoAsync`:
+
+````xml
+public override async Task<ExternalLoginInfo> GetExternalLoginInfoAsync(string expectedXsrf = null)
+{
+    var auth = await Context.AuthenticateAsync(IdentityConstants.ExternalScheme);
+    var items = auth?.Properties?.Items;
+    if (auth?.Principal == null || items == null || !items.ContainsKey("LoginProvider"))
+    {
+    	return null;
+    }
+
+    if (expectedXsrf != null)
+    {
+        if (!items.ContainsKey("XsrfId"))
+        {
+        	return null;
+        }
+        var userId = items[XsrfKey] as string;
+        if (userId != expectedXsrf)
+        {
+        return null;
+    }
+    var providerKey = auth.Principal.FindFirstValue(ClaimTypes.NameIdentifier);
+    var provider = items[LoginProviderKey] as string;
+    if (providerKey == null || provider == null)
+    {
+    	return null;
+    }
+
+    var providerDisplayName = (await GetExternalAuthenticationSchemesAsync()).FirstOrDefault(p => p.Name == provider)?.DisplayName ?? provider;
+    return new ExternalLoginInfo(auth.Principal, provider, providerKey, providerDisplayName)
+    {
+    	AuthenticationTokens = auth.Properties.GetTokens()
+    };
+}
+````
+
+### Registering to DI
+
+You need to register your Custom SignIn Manager to DI to activate it. Inside the `.Web` project, locate the `ApplicationNameWebModule` add the following under `ConfigureServices` method:
+
+````xml
+context.Services
+.GetObject<IdentityBuilder>()
+    .AddSignInManager<CustomSigninManager>();
+````
\ No newline at end of file

From d305b39cb1b03022bd7358a9003473b70620a12f Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 05:53:14 +0300
Subject: [PATCH 12/68] naming update

---
 docs/en/Blog-Posts/2020-04-01/Post.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/Blog-Posts/2020-04-01/Post.md
index bc3148ec5e..6650aabbe5 100644
--- a/docs/en/Blog-Posts/2020-04-01/Post.md
+++ b/docs/en/Blog-Posts/2020-04-01/Post.md
@@ -1,4 +1,4 @@
-# Using Azure Active Directory Authentication in ABP Applications
+# Using Azure Active Directory Authentication in ABP ASP.NET Core MVC application
 
 ## Introduction
 

From 4689f4835aa093733fd53a9729a71b68dc8f817a Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 07:29:14 +0300
Subject: [PATCH 13/68] added post

---
 docs/en/Blog-Posts/2020-04-03/Post.md | 122 ++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 docs/en/Blog-Posts/2020-04-03/Post.md

diff --git a/docs/en/Blog-Posts/2020-04-03/Post.md b/docs/en/Blog-Posts/2020-04-03/Post.md
new file mode 100644
index 0000000000..3ac5d212c2
--- /dev/null
+++ b/docs/en/Blog-Posts/2020-04-03/Post.md
@@ -0,0 +1,122 @@
+# Custom Login PageModel in **ABP** ASP.NET Core MVC application
+
+ABP Framework uses Microsoft Identity underneath hence supports customization as much as Microsoft Identity does.
+
+### Creating Login PageModel
+
+To create your own custom Login PageModel, you need to inherit [Abp LoginModel](https://github.com/abpframework/abp/blob/037ef9abe024c03c1f89ab6c933710bcfe3f5c93/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs).
+
+````xml
+public class CustomLoginModel : LoginModel
+{
+    public CustomLoginModel(
+    Microsoft.AspNetCore.Authentication.IAuthenticationSchemeProvider schemeProvider,
+    Microsoft.Extensions.Options.IOptions<Volo.Abp.Account.Web.AbpAccountOptions> accountOptions)
+        : base(schemeProvider, accountOptions)
+        {
+        }
+}
+````
+
+### Overriding Methods
+
+Afterwards you can override a method like `CreateExternalUserAsync`:
+
+````xml
+protected override async Task<Volo.Abp.Identity.IdentityUser> CreateExternalUserAsync(ExternalLoginInfo info)
+{
+    var emailAddress = info.Principal.FindFirstValue(AbpClaimTypes.Email);
+
+    var user = new IdentityUser(GuidGenerator.Create(), emailAddress, emailAddress, CurrentTenant.Id);
+
+    CheckIdentityErrors(await UserManager.CreateAsync(user));
+    CheckIdentityErrors(await UserManager.SetEmailAsync(user, emailAddress));
+    CheckIdentityErrors(await UserManager.AddLoginAsync(user, info));
+
+    return user;
+}
+````
+
+### Overriding Login Page UI
+
+Overriding `.cshtml` files can be easily done via [Virtual File System](https://docs.abp.io/en/abp/latest/Virtual-File-System). Create folder named **Account** under **Pages** directory. Create **Login.cshtml** under Pages/Account directory. 
+
+Set the model with your newly created Login Page Model and customize to your preferences like:
+
+````xml
+@page
+@using Volo.Abp.Account.Settings
+@using Volo.Abp.Settings
+@model Acme.BookStore.Web.CustomLoginModel
+@inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
+@inject Volo.Abp.Settings.ISettingProvider SettingProvider
+
+<div class="jumbotron">
+    <p>My Customized Login Page! </p>
+</div>
+@if (Model.EnableLocalLogin)
+{
+    <div class="card mt-3 shadow-sm rounded">
+        <div class="card-body p-5">
+            <h4>@L["Login"]</h4>
+            @if (await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled))
+            {
+                <strong>
+                    @L["AreYouANewUser"]
+                    <a href="@Url.Page("./Register", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})" class="text-decoration-none">@L["Register"]</a>
+                </strong>
+            }
+            <form method="post" class="mt-4">
+                <input asp-for="ReturnUrl" />
+                <input asp-for="ReturnUrlHash" />
+                <div class="form-group">
+                    <label asp-for="LoginInput.UserNameOrEmailAddress"></label>
+                    <input asp-for="LoginInput.UserNameOrEmailAddress" class="form-control" />
+                    <span asp-validation-for="LoginInput.UserNameOrEmailAddress" class="text-danger"></span>
+                </div>
+                <div class="form-group">
+                    <label asp-for="LoginInput.Password"></label>
+                    <input asp-for="LoginInput.Password" class="form-control" />
+                    <span asp-validation-for="LoginInput.Password" class="text-danger"></span>
+                </div>
+                <div class="form-check">
+                    <label asp-for="LoginInput.RememberMe" class="form-check-label">
+                        <input asp-for="LoginInput.RememberMe" class="form-check-input" />
+                        @Html.DisplayNameFor(m => m.LoginInput.RememberMe)
+                    </label>
+                </div>
+                <abp-button type="submit" button-type="Primary" name="Action" value="Login" class="btn-block btn-lg mt-3">@L["Login"]</abp-button>
+            </form>
+        </div>
+
+        <div class="card-footer text-center border-0">
+            <abp-button type="button" button-type="Link" name="Action" value="Cancel" class="px-2 py-0">@L["Cancel"]</abp-button> @* TODO: Only show if identity server is used *@
+        </div>
+    </div>
+}
+
+@if (Model.VisibleExternalProviders.Any())
+{
+    <div class="col-md-6">
+        <h4>@L["UseAnotherServiceToLogIn"]</h4>
+        <form asp-page="./Login" asp-page-handler="ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" asp-route-returnUrlHash="@Model.ReturnUrlHash" method="post">
+            <input asp-for="ReturnUrl" />
+            <input asp-for="ReturnUrlHash" />
+            @foreach (var provider in Model.VisibleExternalProviders)
+            {
+                <button type="submit" class="btn btn-primary" name="provider" value="@provider.AuthenticationScheme" title="@L["GivenTenantIsNotAvailable", provider.DisplayName]">@provider.DisplayName</button>
+            }
+        </form>
+    </div>
+}
+
+@if (!Model.EnableLocalLogin && !Model.VisibleExternalProviders.Any())
+{
+    <div class="alert alert-warning">
+        <strong>@L["InvalidLoginRequest"]</strong>
+        @L["ThereAreNoLoginSchemesConfiguredForThisClient"]
+    </div>
+}
+````
+
+Further readings, [ASP.NET Core (MVC / Razor Pages) User Interface Customization Guide](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Customization-User-Interface#asp-net-core-mvc-razor-pages-user-interface-customization-guide).
\ No newline at end of file

From a3e990e33585f234cbafed9e071db2cff8ee4fdd Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 15:19:44 +0300
Subject: [PATCH 14/68] removed client secret settings from openId

---
 docs/en/Blog-Posts/2020-04-01/Post.md | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/Blog-Posts/2020-04-01/Post.md
index 6650aabbe5..9b2f49cd51 100644
--- a/docs/en/Blog-Posts/2020-04-01/Post.md
+++ b/docs/en/Blog-Posts/2020-04-01/Post.md
@@ -13,8 +13,6 @@ There will be two samples of connections for better covarage;
 
 
 
-## AddOpenIdConnect 
-
 #### **Update your `appsettings.json`**
 
 In your **.Web** application, add the following section filled with your AzureAD application settings.
@@ -30,6 +28,10 @@ In your **.Web** application, add the following section filled with your AzureAD
   }
 ````
 
+
+
+## AddOpenIdConnect 
+
 Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
 
 ````xml
@@ -51,7 +53,6 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
                      options.ClientId = configuration["AzureAd:ClientId"];
                      options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
                      options.CallbackPath = configuration["AzureAd:CallbackPath"];
-                     options.ClientSecret = configuration["AzureAd:ClientSecret"];
                      options.RequireHttpsMetadata = false;
                      options.SaveTokens = true;
                      options.GetClaimsFromUserInfoEndpoint = true;
@@ -67,21 +68,7 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 
 Install `Microsoft.AspNetCore.Authentication.AzureAD.UI` package to your **.Web** application.
 
-In your **.Web** application, add the following section filled with your AzureAD application settings. 
-
-Notice that <u>you don't need</u> to add `ClientSecret` when you are using `Microsoft.AspNetCore.Authentication.AzureAD.UI` package.
-
-````xml
-  "AzureAd": {
-    "Instance": "https://login.microsoftonline.com/",
-    "TenantId": "<your-tenant-id",
-    "ClientId": "<your-client-id>",
-    "Domain": "domain.onmicrosoft.com",
-    "CallbackPath": "/signin-azuread-oidc"	
-  }
-````
-
-Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
+In your **.Web** application, add the following section filled with your AzureAD application settings. Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
 
 ````xml
 private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)

From 0be742fa0628c62aa96fa4d9a97b1f0f991c207f Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 15:36:43 +0300
Subject: [PATCH 15/68] updated post

---
 docs/en/Blog-Posts/2020-04-01/Post.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/Blog-Posts/2020-04-01/Post.md
index 9b2f49cd51..b57883ac8b 100644
--- a/docs/en/Blog-Posts/2020-04-01/Post.md
+++ b/docs/en/Blog-Posts/2020-04-01/Post.md
@@ -22,7 +22,6 @@ In your **.Web** application, add the following section filled with your AzureAD
     "Instance": "https://login.microsoftonline.com/",
     "TenantId": "<your-tenant-id",
     "ClientId": "<your-client-id>",
-	"ClientSecret": "<your-client-secret>",
     "Domain": "domain.onmicrosoft.com",
     "CallbackPath": "/signin-azuread-oidc"	
   }
@@ -108,7 +107,7 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 
 * Help! `GetExternalLoginInfoAsync` returns `null`!
 
-  * There can be 2 reasons for this;
+  * **There** can be 2 reasons for this;
 
     1. You are trying to authenticate against wrong scheme. Check if you set **SignInScheme** to `IdentityConstants.ExternalScheme`:
 
@@ -137,6 +136,17 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 
     your **Redirect URI** of your application in azure portal must be with <u>domain</u> like `https://localhost:44320/signin-azuread-oidc`, not only `/signin-azuread-oidc`. 
 
+* Help! I am getting ***System.ArgumentNullException: Value cannot be null. (Parameter 'userName')*** error!
+
+
+  * This occurs when you use Azure Authority **v2.0 endpoint** without requesting `email` scope. [Abp checks unique email to create user](https://github.com/abpframework/abp/blob/037ef9abe024c03c1f89ab6c933710bcfe3f5c93/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs#L208). Simply add 
+
+    ````xml
+    options.Scope.Add("email");
+    ````
+
+    to your openid configuration.
+
 * How can I **debug/watch** which claims I get before they get mapped?
 
   * You can add a simple event under openid configuration to debug before mapping like: 

From d8f3d5b85c65322f84cbb3b1a93e5085fa432218 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 16:00:40 +0300
Subject: [PATCH 16/68] changed order of connections

---
 docs/en/Blog-Posts/2020-04-01/Post.md | 76 +++++++++++++--------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/Blog-Posts/2020-04-01/Post.md
index b57883ac8b..9f1d3d964b 100644
--- a/docs/en/Blog-Posts/2020-04-01/Post.md
+++ b/docs/en/Blog-Posts/2020-04-01/Post.md
@@ -8,10 +8,9 @@ Adding Azure Active Directory is pretty straightforward in Abp framework. Couple
 
 There will be two samples of connections for better covarage;
 
-- **AddOpenIdConnect** (Default Microsoft.AspNetCore.Authentication.OpenIdConnect package)
 - **AddAzureAD** (Microsoft.AspNetCore.Authentication.AzureAD.UI package)
-
-
+- **AddOpenIdConnect** (Default Microsoft.AspNetCore.Authentication.OpenIdConnect package)
+- 
 
 #### **Update your `appsettings.json`**
 
@@ -29,38 +28,6 @@ In your **.Web** application, add the following section filled with your AzureAD
 
 
 
-## AddOpenIdConnect 
-
-Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
-
-````xml
-private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
-        {
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
-
-            context.Services.AddAuthentication()
-                .AddIdentityServerAuthentication(options =>
-                {
-                    options.Authority = configuration["AuthServer:Authority"];
-                    options.RequireHttpsMetadata = false;
-                    options.ApiName = "BookStore";
-                })
-                .AddOpenIdConnect("AzureOpenId", "AzureAD", options =>
-                 {
-                     options.Authority = "https://login.microsoftonline.com/" + configuration["AzureAd:TenantId"];
-                     options.ClientId = configuration["AzureAd:ClientId"];
-                     options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
-                     options.CallbackPath = configuration["AzureAd:CallbackPath"];
-                     options.RequireHttpsMetadata = false;
-                     options.SaveTokens = true;
-                     options.GetClaimsFromUserInfoEndpoint = true;
-                 });
-        }
-````
-
-
-
 ## AddAzureAD
 
 #### **Update your `appsettings.json`**
@@ -103,11 +70,43 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 
 
 
+## AddOpenIdConnect 
+
+Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
+
+````xml
+private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
+
+            context.Services.AddAuthentication()
+                .AddIdentityServerAuthentication(options =>
+                {
+                    options.Authority = configuration["AuthServer:Authority"];
+                    options.RequireHttpsMetadata = false;
+                    options.ApiName = "BookStore";
+                })
+                .AddOpenIdConnect("AzureOpenId", "AzureAD", options =>
+                 {
+                     options.Authority = "https://login.microsoftonline.com/" + configuration["AzureAd:TenantId"];
+                     options.ClientId = configuration["AzureAd:ClientId"];
+                     options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+                     options.CallbackPath = configuration["AzureAd:CallbackPath"];
+                     options.RequireHttpsMetadata = false;
+                     options.SaveTokens = true;
+                     options.GetClaimsFromUserInfoEndpoint = true;
+                 });
+        }
+````
+
+
+
 # FAQ
 
 * Help! `GetExternalLoginInfoAsync` returns `null`!
 
-  * **There** can be 2 reasons for this;
+  * There can be 2 reasons for this;
 
     1. You are trying to authenticate against wrong scheme. Check if you set **SignInScheme** to `IdentityConstants.ExternalScheme`:
 
@@ -115,7 +114,7 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
        options.SignInScheme = IdentityConstants.ExternalScheme;
        ````
 
-    2. Your `ClaimTypes.NameIdentifier` is null. Check if you added claim mapping: 
+    2. Your `ClaimTypes.NameIdentifier` is `null`. Check if you added claim mapping: 
 
        ````xml
        JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
@@ -169,5 +168,4 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 
 * Why can't I see **External Register Page** after I sign in from external provider for the first time?
 
-  * ABP framework automatically registers your user with supported email claim from your external authentication provider. You can change this behaviour by [Customizing Login Page in Abp Framework](will be link here).
-
+  * ABP framework automatically registers your user with supported email claim from your external authentication provider. You can change this behavior by [Customizing Login Page in Abp Framework](will be link here).

From 01378dc04c37dd3eab4a0957f4410b627875c0b7 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 16:09:04 +0300
Subject: [PATCH 17/68] organized headers

---
 docs/en/Blog-Posts/2020-04-01/Post.md | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/Blog-Posts/2020-04-01/Post.md
index 9f1d3d964b..2fb937467b 100644
--- a/docs/en/Blog-Posts/2020-04-01/Post.md
+++ b/docs/en/Blog-Posts/2020-04-01/Post.md
@@ -4,17 +4,24 @@
 
 This post demonstrates how to  integrate AzureAD to an ABP application that enables users to sign in using OAuth 2.0 with credentials from Azure Active Directory. 
 
-Adding Azure Active Directory is pretty straightforward in Abp framework. Couple of configurations needs to be done correctly. 
+Adding Azure Active Directory is pretty straightforward in ABP framework. Couple of configurations needs to be done correctly. 
 
-There will be two samples of connections for better covarage;
+There will be two samples of connections for better coverage;
 
 - **AddAzureAD** (Microsoft.AspNetCore.Authentication.AzureAD.UI package)
 - **AddOpenIdConnect** (Default Microsoft.AspNetCore.Authentication.OpenIdConnect package)
-- 
 
-#### **Update your `appsettings.json`**
 
-In your **.Web** application, add the following section filled with your AzureAD application settings.
+
+## Sample Code
+
+https://github.com/abpframework/abp-samples/tree/master/aspnet-core/BookStore-AzureAD
+
+
+
+## Setup
+
+Update your `appsettings.json` in your **.Web** application and add the following section filled with your AzureAD application settings.
 
 ````xml
   "AzureAd": {

From 2867cc34f9e8de7c57827a0765a38773649e5c79 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 16:14:26 +0300
Subject: [PATCH 18/68] updated headers and added sample link

---
 docs/en/Blog-Posts/2020-04-03/Post.md | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/en/Blog-Posts/2020-04-03/Post.md b/docs/en/Blog-Posts/2020-04-03/Post.md
index 3ac5d212c2..7ee3c8b1ed 100644
--- a/docs/en/Blog-Posts/2020-04-03/Post.md
+++ b/docs/en/Blog-Posts/2020-04-03/Post.md
@@ -1,8 +1,18 @@
 # Custom Login PageModel in **ABP** ASP.NET Core MVC application
 
+## Introduction
+
 ABP Framework uses Microsoft Identity underneath hence supports customization as much as Microsoft Identity does.
 
-### Creating Login PageModel
+
+
+## Sample Code
+
+https://github.com/abpframework/abp-samples/tree/master/aspnet-core/BookStore-AzureAD
+
+
+
+## Creating Login PageModel
 
 To create your own custom Login PageModel, you need to inherit [Abp LoginModel](https://github.com/abpframework/abp/blob/037ef9abe024c03c1f89ab6c933710bcfe3f5c93/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs).
 
@@ -18,7 +28,9 @@ public class CustomLoginModel : LoginModel
 }
 ````
 
-### Overriding Methods
+
+
+## Overriding Methods
 
 Afterwards you can override a method like `CreateExternalUserAsync`:
 
@@ -37,7 +49,9 @@ protected override async Task<Volo.Abp.Identity.IdentityUser> CreateExternalUser
 }
 ````
 
-### Overriding Login Page UI
+
+
+## Overriding Login Page UI
 
 Overriding `.cshtml` files can be easily done via [Virtual File System](https://docs.abp.io/en/abp/latest/Virtual-File-System). Create folder named **Account** under **Pages** directory. Create **Login.cshtml** under Pages/Account directory. 
 

From 90c3a36ec11add5c048aeffd1747e82a7ee6b24a Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 16:17:04 +0300
Subject: [PATCH 19/68] updated headers and added sample link

---
 docs/en/Blog-Posts/2020-04-02/Post.md | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/en/Blog-Posts/2020-04-02/Post.md b/docs/en/Blog-Posts/2020-04-02/Post.md
index a2df997091..7919d49032 100644
--- a/docs/en/Blog-Posts/2020-04-02/Post.md
+++ b/docs/en/Blog-Posts/2020-04-02/Post.md
@@ -1,8 +1,18 @@
 # Custom SignIn Manager
 
+## Introduction
+
 ABP Framework uses Microsoft Identity underneath hence supports customization as much as Microsoft Identity does.
 
-### Creating CustomSignInManager
+
+
+## Sample Code
+
+https://github.com/abpframework/abp-samples/blob/master/aspnet-core/BookStore-AzureAD/src/Acme.BookStore.Web/CustomSignInManager.cs
+
+
+
+## Creating CustomSignInManager
 
 To create your own custom SignIn Manager, you need to inherit `SignInManager<Volo.Abp.Identity.IdentityUser>`.
 
@@ -23,7 +33,9 @@ public class CustomSignInManager : SignInManager<Volo.Abp.Identity.IdentityUser>
 }
 ````
 
-### Overriding Methods
+
+
+## Overriding Methods
 
 Afterwards you can override a method like `GetExternalLoginInfoAsync`:
 
@@ -63,9 +75,11 @@ public override async Task<ExternalLoginInfo> GetExternalLoginInfoAsync(string e
 }
 ````
 
-### Registering to DI
 
-You need to register your Custom SignIn Manager to DI to activate it. Inside the `.Web` project, locate the `ApplicationNameWebModule` add the following under `ConfigureServices` method:
+
+## Registering to DI
+
+You need to register your Custom SignIn Manager to DI to activate it. Inside the `.Web` project, locate the `ApplicationNameWebModule` and add the following under `ConfigureServices` method:
 
 ````xml
 context.Services

From 4b5cb6a96937ecc7b71eb3e891924176f918a8e7 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 16:18:30 +0300
Subject: [PATCH 20/68] udpated link

---
 docs/en/Blog-Posts/2020-04-03/Post.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/Blog-Posts/2020-04-03/Post.md b/docs/en/Blog-Posts/2020-04-03/Post.md
index 7ee3c8b1ed..a95eb6c873 100644
--- a/docs/en/Blog-Posts/2020-04-03/Post.md
+++ b/docs/en/Blog-Posts/2020-04-03/Post.md
@@ -8,7 +8,7 @@ ABP Framework uses Microsoft Identity underneath hence supports customization as
 
 ## Sample Code
 
-https://github.com/abpframework/abp-samples/tree/master/aspnet-core/BookStore-AzureAD
+https://github.com/abpframework/abp-samples/blob/master/aspnet-core/BookStore-AzureAD/src/Acme.BookStore.Web/Pages/CustomLoginModel.cs
 
 
 

From d0ee68e612c7e362ba1108e9a5c57aacd47913f5 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 30 Mar 2020 10:33:20 +0800
Subject: [PATCH 21/68] Use object extension system.

---
 .../Acme.BookStore.Domain/Users/AppUser.cs    |  4 ++--
 .../Acme.BookStore.Domain/Users/AppUser.cs    |  4 ++--
 .../BookStoreMigrationsDbContextFactory.cs    |  2 +-
 .../EntityFrameworkCore/BookStoreDbContext.cs |  2 +-
 .../BookStoreEntityExtensions.cs              | 22 +++++++++++--------
 .../BookStoreEntityFrameworkCoreModule.cs     |  2 +-
 ...anagementEfCoreEntityExtensionMappings.cs} | 20 ++++++++++-------
 ...BookManagementEntityFrameworkCoreModule.cs |  2 +-
 .../Acme.BookStore.Domain/Users/AppUser.cs    |  4 ++--
 .../BookStoreMigrationsDbContextFactory.cs    |  2 +-
 .../EntityFrameworkCore/BookStoreDbContext.cs |  2 +-
 ...BookStoreEfCoreEntityExtensionMappings.cs} | 22 +++++++++++--------
 .../BookStoreEntityFrameworkCoreModule.cs     |  2 +-
 .../src/DashboardDemo.Domain/Users/AppUser.cs |  4 ++--
 ...DashboardDemoMigrationsDbContextFactory.cs |  2 +-
 .../DashboardDemoDbContext.cs                 |  2 +-
 ...boardDemoEfCoreEntityExtensionMappings.cs} | 22 +++++++++++--------
 .../DashboardDemoEntityFrameworkCoreModule.cs |  2 +-
 .../Users/AppUser.cs                          |  2 +-
 19 files changed, 70 insertions(+), 54 deletions(-)
 rename samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/{BookManagementEntityExtensions.cs => BookManagementEfCoreEntityExtensionMappings.cs} (51%)
 rename samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/{BookStoreEntityExtensions.cs => BookStoreEfCoreEntityExtensionMappings.cs} (50%)
 rename samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/{DashboardDemoEntityExtensions.cs => DashboardDemoEfCoreEntityExtensionMappings.cs} (50%)

diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs
index 37f67ba60a..b746e68052 100644
--- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -46,9 +46,9 @@ namespace Acme.BookStore.Users
         *
         * If you add a property and using the EF Core, remember these;
         *
-        * 1. update BookStoreDbContext.OnModelCreating
+        * 1. Update BookStoreDbContext.OnModelCreating
         * to configure the mapping for your new property
-        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * 2. Update BookStoreEfCoreEntityExtensionMappings to extend the IdentityUser entity
         * and add your new property to the migration.
         * 3. Use the Add-Migration to add a new database migration.
         * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs
index 37f67ba60a..b746e68052 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -46,9 +46,9 @@ namespace Acme.BookStore.Users
         *
         * If you add a property and using the EF Core, remember these;
         *
-        * 1. update BookStoreDbContext.OnModelCreating
+        * 1. Update BookStoreDbContext.OnModelCreating
         * to configure the mapping for your new property
-        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * 2. Update BookStoreEfCoreEntityExtensionMappings to extend the IdentityUser entity
         * and add your new property to the migration.
         * 3. Use the Add-Migration to add a new database migration.
         * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
index 4f285e597e..dad059f971 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
@@ -11,7 +11,7 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public BookStoreMigrationsDbContext CreateDbContext(string[] args)
         {
-            BookStoreEntityExtensions.Configure();
+            BookStoreEfCoreEntityExtensionMappings.Configure();
             
             var configuration = BuildConfiguration();
 
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
index 7ddeab7a5f..bfa602ef6b 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
@@ -45,7 +45,7 @@ namespace Acme.BookStore.EntityFrameworkCore
                 b.ConfigureAbpUser();
 
                 /* Configure mappings for your additional properties
-                 * Also see the BookStoreEntityExtensions class
+                 * Also see the BookStoreEfCoreEntityExtensionMappings class
                  */
             });
 
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
index 771390698f..cadfa73ccd 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
@@ -1,10 +1,10 @@
-using Volo.Abp.EntityFrameworkCore.Extensions;
-using Volo.Abp.Identity;
+using Volo.Abp.Identity;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.Threading;
 
 namespace Acme.BookStore.EntityFrameworkCore
 {
-    public static class BookStoreEntityExtensions
+    public static class BookStoreEfCoreEntityExtensionMappings
     {
         private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
 
@@ -15,14 +15,18 @@ namespace Acme.BookStore.EntityFrameworkCore
                 /* You can configure entity extension properties for the
                  * entities defined in the used modules.
                  *
+                 * The properties defined here becomes table fields.
+                 * If you want to use the ExtraProperties dictionary of the entity
+                 * instead of creating a new field, then define the property in the
+                 * MyProjectNameDomainObjectExtensions class.
+                 *
                  * Example:
                  *
-                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
-                 *     "MyProperty",
-                 *     b =>
-                 *     {
-                 *         b.HasMaxLength(128);
-                 *     });
+                 * ObjectExtensionManager.Instance
+                 *    .MapEfCoreProperty<IdentityUser, string>(
+                 *        "MyProperty",
+                 *        b => b.HasMaxLength(128)
+                 *    );
                  *
                  * See the documentation for more:
                  * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
index c8142b8088..58999b2b0d 100644
--- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
+++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
@@ -31,7 +31,7 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
-            BookStoreEntityExtensions.Configure();
+            BookStoreEfCoreEntityExtensionMappings.Configure();
         }
         
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityExtensions.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEfCoreEntityExtensionMappings.cs
similarity index 51%
rename from samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityExtensions.cs
rename to samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEfCoreEntityExtensionMappings.cs
index b7a3871453..d4358d0b66 100644
--- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityExtensions.cs
+++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEfCoreEntityExtensionMappings.cs
@@ -1,9 +1,9 @@
-using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.Threading;
 
 namespace Acme.BookStore.BookManagement.EntityFrameworkCore
 {
-    public static class BookManagementEntityExtensions
+    public static class BookManagementEfCoreEntityExtensionMappings
     {
         private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
 
@@ -14,14 +14,18 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore
                 /* You can configure entity extension properties for the
                  * entities defined in the used modules.
                  *
+                 * The properties defined here becomes table fields.
+                 * If you want to use the ExtraProperties dictionary of the entity
+                 * instead of creating a new field, then define the property in the
+                 * MyProjectNameDomainObjectExtensions class.
+                 *
                  * Example:
                  *
-                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
-                 *     "MyProperty",
-                 *     b =>
-                 *     {
-                 *         b.HasMaxLength(128);
-                 *     });
+                 * ObjectExtensionManager.Instance
+                 *    .MapEfCoreProperty<IdentityUser, string>(
+                 *        "MyProperty",
+                 *        b => b.HasMaxLength(128)
+                 *    );
                  *
                  * See the documentation for more:
                  * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs
index 3734551e73..758486bf7e 100644
--- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs
+++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementEntityFrameworkCoreModule.cs
@@ -12,7 +12,7 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
-            BookManagementEntityExtensions.Configure();
+            BookManagementEfCoreEntityExtensionMappings.Configure();
         }
         
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs b/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs
index 37f67ba60a..b746e68052 100644
--- a/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs
+++ b/samples/BookStore/src/Acme.BookStore.Domain/Users/AppUser.cs
@@ -46,9 +46,9 @@ namespace Acme.BookStore.Users
         *
         * If you add a property and using the EF Core, remember these;
         *
-        * 1. update BookStoreDbContext.OnModelCreating
+        * 1. Update BookStoreDbContext.OnModelCreating
         * to configure the mapping for your new property
-        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * 2. Update BookStoreEfCoreEntityExtensionMappings to extend the IdentityUser entity
         * and add your new property to the migration.
         * 3. Use the Add-Migration to add a new database migration.
         * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
index cf8a18e468..52307142f4 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs
@@ -11,7 +11,7 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public BookStoreMigrationsDbContext CreateDbContext(string[] args)
         {
-            BookStoreEntityExtensions.Configure();
+            BookStoreEfCoreEntityExtensionMappings.Configure();
             
             var configuration = BuildConfiguration();
 
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
index 5849e12137..c2df7ee6d0 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
@@ -50,7 +50,7 @@ namespace Acme.BookStore.EntityFrameworkCore
                 b.ConfigureAbpUser();
 
                 /* Configure mappings for your additional properties
-                 * Also see the BookStoreEntityExtensions class
+                 * Also see the BookStoreEfCoreEntityExtensionMappings class
                  */
             });
 
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEfCoreEntityExtensionMappings.cs
similarity index 50%
rename from samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
rename to samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEfCoreEntityExtensionMappings.cs
index 771390698f..cadfa73ccd 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEfCoreEntityExtensionMappings.cs
@@ -1,10 +1,10 @@
-using Volo.Abp.EntityFrameworkCore.Extensions;
-using Volo.Abp.Identity;
+using Volo.Abp.Identity;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.Threading;
 
 namespace Acme.BookStore.EntityFrameworkCore
 {
-    public static class BookStoreEntityExtensions
+    public static class BookStoreEfCoreEntityExtensionMappings
     {
         private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
 
@@ -15,14 +15,18 @@ namespace Acme.BookStore.EntityFrameworkCore
                 /* You can configure entity extension properties for the
                  * entities defined in the used modules.
                  *
+                 * The properties defined here becomes table fields.
+                 * If you want to use the ExtraProperties dictionary of the entity
+                 * instead of creating a new field, then define the property in the
+                 * MyProjectNameDomainObjectExtensions class.
+                 *
                  * Example:
                  *
-                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
-                 *     "MyProperty",
-                 *     b =>
-                 *     {
-                 *         b.HasMaxLength(128);
-                 *     });
+                 * ObjectExtensionManager.Instance
+                 *    .MapEfCoreProperty<IdentityUser, string>(
+                 *        "MyProperty",
+                 *        b => b.HasMaxLength(128)
+                 *    );
                  *
                  * See the documentation for more:
                  * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
index be5f6039b4..3faeb576da 100644
--- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
+++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs
@@ -29,7 +29,7 @@ namespace Acme.BookStore.EntityFrameworkCore
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
-            BookStoreEntityExtensions.Configure();
+            BookStoreEfCoreEntityExtensionMappings.Configure();
         }
         
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs
index cfad912abe..43f40fed20 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs
@@ -46,9 +46,9 @@ namespace DashboardDemo.Users
         *
         * If you add a property and using the EF Core, remember these;
         *
-        * 1. update BookStoreDbContext.OnModelCreating
+        * 1. Update BookStoreDbContext.OnModelCreating
         * to configure the mapping for your new property
-        * 2. Update BookStoreEntityExtensions to extend the IdentityUser entity
+        * 2. Update DashboardDemoEfCoreEntityExtensionMappings to extend the IdentityUser entity
         * and add your new property to the migration.
         * 3. Use the Add-Migration to add a new database migration.
         * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs
index 10ce7b7da1..b9f1526ad4 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs
@@ -11,7 +11,7 @@ namespace DashboardDemo.EntityFrameworkCore
     {
         public DashboardDemoMigrationsDbContext CreateDbContext(string[] args)
         {
-            DashboardDemoEntityExtensions.Configure();
+            DashboardDemoEfCoreEntityExtensionMappings.Configure();
             
             var configuration = BuildConfiguration();
 
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs
index 33c1ddb82d..a5d0bdea2e 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs
@@ -48,7 +48,7 @@ namespace DashboardDemo.EntityFrameworkCore
                 b.ConfigureAbpUser();
 
                 /* Configure mappings for your additional properties
-                 * Also see the DashboardDemoEntityExtensions class
+                 * Also see the DashboardDemoEfCoreEntityExtensionMappings class
                  */
             });
 
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityExtensions.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEfCoreEntityExtensionMappings.cs
similarity index 50%
rename from samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityExtensions.cs
rename to samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEfCoreEntityExtensionMappings.cs
index b41ccb8ac8..2e5ce4d0bf 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityExtensions.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEfCoreEntityExtensionMappings.cs
@@ -1,10 +1,10 @@
-using Volo.Abp.EntityFrameworkCore.Extensions;
-using Volo.Abp.Identity;
+using Volo.Abp.Identity;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.Threading;
 
 namespace DashboardDemo.EntityFrameworkCore
 {
-    public static class DashboardDemoEntityExtensions
+    public static class DashboardDemoEfCoreEntityExtensionMappings
     {
         private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
 
@@ -15,14 +15,18 @@ namespace DashboardDemo.EntityFrameworkCore
                 /* You can configure entity extension properties for the
                  * entities defined in the used modules.
                  *
+                 * The properties defined here becomes table fields.
+                 * If you want to use the ExtraProperties dictionary of the entity
+                 * instead of creating a new field, then define the property in the
+                 * MyProjectNameDomainObjectExtensions class.
+                 *
                  * Example:
                  *
-                 * EntityExtensionManager.AddProperty<IdentityUser, string>(
-                 *     "MyProperty",
-                 *     b =>
-                 *     {
-                 *         b.HasMaxLength(128);
-                 *     });
+                 * ObjectExtensionManager.Instance
+                 *    .MapEfCoreProperty<IdentityUser, string>(
+                 *        "MyProperty",
+                 *        b => b.HasMaxLength(128)
+                 *    );
                  *
                  * See the documentation for more:
                  * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs
index b183c49446..043cf10197 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs
@@ -29,7 +29,7 @@ namespace DashboardDemo.EntityFrameworkCore
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
-            DashboardDemoEntityExtensions.Configure();
+            DashboardDemoEfCoreEntityExtensionMappings.Configure();
         }
 
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Users/AppUser.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Users/AppUser.cs
index cd5c8dbb3d..1b5b3996ee 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Users/AppUser.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Users/AppUser.cs
@@ -46,7 +46,7 @@ namespace MyCompanyName.MyProjectName.Users
          *
          * If you add a property and using the EF Core, remember these;
          *
-         * 1. update MyProjectNameDbContext.OnModelCreating
+         * 1. Update MyProjectNameDbContext.OnModelCreating
          * to configure the mapping for your new property
          * 2. Update MyProjectNameEfCoreEntityExtensionMappings to extend the IdentityUser entity
          * and add your new property to the migration.

From 4a83c2db832b698f478074290fb20b1687699abf Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 30 Mar 2020 10:39:07 +0800
Subject: [PATCH 22/68] Rename BookStoreEntityExtensions to
 BookStoreEfCoreEntityExtensionMappings.

---
 ...ityExtensions.cs => BookStoreEfCoreEntityExtensionMappings.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/{BookStoreEntityExtensions.cs => BookStoreEfCoreEntityExtensionMappings.cs} (100%)

diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEfCoreEntityExtensionMappings.cs
similarity index 100%
rename from samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityExtensions.cs
rename to samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEfCoreEntityExtensionMappings.cs

From a05cf07cf42f469dd3e794b6bd63eb3d7b321dfc Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 30 Mar 2020 11:41:32 +0800
Subject: [PATCH 23/68] Set ExternalProviders and EnableLocalLogin properties
 in the page's OnPost method.

Resolve #3400
---
 .../IdentityServerSupportedLoginModel.cs      | 19 ++++-------
 .../Pages/Account/Login.cshtml.cs             | 33 ++++++++++++-------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
index 179e18246a..e194c1544d 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
@@ -68,18 +68,11 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 return Page();
             }
 
-            var schemes = await SchemeProvider.GetAllSchemesAsync();
-
-            var providers = schemes
-                .Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
-                .Select(x => new ExternalProviderModel
-                {
-                    DisplayName = x.DisplayName,
-                    AuthenticationScheme = x.Name
-                })
-                .ToList();
+            var providers = await GetExternalProviders();
+            ExternalProviders = providers.ToList();
 
             EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
+
             if (context?.ClientId != null)
             {
                 var client = await ClientStore.FindEnabledClientByIdAsync(context.ClientId);
@@ -94,8 +87,6 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 }
             }
 
-            ExternalProviders = providers.ToArray();
-
             if (IsExternalLoginOnly)
             {
                 return await base.OnPostExternalLogin(providers.First().AuthenticationScheme);
@@ -124,6 +115,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             ValidateModel();
 
+            ExternalProviders = await GetExternalProviders();
+            
+            EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
+
             await ReplaceEmailToUsernameOfInputIfNeeds();
 
             var result = await SignInManager.PasswordSignInAsync(
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
index 014088983a..5f15df99b4 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
@@ -63,21 +63,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
         {
             LoginInput = new LoginInputModel();
 
-            var schemes = await SchemeProvider.GetAllSchemesAsync();
-
-            var providers = schemes
-                .Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
-                .Select(x => new ExternalProviderModel
-                {
-                    DisplayName = x.DisplayName,
-                    AuthenticationScheme = x.Name
-                })
-                .ToList();
+            ExternalProviders = await GetExternalProviders();
 
             EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
 
-            ExternalProviders = providers.ToArray();
-
             if (IsExternalLoginOnly)
             {
                 //return await ExternalLogin(vm.ExternalLoginScheme, returnUrl);
@@ -94,6 +83,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             ValidateModel();
 
+            ExternalProviders = await GetExternalProviders();
+            
+            EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
+
             await ReplaceEmailToUsernameOfInputIfNeeds();
 
             var result = await SignInManager.PasswordSignInAsync(
@@ -140,6 +133,22 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return RedirectSafely(ReturnUrl, ReturnUrlHash);
         }
 
+        protected virtual async Task<List<ExternalProviderModel>> GetExternalProviders()
+        {
+            var schemes = await SchemeProvider.GetAllSchemesAsync();
+
+            var providers = schemes
+                .Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
+                .Select(x => new ExternalProviderModel
+                {
+                    DisplayName = x.DisplayName,
+                    AuthenticationScheme = x.Name
+                })
+                .ToList();
+
+            return providers.ToList();
+        }
+
         [UnitOfWork]
         public virtual async Task<IActionResult> OnPostExternalLogin(string provider)
         {

From 3f26e2b8ac6f7c952c6aced41e99faf82b42df2e Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 30 Mar 2020 14:48:31 +0800
Subject: [PATCH 24/68] Refactor.

---
 .../src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
index 5f15df99b4..24e7732c9c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
@@ -137,7 +137,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
         {
             var schemes = await SchemeProvider.GetAllSchemesAsync();
 
-            var providers = schemes
+            return schemes
                 .Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
                 .Select(x => new ExternalProviderModel
                 {
@@ -145,8 +145,6 @@ namespace Volo.Abp.Account.Web.Pages.Account
                     AuthenticationScheme = x.Name
                 })
                 .ToList();
-
-            return providers.ToList();
         }
 
         [UnitOfWork]

From 686614ab7f51c0755692dfd89422e1471626f8c1 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 1 Apr 2020 15:58:29 +0800
Subject: [PATCH 25/68] Add builderAction parameter to the BuildConfiguration
 method.

Resolve #3429
---
 .../Extensions/Configuration/ConfigurationHelper.cs          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs
index 44b75d1adb..82d393eef3 100644
--- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs
+++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs
@@ -6,7 +6,8 @@ namespace Microsoft.Extensions.Configuration
     public static class ConfigurationHelper
     {
         public static IConfigurationRoot BuildConfiguration(
-            AbpConfigurationBuilderOptions options = null)
+            AbpConfigurationBuilderOptions options = null, 
+            Action<IConfigurationBuilder> builderAction = null)
         {
             options = options ?? new AbpConfigurationBuilderOptions();
 
@@ -43,6 +44,8 @@ namespace Microsoft.Extensions.Configuration
                 builder = builder.AddCommandLine(options.CommandLineArgs);
             }
 
+            builderAction?.Invoke(builder);
+            
             return builder.Build();
         }
     }

From b19519ece2df150a22998a141c772eb399d79682 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Wed, 1 Apr 2020 20:51:00 +0300
Subject: [PATCH 26/68] feat(core): add dom strategy

---
 .../core/src/lib/strategies/dom.strategy.ts   | 28 +++++++++++
 .../packages/core/src/lib/strategies/index.ts |  1 +
 .../core/src/lib/tests/dom.strategy.spec.ts   | 49 +++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 npm/ng-packs/packages/core/src/lib/strategies/dom.strategy.ts
 create mode 100644 npm/ng-packs/packages/core/src/lib/strategies/index.ts
 create mode 100644 npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/dom.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/dom.strategy.ts
new file mode 100644
index 0000000000..4fbe18d235
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/strategies/dom.strategy.ts
@@ -0,0 +1,28 @@
+export class DomStrategy {
+  constructor(
+    public target: HTMLElement = document.head,
+    public position: InsertPosition = 'beforeend',
+  ) {}
+
+  insertElement<T extends HTMLElement>(element: T) {
+    this.target.insertAdjacentElement(this.position, element);
+  }
+}
+
+export const DOM_STRATEGY = {
+  AfterElement(element: HTMLElement) {
+    return new DomStrategy(element, 'afterend');
+  },
+  AppendToBody() {
+    return new DomStrategy(document.body, 'beforeend');
+  },
+  AppendToHead() {
+    return new DomStrategy(document.head, 'beforeend');
+  },
+  BeforeElement(element: HTMLElement) {
+    return new DomStrategy(element, 'beforebegin');
+  },
+  PrependToHead() {
+    return new DomStrategy(document.head, 'afterbegin');
+  },
+};
diff --git a/npm/ng-packs/packages/core/src/lib/strategies/index.ts b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
new file mode 100644
index 0000000000..2506a819de
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
@@ -0,0 +1 @@
+export * from './dom.strategy';
diff --git a/npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts
new file mode 100644
index 0000000000..7e5f264f2b
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts
@@ -0,0 +1,49 @@
+import { DomStrategy, DOM_STRATEGY } from '../strategies';
+
+describe('DomStrategy', () => {
+  describe('#insertElement', () => {
+    it('should append element to head by default', () => {
+      const strategy = new DomStrategy();
+      const element = document.createElement('script');
+      strategy.insertElement(element);
+
+      expect(document.head.lastChild).toBe(element);
+    });
+
+    it('should append element to body when body is given as target', () => {
+      const strategy = new DomStrategy(document.body);
+      const element = document.createElement('script');
+      strategy.insertElement(element);
+
+      expect(document.body.lastChild).toBe(element);
+    });
+
+    it('should prepend to head when position is given as "afterbegin"', () => {
+      const strategy = new DomStrategy(undefined, 'afterbegin');
+      const element = document.createElement('script');
+      strategy.insertElement(element);
+
+      expect(document.head.firstChild).toBe(element);
+    });
+  });
+});
+
+describe('DOM_STRATEGY', () => {
+  let div = document.createElement('DIV');
+
+  beforeEach(() => {
+    document.body.innerHTML = '';
+    document.body.appendChild(div);
+  });
+
+  test.each`
+    name               | target           | position
+    ${'AfterElement'}  | ${div}           | ${'afterend'}
+    ${'AppendToBody'}  | ${document.body} | ${'beforeend'}
+    ${'AppendToHead'}  | ${document.head} | ${'beforeend'}
+    ${'BeforeElement'} | ${div}           | ${'beforebegin'}
+    ${'PrependToHead'} | ${document.head} | ${'afterbegin'}
+  `('should successfully map $name to CrossOriginStrategy', ({ name, target, position }) => {
+    expect(DOM_STRATEGY[name](target)).toEqual(new DomStrategy(target, position));
+  });
+});

From cb51ca7fc14660db52281a6556bfcfdb70309f98 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Wed, 1 Apr 2020 20:52:02 +0300
Subject: [PATCH 27/68] feat(core): add cross-origin strategy

---
 .../lib/strategies/cross-origin.strategy.ts   | 17 +++++++++
 .../packages/core/src/lib/strategies/index.ts |  1 +
 .../lib/tests/cross-origin.strategy.spec.ts   | 38 +++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 npm/ng-packs/packages/core/src/lib/strategies/cross-origin.strategy.ts
 create mode 100644 npm/ng-packs/packages/core/src/lib/tests/cross-origin.strategy.spec.ts

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/cross-origin.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/cross-origin.strategy.ts
new file mode 100644
index 0000000000..c56d7a3d54
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/strategies/cross-origin.strategy.ts
@@ -0,0 +1,17 @@
+export class CrossOriginStrategy {
+  constructor(public crossorigin: 'anonymous' | 'use-credentials', public integrity?: string) {}
+
+  setCrossOrigin<T extends HTMLElement>(element: T) {
+    if (this.integrity) element.setAttribute('integrity', this.integrity);
+    element.setAttribute('crossorigin', this.crossorigin);
+  }
+}
+
+export const CROSS_ORIGIN_STRATEGY = {
+  Anonymous(integrity?: string) {
+    return new CrossOriginStrategy('anonymous', integrity);
+  },
+  UseCredentials(integrity?: string) {
+    return new CrossOriginStrategy('use-credentials', integrity);
+  },
+};
diff --git a/npm/ng-packs/packages/core/src/lib/strategies/index.ts b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
index 2506a819de..d1a367e138 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
@@ -1 +1,2 @@
+export * from './cross-origin.strategy';
 export * from './dom.strategy';
diff --git a/npm/ng-packs/packages/core/src/lib/tests/cross-origin.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/cross-origin.strategy.spec.ts
new file mode 100644
index 0000000000..25cc6f0c93
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tests/cross-origin.strategy.spec.ts
@@ -0,0 +1,38 @@
+import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from '../strategies';
+import { uuid } from '../utils';
+
+describe('CrossOriginStrategy', () => {
+  describe('#setCrossOrigin', () => {
+    it('should set crossorigin attribute', () => {
+      const strategy = new CrossOriginStrategy('use-credentials');
+      const element = document.createElement('link');
+      strategy.setCrossOrigin(element);
+
+      expect(element.crossOrigin).toBe('use-credentials');
+    });
+
+    it('should set integrity attribute when given', () => {
+      const integrity = uuid();
+      const strategy = new CrossOriginStrategy('anonymous', integrity);
+      const element = document.createElement('link');
+      strategy.setCrossOrigin(element);
+
+      expect(element.crossOrigin).toBe('anonymous');
+      expect(element.getAttribute('integrity')).toBe(integrity);
+    });
+  });
+});
+
+describe('CROSS_ORIGIN_STRATEGY', () => {
+  test.each`
+    name                | integrity    | crossOrigin
+    ${'Anonymous'}      | ${undefined} | ${'anonymous'}
+    ${'Anonymous'}      | ${uuid()}    | ${'anonymous'}
+    ${'UseCredentials'} | ${undefined} | ${'use-credentials'}
+    ${'UseCredentials'} | ${uuid()}    | ${'use-credentials'}
+  `('should successfully map $name to CrossOriginStrategy', ({ name, integrity, crossOrigin }) => {
+    expect(CROSS_ORIGIN_STRATEGY[name](integrity)).toEqual(
+      new CrossOriginStrategy(crossOrigin, integrity),
+    );
+  });
+});

From b55bc42779912c395856a7ea8d1d1725c9ee86ea Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Wed, 1 Apr 2020 20:53:30 +0300
Subject: [PATCH 28/68] feat(core): add fromLazyLoad utility function

---
 .../src/lib/tests/lazy-load-utils.spec.ts     | 105 ++++++++++++++++++
 .../packages/core/src/lib/utils/index.ts      |   1 +
 .../core/src/lib/utils/lazy-load-utils.ts     |  54 +++++++++
 3 files changed, 160 insertions(+)
 create mode 100644 npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
 create mode 100644 npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts

diff --git a/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
new file mode 100644
index 0000000000..657afeead1
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
@@ -0,0 +1,105 @@
+import { DomStrategy, DOM_STRATEGY } from '../strategies';
+import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from '../strategies/cross-origin.strategy';
+import { uuid } from '../utils';
+import { fromLazyLoad } from '../utils/lazy-load-utils';
+
+describe('Lazy Load Utils', () => {
+  describe('#fromLazyLoad', () => {
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should append to head by default', () => {
+      const element = document.createElement('link');
+      const spy = jest.spyOn(document.head, 'insertAdjacentElement');
+
+      fromLazyLoad(element);
+      expect(spy).toHaveBeenCalledWith('beforeend', element);
+    });
+
+    it('should allow setting a dom strategy', () => {
+      const element = document.createElement('link');
+      const spy = jest.spyOn(document.head, 'insertAdjacentElement');
+
+      fromLazyLoad(element, DOM_STRATEGY.PrependToHead());
+      expect(spy).toHaveBeenCalledWith('afterbegin', element);
+    });
+
+    it('should set crossorigin to "anonymous" by default', () => {
+      const element = document.createElement('link');
+
+      fromLazyLoad(element);
+
+      expect(element.crossOrigin).toBe('anonymous');
+    });
+
+    it('should allow setting a crossorigin strategy', () => {
+      const element = document.createElement('link');
+
+      const integrity = uuid();
+
+      fromLazyLoad(element, undefined, CROSS_ORIGIN_STRATEGY.UseCredentials(integrity));
+
+      expect(element.crossOrigin).toBe('use-credentials');
+      expect(element.getAttribute('integrity')).toBe(integrity);
+    });
+
+    it('should emit error event on fail and clear callbacks', done => {
+      const error = new CustomEvent('error');
+      const parentNode = { removeChild: jest.fn() };
+      const element = ({ parentNode } as any) as HTMLLinkElement;
+
+      fromLazyLoad(
+        element,
+        {
+          insertElement(el: HTMLLinkElement) {
+            expect(el).toBe(element);
+
+            setTimeout(() => {
+              el.onerror(error);
+            }, 0);
+          },
+        } as DomStrategy,
+        {
+          setCrossOrigin(el: HTMLLinkElement) {},
+        } as CrossOriginStrategy,
+      ).subscribe({
+        error: value => {
+          expect(value).toBe(error);
+          expect(parentNode.removeChild).toHaveBeenCalledWith(element);
+          expect(element.onerror).toBeNull();
+          done();
+        },
+      });
+    });
+
+    it('should emit load event on success and clear callbacks', done => {
+      const success = new CustomEvent('load');
+      const parentNode = { removeChild: jest.fn() };
+      const element = ({ parentNode } as any) as HTMLLinkElement;
+
+      fromLazyLoad(
+        element,
+        {
+          insertElement(el: HTMLLinkElement) {
+            expect(el).toBe(element);
+
+            setTimeout(() => {
+              el.onload(success);
+            }, 0);
+          },
+        } as DomStrategy,
+        {
+          setCrossOrigin(el: HTMLLinkElement) {},
+        } as CrossOriginStrategy,
+      ).subscribe({
+        next: value => {
+          expect(value).toBe(success);
+          expect(parentNode.removeChild).not.toHaveBeenCalled();
+          expect(element.onload).toBeNull();
+          done();
+        },
+      });
+    });
+  });
+});
diff --git a/npm/ng-packs/packages/core/src/lib/utils/index.ts b/npm/ng-packs/packages/core/src/lib/utils/index.ts
index 0043152ada..a0404f7568 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/index.ts
@@ -1,5 +1,6 @@
 export * from './common-utils';
 export * from './generator-utils';
 export * from './initial-utils';
+export * from './lazy-load-utils';
 export * from './route-utils';
 export * from './rxjs-utils';
diff --git a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
new file mode 100644
index 0000000000..5aee3bc715
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
@@ -0,0 +1,54 @@
+import { Observable, Observer } from 'rxjs';
+import {
+  CrossOriginStrategy,
+  CROSS_ORIGIN_STRATEGY,
+  DomStrategy,
+  DOM_STRATEGY,
+} from '../strategies';
+
+export function fromLazyLoad<T extends Event>(
+  element: HTMLScriptElement | HTMLLinkElement,
+  domStrategy: DomStrategy = DOM_STRATEGY.AppendToHead(),
+  crossOriginStrategy: CrossOriginStrategy = CROSS_ORIGIN_STRATEGY.Anonymous(),
+): Observable<T> {
+  crossOriginStrategy.setCrossOrigin(element);
+  domStrategy.insertElement(element);
+
+  return Observable.create((observer: Observer<Event>) => {
+    element.onload = event => {
+      clearCallbacks(element);
+      observer.next(event);
+      observer.complete();
+    };
+
+    const handleError = createErrorHandler(observer, element);
+
+    element.onerror = handleError;
+    element.onabort = handleError;
+    element.onemptied = handleError;
+    element.onstalled = handleError;
+    element.onsuspend = handleError;
+
+    return () => {
+      clearCallbacks(element);
+      observer.complete();
+    };
+  });
+}
+
+function createErrorHandler(observer: Observer<Event>, element: HTMLElement) {
+  return function(event: Event | string) {
+    clearCallbacks(element);
+    element.parentNode.removeChild(element);
+    observer.error(event);
+  };
+}
+
+function clearCallbacks(element: HTMLElement) {
+  element.onload = null;
+  element.onerror = null;
+  element.onabort = null;
+  element.onemptied = null;
+  element.onstalled = null;
+  element.onsuspend = null;
+}

From 79b080671843e18eb30163594877b5a27b4768bf Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Wed, 1 Apr 2020 20:53:59 +0300
Subject: [PATCH 29/68] feat(core): add loading strategies

---
 .../packages/core/src/lib/strategies/index.ts |  1 +
 .../src/lib/strategies/loading.strategy.ts    | 68 ++++++++++++++
 .../src/lib/tests/loading.strategy.spec.ts    | 90 +++++++++++++++++++
 3 files changed, 159 insertions(+)
 create mode 100644 npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
 create mode 100644 npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/index.ts b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
index d1a367e138..915887f92a 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
@@ -1,2 +1,3 @@
 export * from './cross-origin.strategy';
 export * from './dom.strategy';
+export * from './loading.strategy';
diff --git a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
new file mode 100644
index 0000000000..eae23a0c7f
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
@@ -0,0 +1,68 @@
+import { Observable, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+import { fromLazyLoad } from '../utils';
+import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from './cross-origin.strategy';
+import { DomStrategy, DOM_STRATEGY } from './dom.strategy';
+
+export abstract class LoadingStrategy<T extends HTMLScriptElement | HTMLLinkElement = any> {
+  constructor(
+    public path: string,
+    protected domStrategy: DomStrategy = DOM_STRATEGY.AppendToHead(),
+    protected crossOriginStrategy: CrossOriginStrategy = CROSS_ORIGIN_STRATEGY.Anonymous(),
+  ) {}
+
+  abstract createElement(): T;
+
+  createStream<T extends Event>(): Observable<T> {
+    return of(null).pipe(
+      switchMap(() =>
+        fromLazyLoad<T>(this.createElement(), this.domStrategy, this.crossOriginStrategy),
+      ),
+    );
+  }
+}
+
+export class ScriptLoadingStrategy extends LoadingStrategy<HTMLScriptElement> {
+  constructor(src: string, domStrategy?: DomStrategy, crossOriginStrategy?: CrossOriginStrategy) {
+    super(src, domStrategy, crossOriginStrategy);
+  }
+
+  createElement(): HTMLScriptElement {
+    const element = document.createElement('script');
+    element.src = this.path;
+
+    return element;
+  }
+}
+
+export class StyleLoadingStrategy extends LoadingStrategy<HTMLLinkElement> {
+  constructor(href: string, domStrategy?: DomStrategy, crossOriginStrategy?: CrossOriginStrategy) {
+    super(href, domStrategy, crossOriginStrategy);
+  }
+
+  createElement(): HTMLLinkElement {
+    const element = document.createElement('link');
+    element.rel = 'stylesheet';
+    element.href = this.path;
+
+    return element;
+  }
+}
+
+export const LOADING_STRATEGY = {
+  AppendAnonymousScriptToBody(src: string) {
+    return new ScriptLoadingStrategy(src, DOM_STRATEGY.AppendToBody());
+  },
+  AppendAnonymousScriptToHead(src: string) {
+    return new ScriptLoadingStrategy(src);
+  },
+  AppendAnonymousStyleToHead(src: string) {
+    return new StyleLoadingStrategy(src);
+  },
+  PrependAnonymousScriptToHead(src: string) {
+    return new ScriptLoadingStrategy(src, DOM_STRATEGY.PrependToHead());
+  },
+  PrependAnonymousStyleToHead(src: string) {
+    return new StyleLoadingStrategy(src, DOM_STRATEGY.PrependToHead());
+  },
+};
diff --git a/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
new file mode 100644
index 0000000000..9260cd8948
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
@@ -0,0 +1,90 @@
+import {
+  CROSS_ORIGIN_STRATEGY,
+  DOM_STRATEGY,
+  LOADING_STRATEGY,
+  ScriptLoadingStrategy,
+  StyleLoadingStrategy,
+} from '../strategies';
+
+const path = 'http://example.com/';
+
+describe('ScriptLoadingStrategy', () => {
+  describe('#createElement', () => {
+    it('should return a script element with src attribute', () => {
+      const strategy = new ScriptLoadingStrategy(path);
+      const element = strategy.createElement();
+
+      expect(element.tagName).toBe('SCRIPT');
+      expect(element.src).toBe(path);
+    });
+  });
+
+  describe('#createStream', () => {
+    it('should use given dom and cross-origin strategies', done => {
+      const domStrategy = DOM_STRATEGY.PrependToHead();
+      const crossOriginStrategy = CROSS_ORIGIN_STRATEGY.UseCredentials();
+
+      domStrategy.insertElement = jest.fn((el: HTMLScriptElement) => {
+        setTimeout(() => {
+          el.onload(new CustomEvent('success', { detail: el.crossOrigin }));
+        }, 0);
+      }) as any;
+
+      const strategy = new ScriptLoadingStrategy(path, domStrategy, crossOriginStrategy);
+
+      strategy.createStream<CustomEvent>().subscribe(event => {
+        expect(event.detail).toBe('use-credentials');
+        done();
+      });
+    });
+  });
+});
+
+describe('StyleLoadingStrategy', () => {
+  describe('#createElement', () => {
+    it('should return a style element with href and rel attributes', () => {
+      const strategy = new StyleLoadingStrategy(path);
+      const element = strategy.createElement();
+
+      expect(element.tagName).toBe('LINK');
+      expect(element.href).toBe(path);
+      expect(element.rel).toBe('stylesheet');
+    });
+  });
+
+  describe('#createStream', () => {
+    it('should use given dom and cross-origin strategies', done => {
+      const domStrategy = DOM_STRATEGY.PrependToHead();
+      const crossOriginStrategy = CROSS_ORIGIN_STRATEGY.UseCredentials();
+
+      domStrategy.insertElement = jest.fn((el: HTMLLinkElement) => {
+        setTimeout(() => {
+          el.onload(new CustomEvent('success', { detail: el.crossOrigin }));
+        }, 0);
+      }) as any;
+
+      const strategy = new StyleLoadingStrategy(path, domStrategy, crossOriginStrategy);
+
+      strategy.createStream<CustomEvent>().subscribe(event => {
+        expect(event.detail).toBe('use-credentials');
+        done();
+      });
+    });
+  });
+});
+
+describe('LOADING_STRATEGY', () => {
+  test.each`
+    name                              | Strategy                 | domStrategy
+    ${'AppendAnonymousScriptToBody'}  | ${ScriptLoadingStrategy} | ${'AppendToBody'}
+    ${'AppendAnonymousScriptToHead'}  | ${ScriptLoadingStrategy} | ${'AppendToHead'}
+    ${'AppendAnonymousStyleToHead'}   | ${StyleLoadingStrategy}  | ${'AppendToHead'}
+    ${'PrependAnonymousScriptToHead'} | ${ScriptLoadingStrategy} | ${'PrependToHead'}
+    ${'PrependAnonymousStyleToHead'}  | ${StyleLoadingStrategy}  | ${'PrependToHead'}
+  `(
+    'should successfully map $name to $Strategy.name with $domStrategy dom strategy',
+    ({ name, Strategy, domStrategy }) => {
+      expect(LOADING_STRATEGY[name](path)).toEqual(new Strategy(path, DOM_STRATEGY[domStrategy]()));
+    },
+  );
+});

From 4cc3a272ebe8a207d2cb4896195970c241feed9c Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 13:20:08 +0300
Subject: [PATCH 30/68] feat(core): add content security strategy

---
 .../strategies/content-security.strategy.ts   | 32 +++++++++++++
 .../packages/core/src/lib/strategies/index.ts |  1 +
 .../src/lib/strategies/loading.strategy.ts    | 27 ++++++++---
 .../tests/content-security.strategy.spec.ts   | 41 +++++++++++++++++
 .../src/lib/tests/lazy-load-utils.spec.ts     | 45 +++++++++++++++++--
 .../src/lib/tests/loading.strategy.spec.ts    | 43 +++++++++++++++---
 .../core/src/lib/utils/lazy-load-utils.ts     |  4 ++
 7 files changed, 178 insertions(+), 15 deletions(-)
 create mode 100644 npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts
 create mode 100644 npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts
new file mode 100644
index 0000000000..54016b5836
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts
@@ -0,0 +1,32 @@
+export abstract class ContentSecurityStrategy {
+  constructor(public nonce?: string) {}
+
+  abstract applyCSP(element: HTMLScriptElement | HTMLStyleElement): void;
+}
+
+export class StrictContentSecurityStrategy extends ContentSecurityStrategy {
+  constructor(nonce: string) {
+    super(nonce);
+  }
+
+  applyCSP(element: HTMLScriptElement | HTMLStyleElement) {
+    element.setAttribute('nonce', this.nonce);
+  }
+}
+
+export class LooseContentSecurityStrategy extends ContentSecurityStrategy {
+  constructor() {
+    super();
+  }
+
+  applyCSP(_: HTMLScriptElement | HTMLStyleElement) {}
+}
+
+export const CONTENT_SECURITY_STRATEGY = {
+  Loose() {
+    return new LooseContentSecurityStrategy();
+  },
+  Strict(nonce: string) {
+    return new StrictContentSecurityStrategy(nonce);
+  },
+};
diff --git a/npm/ng-packs/packages/core/src/lib/strategies/index.ts b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
index 915887f92a..93904af549 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/index.ts
@@ -1,3 +1,4 @@
+export * from './content-security.strategy';
 export * from './cross-origin.strategy';
 export * from './dom.strategy';
 export * from './loading.strategy';
diff --git a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
index eae23a0c7f..5c8bd485ca 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
@@ -1,6 +1,7 @@
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { fromLazyLoad } from '../utils';
+import { ContentSecurityStrategy, CONTENT_SECURITY_STRATEGY } from './content-security.strategy';
 import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from './cross-origin.strategy';
 import { DomStrategy, DOM_STRATEGY } from './dom.strategy';
 
@@ -9,6 +10,7 @@ export abstract class LoadingStrategy<T extends HTMLScriptElement | HTMLLinkElem
     public path: string,
     protected domStrategy: DomStrategy = DOM_STRATEGY.AppendToHead(),
     protected crossOriginStrategy: CrossOriginStrategy = CROSS_ORIGIN_STRATEGY.Anonymous(),
+    protected contentSecurityStrategy: ContentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Loose(),
   ) {}
 
   abstract createElement(): T;
@@ -16,15 +18,25 @@ export abstract class LoadingStrategy<T extends HTMLScriptElement | HTMLLinkElem
   createStream<T extends Event>(): Observable<T> {
     return of(null).pipe(
       switchMap(() =>
-        fromLazyLoad<T>(this.createElement(), this.domStrategy, this.crossOriginStrategy),
+        fromLazyLoad<T>(
+          this.createElement(),
+          this.domStrategy,
+          this.crossOriginStrategy,
+          this.contentSecurityStrategy,
+        ),
       ),
     );
   }
 }
 
 export class ScriptLoadingStrategy extends LoadingStrategy<HTMLScriptElement> {
-  constructor(src: string, domStrategy?: DomStrategy, crossOriginStrategy?: CrossOriginStrategy) {
-    super(src, domStrategy, crossOriginStrategy);
+  constructor(
+    src: string,
+    domStrategy?: DomStrategy,
+    crossOriginStrategy?: CrossOriginStrategy,
+    contentSecurityStrategy?: ContentSecurityStrategy,
+  ) {
+    super(src, domStrategy, crossOriginStrategy, contentSecurityStrategy);
   }
 
   createElement(): HTMLScriptElement {
@@ -36,8 +48,13 @@ export class ScriptLoadingStrategy extends LoadingStrategy<HTMLScriptElement> {
 }
 
 export class StyleLoadingStrategy extends LoadingStrategy<HTMLLinkElement> {
-  constructor(href: string, domStrategy?: DomStrategy, crossOriginStrategy?: CrossOriginStrategy) {
-    super(href, domStrategy, crossOriginStrategy);
+  constructor(
+    href: string,
+    domStrategy?: DomStrategy,
+    crossOriginStrategy?: CrossOriginStrategy,
+    contentSecurityStrategy?: ContentSecurityStrategy,
+  ) {
+    super(href, domStrategy, crossOriginStrategy, contentSecurityStrategy);
   }
 
   createElement(): HTMLLinkElement {
diff --git a/npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts
new file mode 100644
index 0000000000..06db799ca0
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts
@@ -0,0 +1,41 @@
+import {
+  CONTENT_SECURITY_STRATEGY,
+  LooseContentSecurityStrategy,
+  StrictContentSecurityStrategy,
+} from '../strategies';
+import { uuid } from '../utils';
+
+describe('LooseContentSecurityStrategy', () => {
+  describe('#applyCSP', () => {
+    it('should not set nonce attribute', () => {
+      const strategy = new LooseContentSecurityStrategy();
+      const element = document.createElement('link');
+      strategy.applyCSP(element);
+
+      expect(element.getAttribute('nonce')).toBeNull();
+    });
+  });
+});
+
+describe('StrictContentSecurityStrategy', () => {
+  describe('#applyCSP', () => {
+    it('should set nonce attribute', () => {
+      const nonce = uuid();
+      const strategy = new StrictContentSecurityStrategy(nonce);
+      const element = document.createElement('link');
+      strategy.applyCSP(element);
+
+      expect(element.getAttribute('nonce')).toBe(nonce);
+    });
+  });
+});
+
+describe('CONTENT_SECURITY_STRATEGY', () => {
+  test.each`
+    name        | Strategy                         | nonce
+    ${'Loose'}  | ${LooseContentSecurityStrategy}  | ${undefined}
+    ${'Strict'} | ${StrictContentSecurityStrategy} | ${uuid()}
+  `('should successfully map $name to $Strategy.name', ({ name, Strategy, nonce }) => {
+    expect(CONTENT_SECURITY_STRATEGY[name](nonce)).toEqual(new Strategy(nonce));
+  });
+});
diff --git a/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
index 657afeead1..9f1212b78c 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
@@ -1,4 +1,9 @@
-import { DomStrategy, DOM_STRATEGY } from '../strategies';
+import {
+  ContentSecurityStrategy,
+  CONTENT_SECURITY_STRATEGY,
+  DomStrategy,
+  DOM_STRATEGY,
+} from '../strategies';
 import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from '../strategies/cross-origin.strategy';
 import { uuid } from '../utils';
 import { fromLazyLoad } from '../utils/lazy-load-utils';
@@ -33,7 +38,15 @@ describe('Lazy Load Utils', () => {
       expect(element.crossOrigin).toBe('anonymous');
     });
 
-    it('should allow setting a crossorigin strategy', () => {
+    it('should not set integrity by default', () => {
+      const element = document.createElement('link');
+
+      fromLazyLoad(element);
+
+      expect(element.getAttribute('integrity')).toBeNull();
+    });
+
+    it('should allow setting a cross-origin strategy', () => {
       const element = document.createElement('link');
 
       const integrity = uuid();
@@ -44,6 +57,24 @@ describe('Lazy Load Utils', () => {
       expect(element.getAttribute('integrity')).toBe(integrity);
     });
 
+    it('should not set nonce by default', () => {
+      const element = document.createElement('link');
+
+      fromLazyLoad(element);
+
+      expect(element.getAttribute('nonce')).toBeNull();
+    });
+
+    it('should allow setting a content security strategy', () => {
+      const element = document.createElement('link');
+
+      const nonce = uuid();
+
+      fromLazyLoad(element, undefined, undefined, CONTENT_SECURITY_STRATEGY.Strict(nonce));
+
+      expect(element.getAttribute('nonce')).toBe(nonce);
+    });
+
     it('should emit error event on fail and clear callbacks', done => {
       const error = new CustomEvent('error');
       const parentNode = { removeChild: jest.fn() };
@@ -61,8 +92,11 @@ describe('Lazy Load Utils', () => {
           },
         } as DomStrategy,
         {
-          setCrossOrigin(el: HTMLLinkElement) {},
+          setCrossOrigin(_: HTMLLinkElement) {},
         } as CrossOriginStrategy,
+        {
+          applyCSP(_: HTMLLinkElement) {},
+        } as ContentSecurityStrategy,
       ).subscribe({
         error: value => {
           expect(value).toBe(error);
@@ -90,8 +124,11 @@ describe('Lazy Load Utils', () => {
           },
         } as DomStrategy,
         {
-          setCrossOrigin(el: HTMLLinkElement) {},
+          setCrossOrigin(_: HTMLLinkElement) {},
         } as CrossOriginStrategy,
+        {
+          applyCSP(_: HTMLLinkElement) {},
+        } as ContentSecurityStrategy,
       ).subscribe({
         next: value => {
           expect(value).toBe(success);
diff --git a/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
index 9260cd8948..745b858ff3 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
@@ -1,12 +1,15 @@
 import {
+  CONTENT_SECURITY_STRATEGY,
   CROSS_ORIGIN_STRATEGY,
   DOM_STRATEGY,
   LOADING_STRATEGY,
   ScriptLoadingStrategy,
   StyleLoadingStrategy,
 } from '../strategies';
+import { uuid } from '../utils';
 
 const path = 'http://example.com/';
+const nonce = uuid();
 
 describe('ScriptLoadingStrategy', () => {
   describe('#createElement', () => {
@@ -23,17 +26,31 @@ describe('ScriptLoadingStrategy', () => {
     it('should use given dom and cross-origin strategies', done => {
       const domStrategy = DOM_STRATEGY.PrependToHead();
       const crossOriginStrategy = CROSS_ORIGIN_STRATEGY.UseCredentials();
+      const contentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Strict(nonce);
 
       domStrategy.insertElement = jest.fn((el: HTMLScriptElement) => {
         setTimeout(() => {
-          el.onload(new CustomEvent('success', { detail: el.crossOrigin }));
+          el.onload(
+            new CustomEvent('success', {
+              detail: {
+                crossOrigin: el.crossOrigin,
+                nonce: el.getAttribute('nonce'),
+              },
+            }),
+          );
         }, 0);
       }) as any;
 
-      const strategy = new ScriptLoadingStrategy(path, domStrategy, crossOriginStrategy);
+      const strategy = new ScriptLoadingStrategy(
+        path,
+        domStrategy,
+        crossOriginStrategy,
+        contentSecurityStrategy,
+      );
 
       strategy.createStream<CustomEvent>().subscribe(event => {
-        expect(event.detail).toBe('use-credentials');
+        expect(event.detail.crossOrigin).toBe('use-credentials');
+        expect(event.detail.nonce).toBe(nonce);
         done();
       });
     });
@@ -56,17 +73,31 @@ describe('StyleLoadingStrategy', () => {
     it('should use given dom and cross-origin strategies', done => {
       const domStrategy = DOM_STRATEGY.PrependToHead();
       const crossOriginStrategy = CROSS_ORIGIN_STRATEGY.UseCredentials();
+      const contentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Strict(nonce);
 
       domStrategy.insertElement = jest.fn((el: HTMLLinkElement) => {
         setTimeout(() => {
-          el.onload(new CustomEvent('success', { detail: el.crossOrigin }));
+          el.onload(
+            new CustomEvent('success', {
+              detail: {
+                crossOrigin: el.crossOrigin,
+                nonce: el.getAttribute('nonce'),
+              },
+            }),
+          );
         }, 0);
       }) as any;
 
-      const strategy = new StyleLoadingStrategy(path, domStrategy, crossOriginStrategy);
+      const strategy = new StyleLoadingStrategy(
+        path,
+        domStrategy,
+        crossOriginStrategy,
+        contentSecurityStrategy,
+      );
 
       strategy.createStream<CustomEvent>().subscribe(event => {
-        expect(event.detail).toBe('use-credentials');
+        expect(event.detail.crossOrigin).toBe('use-credentials');
+        expect(event.detail.nonce).toBe(nonce);
         done();
       });
     });
diff --git a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
index 5aee3bc715..598db332f8 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
@@ -1,5 +1,7 @@
 import { Observable, Observer } from 'rxjs';
 import {
+  ContentSecurityStrategy,
+  CONTENT_SECURITY_STRATEGY,
   CrossOriginStrategy,
   CROSS_ORIGIN_STRATEGY,
   DomStrategy,
@@ -10,8 +12,10 @@ export function fromLazyLoad<T extends Event>(
   element: HTMLScriptElement | HTMLLinkElement,
   domStrategy: DomStrategy = DOM_STRATEGY.AppendToHead(),
   crossOriginStrategy: CrossOriginStrategy = CROSS_ORIGIN_STRATEGY.Anonymous(),
+  contentSecurityStrategy: ContentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Loose(),
 ): Observable<T> {
   crossOriginStrategy.setCrossOrigin(element);
+  contentSecurityStrategy.applyCSP(element);
   domStrategy.insertElement(element);
 
   return Observable.create((observer: Observer<Event>) => {

From 221c78fa0df2d14a8b7714fcdaa6e3d4018c3913 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 14:13:00 +0300
Subject: [PATCH 31/68] feat(core): add new lazy load service

---
 .../src/lib/services/lazy-load.service.ts     | 42 ++++++++++-
 .../src/lib/tests/lazy-load.service.spec.ts   | 74 +++++++++++++++++--
 2 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
index f047db97be..f9c3cbeb55 100644
--- a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
@@ -1,20 +1,56 @@
 import { Injectable } from '@angular/core';
-import { Observable, ReplaySubject, throwError } from 'rxjs';
+import { concat, Observable, of, ReplaySubject, throwError } from 'rxjs';
+import { delay, retryWhen, shareReplay, take, tap } from 'rxjs/operators';
+import { LoadingStrategy } from '../strategies';
 import { uuid } from '../utils';
 
 @Injectable({
   providedIn: 'root',
 })
 export class LazyLoadService {
+  readonly loaded = new Set();
+
   loadedLibraries: { [url: string]: ReplaySubject<void> } = {};
 
+  load(strategy: LoadingStrategy, retryTimes?: number, retryDelay?: number): Observable<Event>;
   load(
     urlOrUrls: string | string[],
     type: 'script' | 'style',
-    content: string = '',
+    content?: string,
+    targetQuery?: string,
+    position?: InsertPosition,
+  ): Observable<void>;
+  load(
+    strategyOrUrl: LoadingStrategy | string | string[],
+    retryTimesOrType?: number | 'script' | 'style',
+    retryDelayOrContent?: number | string,
     targetQuery: string = 'body',
     position: InsertPosition = 'beforeend',
-  ): Observable<void> {
+  ): Observable<Event | void> {
+    if (strategyOrUrl instanceof LoadingStrategy) {
+      const strategy = strategyOrUrl;
+      const retryTimes = retryTimesOrType as number;
+      const retryDelay = retryDelayOrContent as number;
+
+      if (this.loaded.has(strategy.path)) return of(new CustomEvent('load'));
+
+      return strategy.createStream().pipe(
+        retryWhen(error$ =>
+          concat(
+            error$.pipe(delay(retryDelay), take(retryTimes)),
+            throwError(new CustomEvent('error')),
+          ),
+        ),
+        tap(() => this.loaded.add(strategy.path)),
+        delay(100),
+        shareReplay({ bufferSize: 1, refCount: true }),
+      );
+    }
+
+    let urlOrUrls = strategyOrUrl;
+    const content = retryDelayOrContent as string;
+    const type = retryTimesOrType as 'script' | 'style';
+
     if (!urlOrUrls && !content) {
       return throwError('Should pass url or content');
     } else if (!urlOrUrls && content) {
diff --git a/npm/ng-packs/packages/core/src/lib/tests/lazy-load.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/lazy-load.service.spec.ts
index a29b60974e..3596da2591 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/lazy-load.service.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/lazy-load.service.spec.ts
@@ -1,9 +1,65 @@
 import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest';
+import { of, throwError } from 'rxjs';
+import { catchError, switchMap } from 'rxjs/operators';
 import { LazyLoadService } from '../services/lazy-load.service';
-import { catchError } from 'rxjs/operators';
-import { of } from 'rxjs';
+import { ScriptLoadingStrategy } from '../strategies';
 
 describe('LazyLoadService', () => {
+  describe('#load', () => {
+    const service = new LazyLoadService();
+    const strategy = new ScriptLoadingStrategy('http://example.com/');
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should emit an error event if not loaded', done => {
+      const counter = jest.fn();
+      jest.spyOn(strategy, 'createStream').mockReturnValueOnce(
+        of(null).pipe(
+          switchMap(() => {
+            counter();
+            return throwError('THIS WILL NOT BE THE FINAL ERROR');
+          }),
+        ),
+      );
+
+      service.load(strategy, 5, 0).subscribe({
+        error: errorEvent => {
+          expect(errorEvent).toEqual(new CustomEvent('error'));
+          expect(counter).toHaveBeenCalledTimes(6);
+          expect(service.loaded.has(strategy.path)).toBe(false);
+          done();
+        },
+      });
+    });
+
+    it('should emit a load event if loaded', done => {
+      const loadEvent = new CustomEvent('load');
+      jest.spyOn(strategy, 'createStream').mockReturnValue(of(loadEvent));
+
+      service.load(strategy).subscribe({
+        next: event => {
+          expect(event).toBe(loadEvent);
+          expect(service.loaded.has(strategy.path)).toBe(true);
+          done();
+        },
+      });
+    });
+
+    it('should emit a custom load event if loaded if resource is loaded before', done => {
+      const loadEvent = new CustomEvent('load');
+      service.loaded.add(strategy.path);
+
+      service.load(strategy).subscribe(event => {
+        expect(event).toEqual(loadEvent);
+        done();
+      });
+    });
+  });
+});
+
+describe('LazyLoadService (Deprecated)', () => {
   let spectator: SpectatorService<LazyLoadService>;
   let service: LazyLoadService;
   const scriptElement = document.createElement('script');
@@ -25,15 +81,17 @@ describe('LazyLoadService', () => {
     spy.mockReturnValue(scriptElement);
 
     service.load('https://abp.io', 'script', 'test').subscribe(res => {
-      expect(document.querySelector('script[src="https://abp.io"][type="text/javascript"]').textContent).toMatch(
-        'test',
-      );
+      expect(
+        document.querySelector('script[src="https://abp.io"][type="text/javascript"]').textContent,
+      ).toMatch('test');
     });
 
     scriptElement.onload(null);
 
     service.load('https://abp.io', 'script', 'test').subscribe(res => {
-      expect(document.querySelectorAll('script[src="https://abp.io"][type="text/javascript"]')).toHaveLength(1);
+      expect(
+        document.querySelectorAll('script[src="https://abp.io"][type="text/javascript"]'),
+      ).toHaveLength(1);
       done();
     });
   });
@@ -59,7 +117,9 @@ describe('LazyLoadService', () => {
 
     test('should load an link element', done => {
       service.load('https://abp.io', 'style').subscribe(res => {
-        expect(document.querySelector('link[type="text/css"][rel="stylesheet"][href="https://abp.io"]')).toBeTruthy();
+        expect(
+          document.querySelector('link[type="text/css"][rel="stylesheet"][href="https://abp.io"]'),
+        ).toBeTruthy();
         done();
       });
 

From 4acc763fdcc50d276b39bfe1e53d0591ac177255 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 14:18:58 +0300
Subject: [PATCH 32/68] refactor(core): import directly from strategy files

---
 .../packages/core/src/lib/utils/lazy-load-utils.ts        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
index 598db332f8..b4c4c3f1ce 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
@@ -2,11 +2,9 @@ import { Observable, Observer } from 'rxjs';
 import {
   ContentSecurityStrategy,
   CONTENT_SECURITY_STRATEGY,
-  CrossOriginStrategy,
-  CROSS_ORIGIN_STRATEGY,
-  DomStrategy,
-  DOM_STRATEGY,
-} from '../strategies';
+} from '../strategies/content-security.strategy';
+import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from '../strategies/cross-origin.strategy';
+import { DomStrategy, DOM_STRATEGY } from '../strategies/dom.strategy';
 
 export function fromLazyLoad<T extends Event>(
   element: HTMLScriptElement | HTMLLinkElement,

From 6ddca15a5f3d1474d2802231b547997fba34c6eb Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 14:28:14 +0300
Subject: [PATCH 33/68] feat(core): make strategies publicly available

---
 npm/ng-packs/packages/core/src/public-api.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/public-api.ts b/npm/ng-packs/packages/core/src/public-api.ts
index 3513427c2d..901536c85d 100644
--- a/npm/ng-packs/packages/core/src/public-api.ts
+++ b/npm/ng-packs/packages/core/src/public-api.ts
@@ -7,6 +7,7 @@ export * from './lib/abstracts';
 export * from './lib/actions';
 export * from './lib/components';
 export * from './lib/constants';
+export * from './lib/core.module';
 export * from './lib/directives';
 export * from './lib/enums';
 export * from './lib/guards';
@@ -16,7 +17,6 @@ export * from './lib/pipes';
 export * from './lib/plugins';
 export * from './lib/services';
 export * from './lib/states';
+export * from './lib/strategies';
 export * from './lib/tokens';
 export * from './lib/utils';
-
-export * from './lib/core.module';

From 181b732b24ada30fe21bd03db26e68a7a54ec597 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 14:45:44 +0300
Subject: [PATCH 34/68] fix(core): resolve lint issues

---
 .../packages/core/src/lib/strategies/loading.strategy.ts     | 4 ++--
 .../packages/core/src/lib/tests/dom.strategy.spec.ts         | 2 +-
 npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts  | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
index 5c8bd485ca..113ab9a853 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
@@ -15,10 +15,10 @@ export abstract class LoadingStrategy<T extends HTMLScriptElement | HTMLLinkElem
 
   abstract createElement(): T;
 
-  createStream<T extends Event>(): Observable<T> {
+  createStream<E extends Event>(): Observable<E> {
     return of(null).pipe(
       switchMap(() =>
-        fromLazyLoad<T>(
+        fromLazyLoad<E>(
           this.createElement(),
           this.domStrategy,
           this.crossOriginStrategy,
diff --git a/npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts
index 7e5f264f2b..e82eac52ad 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts
@@ -29,7 +29,7 @@ describe('DomStrategy', () => {
 });
 
 describe('DOM_STRATEGY', () => {
-  let div = document.createElement('DIV');
+  const div = document.createElement('DIV');
 
   beforeEach(() => {
     document.body.innerHTML = '';
diff --git a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
index b4c4c3f1ce..09b4ec4e4f 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
@@ -16,8 +16,8 @@ export function fromLazyLoad<T extends Event>(
   contentSecurityStrategy.applyCSP(element);
   domStrategy.insertElement(element);
 
-  return Observable.create((observer: Observer<Event>) => {
-    element.onload = event => {
+  return new Observable((observer: Observer<T>) => {
+    element.onload = (event: T) => {
       clearCallbacks(element);
       observer.next(event);
       observer.complete();
@@ -39,6 +39,7 @@ export function fromLazyLoad<T extends Event>(
 }
 
 function createErrorHandler(observer: Observer<Event>, element: HTMLElement) {
+  /* tslint:disable-next-line:only-arrow-functions */
   return function(event: Event | string) {
     clearCallbacks(element);
     element.parentNode.removeChild(element);

From 54428be03f9a7958b6c77ec991c7f2c0922eacfe Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 15:33:55 +0300
Subject: [PATCH 35/68] fix(core): add default values to load method

---
 .../packages/core/src/lib/services/lazy-load.service.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
index f9c3cbeb55..b7400c3193 100644
--- a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
@@ -29,8 +29,8 @@ export class LazyLoadService {
   ): Observable<Event | void> {
     if (strategyOrUrl instanceof LoadingStrategy) {
       const strategy = strategyOrUrl;
-      const retryTimes = retryTimesOrType as number;
-      const retryDelay = retryDelayOrContent as number;
+      const retryTimes = (retryTimesOrType as number) || 2;
+      const retryDelay = (retryDelayOrContent as number) || 1000;
 
       if (this.loaded.has(strategy.path)) return of(new CustomEvent('load'));
 
@@ -48,7 +48,7 @@ export class LazyLoadService {
     }
 
     let urlOrUrls = strategyOrUrl;
-    const content = retryDelayOrContent as string;
+    const content = (retryDelayOrContent as string) || '';
     const type = retryTimesOrType as 'script' | 'style';
 
     if (!urlOrUrls && !content) {

From ae6475eb4b819c4955424ada3edae1aaf84abdaa Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 15:43:54 +0300
Subject: [PATCH 36/68] feat(core): enable 0 retries and 0 delay retries

---
 .../packages/core/src/lib/services/lazy-load.service.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
index b7400c3193..5e605d8c5d 100644
--- a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
@@ -29,8 +29,8 @@ export class LazyLoadService {
   ): Observable<Event | void> {
     if (strategyOrUrl instanceof LoadingStrategy) {
       const strategy = strategyOrUrl;
-      const retryTimes = (retryTimesOrType as number) || 2;
-      const retryDelay = (retryDelayOrContent as number) || 1000;
+      const retryTimes = typeof retryTimesOrType === 'number' ? retryTimesOrType : 2;
+      const retryDelay = typeof retryDelayOrContent === 'number' ? retryDelayOrContent : 1000;
 
       if (this.loaded.has(strategy.path)) return of(new CustomEvent('load'));
 

From 21095025a97f6db9d8344a774d322ab600c3c1c7 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 16:11:57 +0300
Subject: [PATCH 37/68] feat(core): add optional integrity in loading
 strategies

---
 .../src/lib/strategies/loading.strategy.ts    | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
index 113ab9a853..2882c3f0a6 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
@@ -67,19 +67,39 @@ export class StyleLoadingStrategy extends LoadingStrategy<HTMLLinkElement> {
 }
 
 export const LOADING_STRATEGY = {
-  AppendAnonymousScriptToBody(src: string) {
-    return new ScriptLoadingStrategy(src, DOM_STRATEGY.AppendToBody());
+  AppendAnonymousScriptToBody(src: string, integrity?: string) {
+    return new ScriptLoadingStrategy(
+      src,
+      DOM_STRATEGY.AppendToBody(),
+      CROSS_ORIGIN_STRATEGY.Anonymous(integrity),
+    );
   },
-  AppendAnonymousScriptToHead(src: string) {
-    return new ScriptLoadingStrategy(src);
+  AppendAnonymousScriptToHead(src: string, integrity?: string) {
+    return new ScriptLoadingStrategy(
+      src,
+      DOM_STRATEGY.AppendToHead(),
+      CROSS_ORIGIN_STRATEGY.Anonymous(integrity),
+    );
   },
-  AppendAnonymousStyleToHead(src: string) {
-    return new StyleLoadingStrategy(src);
+  AppendAnonymousStyleToHead(src: string, integrity?: string) {
+    return new StyleLoadingStrategy(
+      src,
+      DOM_STRATEGY.AppendToHead(),
+      CROSS_ORIGIN_STRATEGY.Anonymous(integrity),
+    );
   },
-  PrependAnonymousScriptToHead(src: string) {
-    return new ScriptLoadingStrategy(src, DOM_STRATEGY.PrependToHead());
+  PrependAnonymousScriptToHead(src: string, integrity?: string) {
+    return new ScriptLoadingStrategy(
+      src,
+      DOM_STRATEGY.PrependToHead(),
+      CROSS_ORIGIN_STRATEGY.Anonymous(integrity),
+    );
   },
-  PrependAnonymousStyleToHead(src: string) {
-    return new StyleLoadingStrategy(src, DOM_STRATEGY.PrependToHead());
+  PrependAnonymousStyleToHead(src: string, integrity?: string) {
+    return new StyleLoadingStrategy(
+      src,
+      DOM_STRATEGY.PrependToHead(),
+      CROSS_ORIGIN_STRATEGY.Anonymous(integrity),
+    );
   },
 };

From 7da8011eeeeed041bdef9c25e591fefe3ff759cd Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 19:59:20 +0300
Subject: [PATCH 38/68] refactor(core): separate lazy load & content insertion

---
 .../src/lib/strategies/loading.strategy.ts    | 27 +++-------------
 .../src/lib/tests/lazy-load-utils.spec.ts     | 31 +------------------
 .../src/lib/tests/loading.strategy.spec.ts    | 23 ++------------
 .../core/src/lib/utils/lazy-load-utils.ts     |  6 ----
 4 files changed, 8 insertions(+), 79 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
index 2882c3f0a6..be89a751ed 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/loading.strategy.ts
@@ -1,7 +1,6 @@
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { fromLazyLoad } from '../utils';
-import { ContentSecurityStrategy, CONTENT_SECURITY_STRATEGY } from './content-security.strategy';
 import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from './cross-origin.strategy';
 import { DomStrategy, DOM_STRATEGY } from './dom.strategy';
 
@@ -10,7 +9,6 @@ export abstract class LoadingStrategy<T extends HTMLScriptElement | HTMLLinkElem
     public path: string,
     protected domStrategy: DomStrategy = DOM_STRATEGY.AppendToHead(),
     protected crossOriginStrategy: CrossOriginStrategy = CROSS_ORIGIN_STRATEGY.Anonymous(),
-    protected contentSecurityStrategy: ContentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Loose(),
   ) {}
 
   abstract createElement(): T;
@@ -18,25 +16,15 @@ export abstract class LoadingStrategy<T extends HTMLScriptElement | HTMLLinkElem
   createStream<E extends Event>(): Observable<E> {
     return of(null).pipe(
       switchMap(() =>
-        fromLazyLoad<E>(
-          this.createElement(),
-          this.domStrategy,
-          this.crossOriginStrategy,
-          this.contentSecurityStrategy,
-        ),
+        fromLazyLoad<E>(this.createElement(), this.domStrategy, this.crossOriginStrategy),
       ),
     );
   }
 }
 
 export class ScriptLoadingStrategy extends LoadingStrategy<HTMLScriptElement> {
-  constructor(
-    src: string,
-    domStrategy?: DomStrategy,
-    crossOriginStrategy?: CrossOriginStrategy,
-    contentSecurityStrategy?: ContentSecurityStrategy,
-  ) {
-    super(src, domStrategy, crossOriginStrategy, contentSecurityStrategy);
+  constructor(src: string, domStrategy?: DomStrategy, crossOriginStrategy?: CrossOriginStrategy) {
+    super(src, domStrategy, crossOriginStrategy);
   }
 
   createElement(): HTMLScriptElement {
@@ -48,13 +36,8 @@ export class ScriptLoadingStrategy extends LoadingStrategy<HTMLScriptElement> {
 }
 
 export class StyleLoadingStrategy extends LoadingStrategy<HTMLLinkElement> {
-  constructor(
-    href: string,
-    domStrategy?: DomStrategy,
-    crossOriginStrategy?: CrossOriginStrategy,
-    contentSecurityStrategy?: ContentSecurityStrategy,
-  ) {
-    super(href, domStrategy, crossOriginStrategy, contentSecurityStrategy);
+  constructor(href: string, domStrategy?: DomStrategy, crossOriginStrategy?: CrossOriginStrategy) {
+    super(href, domStrategy, crossOriginStrategy);
   }
 
   createElement(): HTMLLinkElement {
diff --git a/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
index 9f1212b78c..7afb343e80 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts
@@ -1,9 +1,4 @@
-import {
-  ContentSecurityStrategy,
-  CONTENT_SECURITY_STRATEGY,
-  DomStrategy,
-  DOM_STRATEGY,
-} from '../strategies';
+import { DomStrategy, DOM_STRATEGY } from '../strategies';
 import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from '../strategies/cross-origin.strategy';
 import { uuid } from '../utils';
 import { fromLazyLoad } from '../utils/lazy-load-utils';
@@ -57,24 +52,6 @@ describe('Lazy Load Utils', () => {
       expect(element.getAttribute('integrity')).toBe(integrity);
     });
 
-    it('should not set nonce by default', () => {
-      const element = document.createElement('link');
-
-      fromLazyLoad(element);
-
-      expect(element.getAttribute('nonce')).toBeNull();
-    });
-
-    it('should allow setting a content security strategy', () => {
-      const element = document.createElement('link');
-
-      const nonce = uuid();
-
-      fromLazyLoad(element, undefined, undefined, CONTENT_SECURITY_STRATEGY.Strict(nonce));
-
-      expect(element.getAttribute('nonce')).toBe(nonce);
-    });
-
     it('should emit error event on fail and clear callbacks', done => {
       const error = new CustomEvent('error');
       const parentNode = { removeChild: jest.fn() };
@@ -94,9 +71,6 @@ describe('Lazy Load Utils', () => {
         {
           setCrossOrigin(_: HTMLLinkElement) {},
         } as CrossOriginStrategy,
-        {
-          applyCSP(_: HTMLLinkElement) {},
-        } as ContentSecurityStrategy,
       ).subscribe({
         error: value => {
           expect(value).toBe(error);
@@ -126,9 +100,6 @@ describe('Lazy Load Utils', () => {
         {
           setCrossOrigin(_: HTMLLinkElement) {},
         } as CrossOriginStrategy,
-        {
-          applyCSP(_: HTMLLinkElement) {},
-        } as ContentSecurityStrategy,
       ).subscribe({
         next: value => {
           expect(value).toBe(success);
diff --git a/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
index 745b858ff3..4b950cf533 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts
@@ -1,15 +1,12 @@
 import {
-  CONTENT_SECURITY_STRATEGY,
   CROSS_ORIGIN_STRATEGY,
   DOM_STRATEGY,
   LOADING_STRATEGY,
   ScriptLoadingStrategy,
   StyleLoadingStrategy,
 } from '../strategies';
-import { uuid } from '../utils';
 
 const path = 'http://example.com/';
-const nonce = uuid();
 
 describe('ScriptLoadingStrategy', () => {
   describe('#createElement', () => {
@@ -26,7 +23,6 @@ describe('ScriptLoadingStrategy', () => {
     it('should use given dom and cross-origin strategies', done => {
       const domStrategy = DOM_STRATEGY.PrependToHead();
       const crossOriginStrategy = CROSS_ORIGIN_STRATEGY.UseCredentials();
-      const contentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Strict(nonce);
 
       domStrategy.insertElement = jest.fn((el: HTMLScriptElement) => {
         setTimeout(() => {
@@ -34,23 +30,16 @@ describe('ScriptLoadingStrategy', () => {
             new CustomEvent('success', {
               detail: {
                 crossOrigin: el.crossOrigin,
-                nonce: el.getAttribute('nonce'),
               },
             }),
           );
         }, 0);
       }) as any;
 
-      const strategy = new ScriptLoadingStrategy(
-        path,
-        domStrategy,
-        crossOriginStrategy,
-        contentSecurityStrategy,
-      );
+      const strategy = new ScriptLoadingStrategy(path, domStrategy, crossOriginStrategy);
 
       strategy.createStream<CustomEvent>().subscribe(event => {
         expect(event.detail.crossOrigin).toBe('use-credentials');
-        expect(event.detail.nonce).toBe(nonce);
         done();
       });
     });
@@ -73,7 +62,6 @@ describe('StyleLoadingStrategy', () => {
     it('should use given dom and cross-origin strategies', done => {
       const domStrategy = DOM_STRATEGY.PrependToHead();
       const crossOriginStrategy = CROSS_ORIGIN_STRATEGY.UseCredentials();
-      const contentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Strict(nonce);
 
       domStrategy.insertElement = jest.fn((el: HTMLLinkElement) => {
         setTimeout(() => {
@@ -81,23 +69,16 @@ describe('StyleLoadingStrategy', () => {
             new CustomEvent('success', {
               detail: {
                 crossOrigin: el.crossOrigin,
-                nonce: el.getAttribute('nonce'),
               },
             }),
           );
         }, 0);
       }) as any;
 
-      const strategy = new StyleLoadingStrategy(
-        path,
-        domStrategy,
-        crossOriginStrategy,
-        contentSecurityStrategy,
-      );
+      const strategy = new StyleLoadingStrategy(path, domStrategy, crossOriginStrategy);
 
       strategy.createStream<CustomEvent>().subscribe(event => {
         expect(event.detail.crossOrigin).toBe('use-credentials');
-        expect(event.detail.nonce).toBe(nonce);
         done();
       });
     });
diff --git a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
index 09b4ec4e4f..f602bf06ef 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/lazy-load-utils.ts
@@ -1,8 +1,4 @@
 import { Observable, Observer } from 'rxjs';
-import {
-  ContentSecurityStrategy,
-  CONTENT_SECURITY_STRATEGY,
-} from '../strategies/content-security.strategy';
 import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from '../strategies/cross-origin.strategy';
 import { DomStrategy, DOM_STRATEGY } from '../strategies/dom.strategy';
 
@@ -10,10 +6,8 @@ export function fromLazyLoad<T extends Event>(
   element: HTMLScriptElement | HTMLLinkElement,
   domStrategy: DomStrategy = DOM_STRATEGY.AppendToHead(),
   crossOriginStrategy: CrossOriginStrategy = CROSS_ORIGIN_STRATEGY.Anonymous(),
-  contentSecurityStrategy: ContentSecurityStrategy = CONTENT_SECURITY_STRATEGY.Loose(),
 ): Observable<T> {
   crossOriginStrategy.setCrossOrigin(element);
-  contentSecurityStrategy.applyCSP(element);
   domStrategy.insertElement(element);
 
   return new Observable((observer: Observer<T>) => {

From 2b50598a9163bfcc7dac72d464c859f8ec70a9ff Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 20:00:19 +0300
Subject: [PATCH 39/68] feat(core): rename strategies based on security
 perspective

---
 .../strategies/content-security.strategy.ts    | 12 ++++++------
 .../tests/content-security.strategy.spec.ts    | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts
index 54016b5836..2875916ef2 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/content-security.strategy.ts
@@ -4,7 +4,7 @@ export abstract class ContentSecurityStrategy {
   abstract applyCSP(element: HTMLScriptElement | HTMLStyleElement): void;
 }
 
-export class StrictContentSecurityStrategy extends ContentSecurityStrategy {
+export class LooseContentSecurityStrategy extends ContentSecurityStrategy {
   constructor(nonce: string) {
     super(nonce);
   }
@@ -14,7 +14,7 @@ export class StrictContentSecurityStrategy extends ContentSecurityStrategy {
   }
 }
 
-export class LooseContentSecurityStrategy extends ContentSecurityStrategy {
+export class StrictContentSecurityStrategy extends ContentSecurityStrategy {
   constructor() {
     super();
   }
@@ -23,10 +23,10 @@ export class LooseContentSecurityStrategy extends ContentSecurityStrategy {
 }
 
 export const CONTENT_SECURITY_STRATEGY = {
-  Loose() {
-    return new LooseContentSecurityStrategy();
+  Loose(nonce: string) {
+    return new LooseContentSecurityStrategy(nonce);
   },
-  Strict(nonce: string) {
-    return new StrictContentSecurityStrategy(nonce);
+  Strict() {
+    return new StrictContentSecurityStrategy();
   },
 };
diff --git a/npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts
index 06db799ca0..c617e35893 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/content-security.strategy.spec.ts
@@ -7,25 +7,25 @@ import { uuid } from '../utils';
 
 describe('LooseContentSecurityStrategy', () => {
   describe('#applyCSP', () => {
-    it('should not set nonce attribute', () => {
-      const strategy = new LooseContentSecurityStrategy();
+    it('should set nonce attribute', () => {
+      const nonce = uuid();
+      const strategy = new LooseContentSecurityStrategy(nonce);
       const element = document.createElement('link');
       strategy.applyCSP(element);
 
-      expect(element.getAttribute('nonce')).toBeNull();
+      expect(element.getAttribute('nonce')).toBe(nonce);
     });
   });
 });
 
 describe('StrictContentSecurityStrategy', () => {
   describe('#applyCSP', () => {
-    it('should set nonce attribute', () => {
-      const nonce = uuid();
-      const strategy = new StrictContentSecurityStrategy(nonce);
+    it('should not set nonce attribute', () => {
+      const strategy = new StrictContentSecurityStrategy();
       const element = document.createElement('link');
       strategy.applyCSP(element);
 
-      expect(element.getAttribute('nonce')).toBe(nonce);
+      expect(element.getAttribute('nonce')).toBeNull();
     });
   });
 });
@@ -33,8 +33,8 @@ describe('StrictContentSecurityStrategy', () => {
 describe('CONTENT_SECURITY_STRATEGY', () => {
   test.each`
     name        | Strategy                         | nonce
-    ${'Loose'}  | ${LooseContentSecurityStrategy}  | ${undefined}
-    ${'Strict'} | ${StrictContentSecurityStrategy} | ${uuid()}
+    ${'Loose'}  | ${LooseContentSecurityStrategy}  | ${uuid()}
+    ${'Strict'} | ${StrictContentSecurityStrategy} | ${undefined}
   `('should successfully map $name to $Strategy.name', ({ name, Strategy, nonce }) => {
     expect(CONTENT_SECURITY_STRATEGY[name](nonce)).toEqual(new Strategy(nonce));
   });

From b15ea010a9c183fff29737e77d7ef8480829cea0 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 20:01:15 +0300
Subject: [PATCH 40/68] docs(core): add how content security strategies work

---
 .../UI/Angular/Content-Security-Strategy.md   | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 docs/en/UI/Angular/Content-Security-Strategy.md

diff --git a/docs/en/UI/Angular/Content-Security-Strategy.md b/docs/en/UI/Angular/Content-Security-Strategy.md
new file mode 100644
index 0000000000..96418a04cb
--- /dev/null
+++ b/docs/en/UI/Angular/Content-Security-Strategy.md
@@ -0,0 +1,53 @@
+# ContentSecurityStrategy
+
+`ContentSecurityStrategy` is an abstract class exposed by @abp/ng.core package. Its instances help you mark inline script or styles as safe in terms of [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy).
+
+
+
+
+## API
+
+
+### constructor(public nonce?: string)
+
+`nonce` enables whitelisting inline script or styles in order to avoid using `unsafe-inline` in [script-src](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src#Unsafe_inline_script) and [style-src](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src#Unsafe_inline_styles) directives.
+
+
+### applyCSP(element: HTMLScriptElement | HTMLStyleElement): void
+
+This method maps the aforementioned properties to the given `element`.
+
+
+
+## LooseContentSecurityPolicy
+
+`LooseContentSecurityPolicy` is a class that extends `ContentSecurityStrategy`. It required `nonce` and marks given `<script>` or `<style>` tag with it.
+
+
+
+## StrictContentSecurityPolicy
+
+`StrictContentSecurityPolicy` is a class that extends `ContentSecurityStrategy`. It does not mark inline scripts and styles as safe. You can consider it as a noop alternative.
+
+
+
+## Predefined Content Security Strategies
+
+Predefined content security strategies are accessible via `CONTENT_SECURITY_STRATEGY` constant.
+
+
+### Loose(nonce: string)
+
+`nonce` will be set.
+
+
+### Strict()
+
+Nothing will be done.
+
+
+
+
+## What's Next?
+
+TODO: Place new InsertionStrategy link here.

From f74eb5069ac281ca1484427482559286b1ee7a55 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 20:04:28 +0300
Subject: [PATCH 41/68] docs(core): fix wording

---
 docs/en/UI/Angular/Content-Security-Strategy.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/en/UI/Angular/Content-Security-Strategy.md b/docs/en/UI/Angular/Content-Security-Strategy.md
index 96418a04cb..af8019231c 100644
--- a/docs/en/UI/Angular/Content-Security-Strategy.md
+++ b/docs/en/UI/Angular/Content-Security-Strategy.md
@@ -1,6 +1,6 @@
 # ContentSecurityStrategy
 
-`ContentSecurityStrategy` is an abstract class exposed by @abp/ng.core package. Its instances help you mark inline script or styles as safe in terms of [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy).
+`ContentSecurityStrategy` is an abstract class exposed by @abp/ng.core package. It helps you mark inline scripts or styles as safe in terms of [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy).
 
 
 
@@ -19,18 +19,21 @@ This method maps the aforementioned properties to the given `element`.
 
 
 
+
 ## LooseContentSecurityPolicy
 
 `LooseContentSecurityPolicy` is a class that extends `ContentSecurityStrategy`. It required `nonce` and marks given `<script>` or `<style>` tag with it.
 
 
 
+
 ## StrictContentSecurityPolicy
 
 `StrictContentSecurityPolicy` is a class that extends `ContentSecurityStrategy`. It does not mark inline scripts and styles as safe. You can consider it as a noop alternative.
 
 
 
+
 ## Predefined Content Security Strategies
 
 Predefined content security strategies are accessible via `CONTENT_SECURITY_STRATEGY` constant.

From 524579ab16c847aa6b5491d6d207a3546aaf320f Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 20:05:26 +0300
Subject: [PATCH 42/68] docs(core): add how dom strategies work

---
 docs/en/UI/Angular/Dom-Strategy.md | 56 ++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 docs/en/UI/Angular/Dom-Strategy.md

diff --git a/docs/en/UI/Angular/Dom-Strategy.md b/docs/en/UI/Angular/Dom-Strategy.md
new file mode 100644
index 0000000000..eb4740bf0e
--- /dev/null
+++ b/docs/en/UI/Angular/Dom-Strategy.md
@@ -0,0 +1,56 @@
+# DomStrategy
+
+`DomStrategy` is a class exposed by @abp/ng.core package. Its instances define how an element will be attached to the DOM and are consumed by other classes such as `LoadingStrategy`.
+
+
+## API
+
+
+### constructor(public target?: HTMLElement, public position?: InsertPosition)
+
+`target` is an HTMLElement (_default: document.head_).
+`position` defines where the created element will be placed. All possible values of `position` can be found [here](https://developer.mozilla.org/en-US/docs/Web/API/Element/insertAdjacentElement) (_default: 'beforeend'_).
+
+
+### insertElement(element: HTMLElement): void
+
+This method inserts given `element` to `target` based on the `position`.
+
+
+
+
+## Predefined Dom Strategies
+
+Predefined dom strategies are accessible via `DOM_STRATEGY` constant.
+
+
+### AppendToBody()
+
+`insertElement` will place the given `element` at the end of `<body>`.
+
+
+### AppendToHead()
+
+`insertElement` will place the given `element` at the end of `<head>`.
+
+
+### PrependToHead()
+
+`insertElement` will place the given `element` at the beginning of `<head>`.
+
+
+### AfterElement(target: HTMLElement)
+
+`insertElement` will place the given `element` after (as a sibling to) the `target`.
+
+
+### BeforeElement(target: HTMLElement)
+
+`insertElement` will place the given `element` before (as a sibling to) the `target`.
+
+
+
+
+## What's Next?
+
+- [LoadingStrategy](./Loading-Strategy.md)

From 059adced37a705c37e2e93423df766ac0a54a365 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 20:05:58 +0300
Subject: [PATCH 43/68] docs(core): add how cross-origin strategies work

---
 docs/en/UI/Angular/Cross-Origin-Strategy.md | 41 +++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 docs/en/UI/Angular/Cross-Origin-Strategy.md

diff --git a/docs/en/UI/Angular/Cross-Origin-Strategy.md b/docs/en/UI/Angular/Cross-Origin-Strategy.md
new file mode 100644
index 0000000000..d93fc63d39
--- /dev/null
+++ b/docs/en/UI/Angular/Cross-Origin-Strategy.md
@@ -0,0 +1,41 @@
+# CrossOriginStrategy
+
+`CrossOriginStrategy` is a class exposed by @abp/ng.core package. Its instances define how a source referenced by an element will be retrieved by the browser and are consumed by other classes such as `LoadingStrategy`.
+
+
+## API
+
+
+### constructor(public crossorigin: 'anonymous' | 'use-credentials', public integrity?: string)
+
+`crossorigin` is mapped to [the HTML attribute with the same name](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin).
+`integrity` is a hash for validating a remote resource. Its use is explained [here](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity).
+
+
+### setCrossOrigin(element: HTMLElement): void
+
+This method maps the aforementioned properties to the given `element`.
+
+
+
+
+## Predefined Cross-Origin Strategies
+
+Predefined cross-origin strategies are accessible via `CROSS_ORIGIN_STRATEGY` constant.
+
+
+### Anonymous(integrity?: string)
+
+`crossorigin` will be set as `"anonymous"` and `integrity` is optional.
+
+
+### UseCredentials(integrity?: string)
+
+`crossorigin` will be set as `"use-credentials"` and `integrity` is optional.
+
+
+
+
+## What's Next?
+
+- [LoadingStrategy](./Loading-Strategy.md)

From 17e934957fb96d85ea2c1441b070abdb2afeb681 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 20:18:41 +0300
Subject: [PATCH 44/68] docs(core): add how loading strategy works

---
 docs/en/UI/Angular/Loading-Strategy.md | 75 ++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 docs/en/UI/Angular/Loading-Strategy.md

diff --git a/docs/en/UI/Angular/Loading-Strategy.md b/docs/en/UI/Angular/Loading-Strategy.md
new file mode 100644
index 0000000000..52888d7cb3
--- /dev/null
+++ b/docs/en/UI/Angular/Loading-Strategy.md
@@ -0,0 +1,75 @@
+# LoadingStrategy
+
+`LoadingStrategy` is an abstract class exposed by @abp/ng.core package. Its instances help you mark inline script or styles as safe in terms of [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy).
+
+
+
+
+## API
+
+
+### constructor(public path: string, protected domStrategy?: DomStrategy, protected crossOriginStrategy?: CrossOriginStrategy)
+
+`path` is set to `<script>` elements as `src` and `<link>` elements as `href` attribute.
+`domStrategy` is the `DomStrategy` that will be used when inserting the created element. (_default: AppendToHead_)
+`crossOriginStrategy` is the `CrossOriginStrategy` that will be used on the created element before inserting it. (_default: Anonymous_)
+
+
+### createElement(): HTMLScriptElement | HTMLLinkElement
+
+This method creates and returns a `<script>` or `<link>` element with `path` set as `src` or `href`.
+
+
+### createStream(): Observable<Event>
+
+This method creates and returns an observable stream that emits on success and throws on error.
+
+
+
+## ScriptLoadingStrategy
+
+`ScriptLoadingStrategy` is a class that extends `LoadingStrategy`. It lets you lazy load a script.
+
+
+
+## StyleLoadingStrategy
+
+`StyleLoadingStrategy` is a class that extends `LoadingStrategy`. It lets you lazy load a style.
+
+
+
+## Predefined Loading Strategies
+
+Predefined content security strategies are accessible via `LOADING_STRATEGY` constant.
+
+
+### AppendAnonymousScriptToHead(src: string, integrity?: string)
+
+Sets given paremeters and `crossorigin="anonymous"` as attributes of created `<script>` element and places it at the **end** of `<head>` tag in the document.
+
+
+### PrependAnonymousScriptToHead(src: string, integrity?: string)
+
+Sets given paremeters and `crossorigin="anonymous"` as attributes of created `<script>` element and places it at the **beginning** of `<head>` tag in the document.
+
+
+### AppendAnonymousScriptToBody(src: string, integrity?: string)
+
+Sets given paremeters and `crossorigin="anonymous"` as attributes of created `<script>` element and places it at the **end** of `<body>` tag in the document.
+
+
+### AppendAnonymousStyleToHead(href: string, integrity?: string)
+
+Sets given paremeters and `crossorigin="anonymous"` as attributes of created `<style>` element and places it at the **end** of `<head>` tag in the document.
+
+
+### PrependAnonymousStyleToHead(href: string, integrity?: string)
+
+Sets given paremeters and `crossorigin="anonymous"` as attributes of created `<style>` element and places it at the **beginning** of `<head>` tag in the document.
+
+
+
+
+## What's Next?
+
+- [LazyLoadService](./Lazy-Load-Service.md)

From 9c96ce04fc657e39e5e52700331ead5f188bac98 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 2 Apr 2020 20:31:36 +0300
Subject: [PATCH 45/68] docs(core): add how lazy load service works

---
 docs/en/UI/Angular/Custom-Setting-Page.md |   2 +-
 docs/en/UI/Angular/Lazy-Load-Service.md   | 136 ++++++++++++++++++++++
 docs/en/docs-nav.json                     |   4 +
 3 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 docs/en/UI/Angular/Lazy-Load-Service.md

diff --git a/docs/en/UI/Angular/Custom-Setting-Page.md b/docs/en/UI/Angular/Custom-Setting-Page.md
index 6aa5d8a3cc..0f39c70f1a 100644
--- a/docs/en/UI/Angular/Custom-Setting-Page.md
+++ b/docs/en/UI/Angular/Custom-Setting-Page.md
@@ -43,4 +43,4 @@ Navigate to `/setting-management` route to see the changes:
 
 ## What's Next?
 
-- [TrackByService](./Track-By-Service.md)
+- [Lazy Loading Scripts & Styles](./Lazy-Load-Service.md)
diff --git a/docs/en/UI/Angular/Lazy-Load-Service.md b/docs/en/UI/Angular/Lazy-Load-Service.md
new file mode 100644
index 0000000000..cdfe3f8263
--- /dev/null
+++ b/docs/en/UI/Angular/Lazy-Load-Service.md
@@ -0,0 +1,136 @@
+# How to Lazy Load Scripts and Styles
+
+You can use the `LazyLoadService` in @abp/ng.core package in order to lazy loading scripts and styles in an easy and explicit way.
+
+
+
+
+## Getting Started
+
+You do not have to provide the `LazyLoadService` at module or component level, because it is already **provided in root**. You can inject and start using it immediately in your components, directives, or services.
+
+```js
+import { LazyLoadService } from '@abp/ng.core';
+
+@Component({
+  /* class metadata here */
+})
+class DemoComponent {
+  constructor(private lazyLoadService: LazyLoadService) {}
+}
+```
+
+
+
+
+## Usage
+
+You can use the `load` method of `LazyLoadService` to create a `<script>` or `<style>` element in the DOM at the desired position and force the browser to download the target resource.
+
+
+
+### How to Load Scripts
+
+The first parameter of `load` method expects a `LoadingStrategy`. If you pass a `ScriptLoadingStrategy` instance, the `LazyLoadService` will create a `<script>` element with given `src` and place it in the designated DOM position.
+
+```js
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
+
+@Component({
+  template: `
+    <some-component *ngIf="libraryLoaded$ | async"></some-component>
+  `
+})
+class DemoComponent {
+  libraryLoaded$ = this.lazyLoad.load(
+    LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/some-library.js'),
+  );
+
+  constructor(private lazyLoadService: LazyLoadService) {}
+}
+```
+
+The `load` method returns an observable to which you can subscibe in your component or with an `async` pipe. In the example above, the `NgIf` directive will render `<some-component>` only **if the script gets successfully loaded or is already loaded before**.
+
+> You can subscribe multiple times in your template with `async` pipe. The styles will only be loaded once.
+
+Please refer to [LoadingStrategy](./Loading-Strategy.md) to see all available loading strategies and how you can build your own loading strategy.
+
+
+
+### How to Load Styles
+
+If you pass a `StyleLoadingStrategy` instance as the first parameter of `load` method, the `LazyLoadService` will create a `<link>` element with given `href` and place it in the designated DOM position.
+
+```js
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
+
+@Component({
+  template: `
+    <some-component *ngIf="stylesLoaded$ | async"></some-component>
+  `
+})
+class DemoComponent {
+  stylesLoaded$ = this.lazyLoad.load(
+    LOADING_STRATEGY.AppendAnonymousStyleToHead('/assets/some-styles.css'),
+  );
+
+  constructor(private lazyLoadService: LazyLoadService) {}
+}
+```
+
+The `load` method returns an observable to which you can subscibe in your component or with an `AsyncPipe`. In the example above, the `NgIf` directive will render `<some-component>` only **if the style gets successfully loaded or is already loaded before**.
+
+> You can subscribe multiple times in your template with `async` pipe. The styles will only be loaded once.
+
+Please refer to [LoadingStrategy](./Loading-Strategy.md) to see all available loading strategies and how you can build your own loading strategy.
+
+
+
+### Advanced Usage
+
+You have quite a bit of freedom to define how your lazy load will be implemented. Here is an example:
+
+```js
+const domStrategy = DOM_STRATEGY.PrependToHead();
+
+const crossOriginStrategy = CROSS_ORIGIN_STRATEGY.Anonymous(
+  'sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh',
+);
+
+const loadingStrategy = new StyleLoadingStrategy(
+  'https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css',
+  domStrategy,
+  crossOriginStrategy,
+);
+
+this.lazyLoad.load(loadingStrategy, 1, 2000);
+```
+
+This code will create a `<link>` element with given url and integrity hash, insert it to to top of the `<head>` element, and retry once after 2 seconds if first try fails.
+
+
+
+
+## API
+
+
+
+### loaded: Set<string>
+
+All previously loaded paths are available via this property. It is a simple [JavaScript Set](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set).
+
+
+
+### load(strategy: LoadingStrategy, retryTimes?: number, retryDelay?: number): Observable<Event>
+
+`strategy` parameter is the primary focus here and is explained above.
+`retryTimes` defines how many times the loading will be tried again before fail (_default: 2_).
+`retryDelay` defines how much delay there will be between retries (_default: 1000_).
+
+
+
+
+## What's Next?
+
+- [TrackByService](./Track-By-Service.md)
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 52258520f7..4dcdaa6435 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -341,6 +341,10 @@
               "text": "Custom Setting Page",
               "path": "UI/Angular/Custom-Setting-Page.md"
             },
+            {
+              "text": "Lazy Loading Scripts & Styles",
+              "path": "UI/Angular/Lazy-Load-Service.md"
+            },
             {
               "text": "TrackByService",
               "path": "UI/Angular/Track-By-Service.md"

From 4afe66935555e7326b54c16c49c8890b5704073f Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 3 Apr 2020 08:04:04 +0300
Subject: [PATCH 46/68] chore: update app template npm versions

---
 templates/app/angular/package.json | 34 ++++++++++++++++--------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json
index c982ed20ca..5deaac94d0 100644
--- a/templates/app/angular/package.json
+++ b/templates/app/angular/package.json
@@ -16,23 +16,24 @@
     "@abp/ng.setting-management": "~2.3.0",
     "@abp/ng.tenant-management": "~2.3.0",
     "@abp/ng.theme.basic": "~2.3.0",
-    "@angular/animations": "~9.0.2",
-    "@angular/common": "~9.0.2",
-    "@angular/compiler": "~9.0.2",
-    "@angular/core": "~9.0.2",
-    "@angular/forms": "~9.0.2",
-    "@angular/platform-browser": "~9.0.2",
-    "@angular/platform-browser-dynamic": "~9.0.2",
-    "@angular/router": "~9.0.2",
+    "@angular/animations": "~9.1.0",
+    "@angular/common": "~9.1.0",
+    "@angular/compiler": "~9.1.0",
+    "@angular/core": "~9.1.0",
+    "@angular/forms": "~9.1.0",
+    "@angular/platform-browser": "~9.1.0",
+    "@angular/platform-browser-dynamic": "~9.1.0",
+    "@angular/router": "~9.1.0",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.900.3",
-    "@angular/cli": "~9.0.3",
-    "@angular/compiler-cli": "~9.0.2",
-    "@angular/language-service": "~9.0.2",
+    "@angular-devkit/build-angular": "~0.901.0",
+    "@angular-devkit/build-ng-packagr": "~0.901.0",
+    "@angular/cli": "~9.1.0",
+    "@angular/compiler-cli": "~9.1.0",
+    "@angular/language-service": "~9.1.0",
     "@ngxs/logger-plugin": "^3.6.2",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
@@ -40,15 +41,16 @@
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.3.0",
+    "karma": "~4.4.1",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~2.0.1",
+    "karma-jasmine": "~3.0.1",
     "karma-jasmine-html-reporter": "^1.4.2",
+    "ng-packagr": "^9.0.0",
     "ngxs-schematic": "^1.1.9",
     "protractor": "~5.4.3",
     "ts-node": "~8.3.0",
-    "tslint": "~5.18.0",
-    "typescript": "~3.7.5"
+    "tslint": "~6.1.0",
+    "typescript": "~3.8.3"
   }
 }

From c10c3ecf302771a3451b2662cb9ba2ed8ab03110 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 3 Apr 2020 08:22:41 +0300
Subject: [PATCH 47/68] refactor: refactor development project

---
 npm/ng-packs/angular.json                     |  4 +--
 npm/ng-packs/apps/dev-app/tsconfig.dev.json   | 10 +++++++
 .../{tsconfig.app.json => tsconfig.prod.json} |  2 +-
 npm/ng-packs/package.json                     |  1 +
 .../packages/account-config/tsconfig.lib.json | 12 ++------
 .../account-config/tsconfig.spec.json         |  2 +-
 .../packages/account/tsconfig.lib.json        |  2 +-
 .../packages/account/tsconfig.spec.json       |  2 +-
 npm/ng-packs/packages/core/tsconfig.lib.json  |  2 +-
 npm/ng-packs/packages/core/tsconfig.spec.json |  2 +-
 .../feature-management/tsconfig.lib.json      | 12 ++------
 .../feature-management/tsconfig.spec.json     |  2 +-
 .../identity-config/tsconfig.lib.json         | 12 ++------
 .../identity-config/tsconfig.spec.json        |  2 +-
 .../packages/identity/tsconfig.lib.json       |  2 +-
 .../packages/identity/tsconfig.spec.json      |  2 +-
 .../permission-management/tsconfig.lib.json   |  2 +-
 .../permission-management/tsconfig.spec.json  |  2 +-
 .../tsconfig.lib.json                         | 12 ++------
 .../tsconfig.spec.json                        |  2 +-
 .../setting-management/tsconfig.lib.json      | 12 ++------
 .../setting-management/tsconfig.spec.json     |  2 +-
 .../tsconfig.lib.json                         | 12 ++------
 .../tsconfig.spec.json                        |  2 +-
 .../tenant-management/tsconfig.lib.json       | 12 ++------
 .../tenant-management/tsconfig.spec.json      |  2 +-
 .../packages/theme-basic/tsconfig.lib.json    |  2 +-
 .../packages/theme-basic/tsconfig.spec.json   |  2 +-
 .../packages/theme-shared/tsconfig.lib.json   |  2 +-
 .../packages/theme-shared/tsconfig.spec.json  |  2 +-
 npm/ng-packs/tsconfig.json                    | 30 ++++++++++++++++++-
 npm/ng-packs/tsconfig.prod.json               | 22 ++++++++++++++
 32 files changed, 105 insertions(+), 86 deletions(-)
 create mode 100644 npm/ng-packs/apps/dev-app/tsconfig.dev.json
 rename npm/ng-packs/apps/dev-app/{tsconfig.app.json => tsconfig.prod.json} (98%)
 create mode 100644 npm/ng-packs/tsconfig.prod.json

diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json
index af185688b2..1f13192da0 100644
--- a/npm/ng-packs/angular.json
+++ b/npm/ng-packs/angular.json
@@ -32,7 +32,6 @@
         }
       }
     },
-
     "theme-shared": {
       "projectType": "library",
       "root": "packages/theme-shared",
@@ -436,7 +435,7 @@
             "index": "apps/dev-app/src/index.html",
             "main": "apps/dev-app/src/main.ts",
             "polyfills": "apps/dev-app/src/polyfills.ts",
-            "tsConfig": "apps/dev-app/tsconfig.app.json",
+            "tsConfig": "apps/dev-app/tsconfig.prod.json",
             "aot": false,
             "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"],
             "extractCss": true,
@@ -487,6 +486,7 @@
               ]
             },
             "internal": {
+              "tsConfig": "apps/dev-app/tsconfig.dev.json",
               "fileReplacements": [
                 {
                   "replace": "apps/dev-app/src/environments/environment.ts",
diff --git a/npm/ng-packs/apps/dev-app/tsconfig.dev.json b/npm/ng-packs/apps/dev-app/tsconfig.dev.json
new file mode 100644
index 0000000000..cfbd94952d
--- /dev/null
+++ b/npm/ng-packs/apps/dev-app/tsconfig.dev.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/app",
+    "types": []
+  },
+  "files": ["src/main.ts", "src/polyfills.ts"],
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/test.ts", "src/**/*.spec.ts"]
+}
diff --git a/npm/ng-packs/apps/dev-app/tsconfig.app.json b/npm/ng-packs/apps/dev-app/tsconfig.prod.json
similarity index 98%
rename from npm/ng-packs/apps/dev-app/tsconfig.app.json
rename to npm/ng-packs/apps/dev-app/tsconfig.prod.json
index 464faaec10..91d6f20c5a 100644
--- a/npm/ng-packs/apps/dev-app/tsconfig.app.json
+++ b/npm/ng-packs/apps/dev-app/tsconfig.prod.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": [],
diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 80adfa3d3e..c55324f98f 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -9,6 +9,7 @@
     "symlink": "symlink",
     "start": "ng serve dev-app",
     "start:internal": "ng serve dev-app --configuration=internal",
+    "build": "ng build",
     "test": "ng test --watchAll --runInBand",
     "commit": "git-cz",
     "lint": "ng lint",
diff --git a/npm/ng-packs/packages/account-config/tsconfig.lib.json b/npm/ng-packs/packages/account-config/tsconfig.lib.json
index bd23948e59..7f52d4a590 100644
--- a/npm/ng-packs/packages/account-config/tsconfig.lib.json
+++ b/npm/ng-packs/packages/account-config/tsconfig.lib.json
@@ -1,15 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
+    "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -19,8 +16,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }
diff --git a/npm/ng-packs/packages/account-config/tsconfig.spec.json b/npm/ng-packs/packages/account-config/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/account-config/tsconfig.spec.json
+++ b/npm/ng-packs/packages/account-config/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/account/tsconfig.lib.json b/npm/ng-packs/packages/account/tsconfig.lib.json
index 2972099ba1..7f52d4a590 100644
--- a/npm/ng-packs/packages/account/tsconfig.lib.json
+++ b/npm/ng-packs/packages/account/tsconfig.lib.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
diff --git a/npm/ng-packs/packages/account/tsconfig.spec.json b/npm/ng-packs/packages/account/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/account/tsconfig.spec.json
+++ b/npm/ng-packs/packages/account/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/core/tsconfig.lib.json b/npm/ng-packs/packages/core/tsconfig.lib.json
index 2972099ba1..7f52d4a590 100644
--- a/npm/ng-packs/packages/core/tsconfig.lib.json
+++ b/npm/ng-packs/packages/core/tsconfig.lib.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
diff --git a/npm/ng-packs/packages/core/tsconfig.spec.json b/npm/ng-packs/packages/core/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/core/tsconfig.spec.json
+++ b/npm/ng-packs/packages/core/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/feature-management/tsconfig.lib.json b/npm/ng-packs/packages/feature-management/tsconfig.lib.json
index bd23948e59..7f52d4a590 100644
--- a/npm/ng-packs/packages/feature-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.json
@@ -1,15 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
+    "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -19,8 +16,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }
diff --git a/npm/ng-packs/packages/feature-management/tsconfig.spec.json b/npm/ng-packs/packages/feature-management/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/feature-management/tsconfig.spec.json
+++ b/npm/ng-packs/packages/feature-management/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/identity-config/tsconfig.lib.json b/npm/ng-packs/packages/identity-config/tsconfig.lib.json
index bd23948e59..7f52d4a590 100644
--- a/npm/ng-packs/packages/identity-config/tsconfig.lib.json
+++ b/npm/ng-packs/packages/identity-config/tsconfig.lib.json
@@ -1,15 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
+    "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -19,8 +16,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }
diff --git a/npm/ng-packs/packages/identity-config/tsconfig.spec.json b/npm/ng-packs/packages/identity-config/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/identity-config/tsconfig.spec.json
+++ b/npm/ng-packs/packages/identity-config/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/identity/tsconfig.lib.json b/npm/ng-packs/packages/identity/tsconfig.lib.json
index 2972099ba1..7f52d4a590 100644
--- a/npm/ng-packs/packages/identity/tsconfig.lib.json
+++ b/npm/ng-packs/packages/identity/tsconfig.lib.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
diff --git a/npm/ng-packs/packages/identity/tsconfig.spec.json b/npm/ng-packs/packages/identity/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/identity/tsconfig.spec.json
+++ b/npm/ng-packs/packages/identity/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/permission-management/tsconfig.lib.json b/npm/ng-packs/packages/permission-management/tsconfig.lib.json
index 2972099ba1..7f52d4a590 100644
--- a/npm/ng-packs/packages/permission-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
diff --git a/npm/ng-packs/packages/permission-management/tsconfig.spec.json b/npm/ng-packs/packages/permission-management/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/permission-management/tsconfig.spec.json
+++ b/npm/ng-packs/packages/permission-management/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json b/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json
index bd23948e59..7f52d4a590 100644
--- a/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json
+++ b/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json
@@ -1,15 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
+    "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -19,8 +16,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }
diff --git a/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json b/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json
+++ b/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/setting-management/tsconfig.lib.json b/npm/ng-packs/packages/setting-management/tsconfig.lib.json
index bd23948e59..7f52d4a590 100644
--- a/npm/ng-packs/packages/setting-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.json
@@ -1,15 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
+    "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -19,8 +16,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }
diff --git a/npm/ng-packs/packages/setting-management/tsconfig.spec.json b/npm/ng-packs/packages/setting-management/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/setting-management/tsconfig.spec.json
+++ b/npm/ng-packs/packages/setting-management/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json
index bd23948e59..7f52d4a590 100644
--- a/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json
+++ b/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json
@@ -1,15 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
+    "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -19,8 +16,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }
diff --git a/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json b/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json
+++ b/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json
index 11fb84af38..fa838f3a89 100644
--- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json
@@ -1,15 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ],
+    "lib": ["dom", "es2018"],
     "paths": {}
   },
   "angularCompilerOptions": {
@@ -20,8 +17,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }
diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.spec.json b/npm/ng-packs/packages/tenant-management/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/tenant-management/tsconfig.spec.json
+++ b/npm/ng-packs/packages/tenant-management/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json
index 2972099ba1..7f52d4a590 100644
--- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json
+++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.spec.json b/npm/ng-packs/packages/theme-basic/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/theme-basic/tsconfig.spec.json
+++ b/npm/ng-packs/packages/theme-basic/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json
index 2972099ba1..7f52d4a590 100644
--- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json
+++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.spec.json b/npm/ng-packs/packages/theme-shared/tsconfig.spec.json
index 54e55c4f05..02f312c262 100644
--- a/npm/ng-packs/packages/theme-shared/tsconfig.spec.json
+++ b/npm/ng-packs/packages/theme-shared/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.prod.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
diff --git a/npm/ng-packs/tsconfig.json b/npm/ng-packs/tsconfig.json
index ac9e9e8eea..e52b99135e 100644
--- a/npm/ng-packs/tsconfig.json
+++ b/npm/ng-packs/tsconfig.json
@@ -13,7 +13,35 @@
     "target": "es2015",
     "typeRoots": ["node_modules/@types"],
     "lib": ["es2018", "dom"],
-    "types": ["jest"]
+    "types": ["jest"],
+    "paths": {
+      "@abp/ng.core": ["packages/core/src/public-api.ts"],
+      "@abp/ng.core/*": ["packages/core/src/lib/*"],
+      "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"],
+      "@abp/ng.theme.shared/*": ["packages/theme-shared/src/lib/*"],
+      "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
+      "@abp/ng.theme.basic/*": ["packages/theme-basic/src/lib/*"],
+      "@abp/ng.account": ["packages/account/src/public-api.ts"],
+      "@abp/ng.account/*": ["packages/account/src/lib/*"],
+      "@abp/ng.account.config": ["packages/account-config/src/public-api.ts"],
+      "@abp/ng.account.config/*": ["packages/account-config/src/lib/*"],
+      "@abp/ng.identity": ["packages/identity/src/public-api.ts"],
+      "@abp/ng.identity/*": ["packages/identity/src/lib/*"],
+      "@abp/ng.identity.config": ["packages/identity-config/src/public-api.ts"],
+      "@abp/ng.identity.config/*": ["packages/identity-config/src/lib/*"],
+      "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
+      "@abp/ng.tenant-management/*": ["packages/tenant-management/src/lib/*"],
+      "@abp/ng.tenant-management.config": ["packages/tenant-management-config/src/public-api.ts"],
+      "@abp/ng.tenant-management.config/*": ["packages/tenant-management-config/src/lib/*"],
+      "@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
+      "@abp/ng.setting-management/*": ["packages/setting-management/src/lib/*"],
+      "@abp/ng.setting-management.config": ["packages/setting-management-config/src/public-api.ts"],
+      "@abp/ng.setting-management.config/*": ["packages/setting-management-config/src/lib/*"],
+      "@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"],
+      "@abp/ng.permission-management/*": ["packages/permission-management/src/lib/*"],
+      "@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"],
+      "@abp/ng.feature-management/*": ["packages/feature-management/src/lib/*"]
+    }
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
diff --git a/npm/ng-packs/tsconfig.prod.json b/npm/ng-packs/tsconfig.prod.json
new file mode 100644
index 0000000000..ac9e9e8eea
--- /dev/null
+++ b/npm/ng-packs/tsconfig.prod.json
@@ -0,0 +1,22 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2018", "dom"],
+    "types": ["jest"]
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}

From fcf9ebe0c95af4223a98fa09690120594904993c Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 3 Apr 2020 08:39:02 +0300
Subject: [PATCH 48/68] fix: fix lint error

---
 npm/ng-packs/angular.json                                   | 6 +++++-
 .../identity/src/lib/components/roles/roles.component.ts    | 6 +++---
 .../src/lib/components/tenants/tenants.component.ts         | 6 +++---
 .../src/lib/components/modal/modal.component.ts             | 6 +++---
 .../packages/theme-shared/src/lib/handlers/error.handler.ts | 4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json
index 1f13192da0..39a10f827b 100644
--- a/npm/ng-packs/angular.json
+++ b/npm/ng-packs/angular.json
@@ -519,7 +519,11 @@
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": ["apps/dev-app/tsconfig.app.json", "apps/dev-app/tsconfig.spec.json"],
+            "tsConfig": [
+              "apps/dev-app/tsconfig.dev.json",
+              "apps/dev-app/tsconfig.prod.json",
+              "apps/dev-app/tsconfig.spec.json"
+            ],
             "exclude": ["**/node_modules/**"]
           }
         }
diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
index 546ff48483..20b1114669 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
@@ -1,5 +1,5 @@
 import { ABP } from '@abp/ng.core';
-import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
+import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { Select, Store } from '@ngxs/store';
@@ -116,8 +116,8 @@ export class RolesComponent implements OnInit {
       .warn('AbpIdentity::RoleDeletionConfirmationMessage', 'AbpIdentity::AreYouSure', {
         messageLocalizationParams: [name],
       })
-      .subscribe((status: Toaster.Status) => {
-        if (status === Toaster.Status.confirm) {
+      .subscribe((status: Confirmation.Status) => {
+        if (status === Confirmation.Status.confirm) {
           this.store.dispatch(new DeleteRole(id)).subscribe(() => this.get());
         }
       });
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
index 788953096f..de7a6ad644 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
@@ -1,5 +1,5 @@
 import { ABP } from '@abp/ng.core';
-import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
+import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
 import { Component, OnInit, TemplateRef, ViewChild, ChangeDetectorRef } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Select, Store } from '@ngxs/store';
@@ -252,8 +252,8 @@ export class TenantsComponent implements OnInit {
           messageLocalizationParams: [name],
         },
       )
-      .subscribe((status: Toaster.Status) => {
-        if (status === Toaster.Status.confirm) {
+      .subscribe((status: Confirmation.Status) => {
+        if (status === Confirmation.Status.confirm) {
           this.store.dispatch(new DeleteTenant(id)).subscribe(() => this.get());
         }
       });
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
index 8aaaa58076..e00cda5b55 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
@@ -14,7 +14,7 @@ import {
 import { fromEvent, Subject } from 'rxjs';
 import { debounceTime, filter, takeUntil } from 'rxjs/operators';
 import { fadeAnimation } from '../../animations/modal.animations';
-import { Toaster } from '../../models/toaster';
+import { Confirmation } from '../../models/confirmation';
 import { ConfirmationService } from '../../services/confirmation.service';
 import { ButtonComponent } from '../button/button.component';
 
@@ -133,9 +133,9 @@ export class ModalComponent implements OnDestroy {
           'AbpAccount::AreYouSureYouWantToCancelEditingWarningMessage',
           'AbpAccount::AreYouSure',
         )
-        .subscribe((status: Toaster.Status) => {
+        .subscribe((status: Confirmation.Status) => {
           this.isConfirmationOpen = false;
-          if (status === Toaster.Status.confirm) {
+          if (status === Confirmation.Status.confirm) {
             this.visible = false;
           }
         });
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
index 1f221a42e9..c84bf30470 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
@@ -17,7 +17,7 @@ import { Observable, Subject } from 'rxjs';
 import snq from 'snq';
 import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component';
 import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common';
-import { Toaster } from '../models/toaster';
+import { Confirmation } from '../models/confirmation';
 import { ConfirmationService } from '../services/confirmation.service';
 
 export const DEFAULT_ERROR_MESSAGES = {
@@ -185,7 +185,7 @@ export class ErrorHandler {
     message?: Config.LocalizationParam,
     title?: Config.LocalizationParam,
     body?: any,
-  ): Observable<Toaster.Status> {
+  ): Observable<Confirmation.Status> {
     if (body) {
       if (body.details) {
         message = body.details;

From cfaa753df98ad25219328d3313ce5fd9461e9c77 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 3 Apr 2020 09:39:51 +0300
Subject: [PATCH 49/68] docs: link DomStrategy & CrossOriginStrategy docs

---
 docs/en/UI/Angular/Loading-Strategy.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/en/UI/Angular/Loading-Strategy.md b/docs/en/UI/Angular/Loading-Strategy.md
index 52888d7cb3..a60c49a239 100644
--- a/docs/en/UI/Angular/Loading-Strategy.md
+++ b/docs/en/UI/Angular/Loading-Strategy.md
@@ -14,6 +14,8 @@
 `domStrategy` is the `DomStrategy` that will be used when inserting the created element. (_default: AppendToHead_)
 `crossOriginStrategy` is the `CrossOriginStrategy` that will be used on the created element before inserting it. (_default: Anonymous_)
 
+Please refer to [DomStrategy](./Dom-Strategy.md) and [CrossOriginStratey](./Cross-Origin-Strategy.md) documentation for their usage.
+
 
 ### createElement(): HTMLScriptElement | HTMLLinkElement
 

From 5835c1c3833863bb17dcc0f910e2b3e1ed735e57 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 3 Apr 2020 09:48:09 +0300
Subject: [PATCH 50/68] docs: fix wording mistakes

---
 docs/en/UI/Angular/Lazy-Load-Service.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/UI/Angular/Lazy-Load-Service.md b/docs/en/UI/Angular/Lazy-Load-Service.md
index cdfe3f8263..6d9d9ea4e8 100644
--- a/docs/en/UI/Angular/Lazy-Load-Service.md
+++ b/docs/en/UI/Angular/Lazy-Load-Service.md
@@ -1,6 +1,6 @@
 # How to Lazy Load Scripts and Styles
 
-You can use the `LazyLoadService` in @abp/ng.core package in order to lazy loading scripts and styles in an easy and explicit way.
+You can use the `LazyLoadService` in @abp/ng.core package in order to lazy load scripts and styles in an easy and explicit way.
 
 
 
@@ -25,7 +25,7 @@ class DemoComponent {
 
 ## Usage
 
-You can use the `load` method of `LazyLoadService` to create a `<script>` or `<style>` element in the DOM at the desired position and force the browser to download the target resource.
+You can use the `load` method of `LazyLoadService` to create a `<script>` or `<link>` element in the DOM at the desired position and force the browser to download the target resource.
 
 
 
@@ -124,9 +124,9 @@ All previously loaded paths are available via this property. It is a simple [Jav
 
 ### load(strategy: LoadingStrategy, retryTimes?: number, retryDelay?: number): Observable<Event>
 
-`strategy` parameter is the primary focus here and is explained above.
-`retryTimes` defines how many times the loading will be tried again before fail (_default: 2_).
-`retryDelay` defines how much delay there will be between retries (_default: 1000_).
+- `strategy` parameter is the primary focus here and is explained above.
+- `retryTimes` defines how many times the loading will be tried again before fail (_default: 2_).
+- `retryDelay` defines how much delay there will be between retries (_default: 1000_).
 
 
 

From 956eca3dab53ef3802ef860d26758bba794b818a Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 3 Apr 2020 09:53:24 +0300
Subject: [PATCH 51/68] docs: fix the description

---
 docs/en/UI/Angular/Loading-Strategy.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/en/UI/Angular/Loading-Strategy.md b/docs/en/UI/Angular/Loading-Strategy.md
index a60c49a239..8fb7b68a45 100644
--- a/docs/en/UI/Angular/Loading-Strategy.md
+++ b/docs/en/UI/Angular/Loading-Strategy.md
@@ -1,6 +1,6 @@
 # LoadingStrategy
 
-`LoadingStrategy` is an abstract class exposed by @abp/ng.core package. Its instances help you mark inline script or styles as safe in terms of [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy).
+`LoadingStrategy` is an abstract class exposed by @abp/ng.core package. There are two loading strategies extending it: `ScriptLoadingStrategy` and `StyleLoadingStrategy`. Implementing the same methods and properties, both of these strategies help you define how your lazy loading will work.
 
 
 
@@ -10,11 +10,11 @@
 
 ### constructor(public path: string, protected domStrategy?: DomStrategy, protected crossOriginStrategy?: CrossOriginStrategy)
 
-`path` is set to `<script>` elements as `src` and `<link>` elements as `href` attribute.
-`domStrategy` is the `DomStrategy` that will be used when inserting the created element. (_default: AppendToHead_)
-`crossOriginStrategy` is the `CrossOriginStrategy` that will be used on the created element before inserting it. (_default: Anonymous_)
+- `path` is set to `<script>` elements as `src` and `<link>` elements as `href` attribute.
+- `domStrategy` is the `DomStrategy` that will be used when inserting the created element. (_default: AppendToHead_)
+- `crossOriginStrategy` is the `CrossOriginStrategy` that will be used on the created element before inserting it. (_default: Anonymous_)
 
-Please refer to [DomStrategy](./Dom-Strategy.md) and [CrossOriginStratey](./Cross-Origin-Strategy.md) documentation for their usage.
+Please refer to [DomStrategy](./Dom-Strategy.md) and [CrossOriginStrategy](./Cross-Origin-Strategy.md) documentation for their usage.
 
 
 ### createElement(): HTMLScriptElement | HTMLLinkElement
@@ -30,13 +30,13 @@ This method creates and returns an observable stream that emits on success and t
 
 ## ScriptLoadingStrategy
 
-`ScriptLoadingStrategy` is a class that extends `LoadingStrategy`. It lets you lazy load a script.
+`ScriptLoadingStrategy` is a class that extends `LoadingStrategy`. It lets you **lazy load a script**.
 
 
 
 ## StyleLoadingStrategy
 
-`StyleLoadingStrategy` is a class that extends `LoadingStrategy`. It lets you lazy load a style.
+`StyleLoadingStrategy` is a class that extends `LoadingStrategy`. It lets you **lazy load a style**.
 
 
 

From e1e0b9b07850da002e90d6bc92080d74ba11e911 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 3 Apr 2020 09:56:19 +0300
Subject: [PATCH 52/68] docs: make constructor arguments more readable

---
 docs/en/UI/Angular/Content-Security-Strategy.md | 4 ++--
 docs/en/UI/Angular/Cross-Origin-Strategy.md     | 4 ++--
 docs/en/UI/Angular/Dom-Strategy.md              | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/en/UI/Angular/Content-Security-Strategy.md b/docs/en/UI/Angular/Content-Security-Strategy.md
index af8019231c..21d794a1af 100644
--- a/docs/en/UI/Angular/Content-Security-Strategy.md
+++ b/docs/en/UI/Angular/Content-Security-Strategy.md
@@ -10,7 +10,7 @@
 
 ### constructor(public nonce?: string)
 
-`nonce` enables whitelisting inline script or styles in order to avoid using `unsafe-inline` in [script-src](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src#Unsafe_inline_script) and [style-src](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src#Unsafe_inline_styles) directives.
+- `nonce` enables whitelisting inline script or styles in order to avoid using `unsafe-inline` in [script-src](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src#Unsafe_inline_script) and [style-src](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src#Unsafe_inline_styles) directives.
 
 
 ### applyCSP(element: HTMLScriptElement | HTMLStyleElement): void
@@ -22,7 +22,7 @@ This method maps the aforementioned properties to the given `element`.
 
 ## LooseContentSecurityPolicy
 
-`LooseContentSecurityPolicy` is a class that extends `ContentSecurityStrategy`. It required `nonce` and marks given `<script>` or `<style>` tag with it.
+`LooseContentSecurityPolicy` is a class that extends `ContentSecurityStrategy`. It requires `nonce` and marks given `<script>` or `<style>` tag with it.
 
 
 
diff --git a/docs/en/UI/Angular/Cross-Origin-Strategy.md b/docs/en/UI/Angular/Cross-Origin-Strategy.md
index d93fc63d39..483fdfff59 100644
--- a/docs/en/UI/Angular/Cross-Origin-Strategy.md
+++ b/docs/en/UI/Angular/Cross-Origin-Strategy.md
@@ -8,8 +8,8 @@
 
 ### constructor(public crossorigin: 'anonymous' | 'use-credentials', public integrity?: string)
 
-`crossorigin` is mapped to [the HTML attribute with the same name](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin).
-`integrity` is a hash for validating a remote resource. Its use is explained [here](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity).
+- `crossorigin` is mapped to [the HTML attribute with the same name](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin).
+- `integrity` is a hash for validating a remote resource. Its use is explained [here](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity).
 
 
 ### setCrossOrigin(element: HTMLElement): void
diff --git a/docs/en/UI/Angular/Dom-Strategy.md b/docs/en/UI/Angular/Dom-Strategy.md
index eb4740bf0e..1b5fb1011a 100644
--- a/docs/en/UI/Angular/Dom-Strategy.md
+++ b/docs/en/UI/Angular/Dom-Strategy.md
@@ -8,8 +8,8 @@
 
 ### constructor(public target?: HTMLElement, public position?: InsertPosition)
 
-`target` is an HTMLElement (_default: document.head_).
-`position` defines where the created element will be placed. All possible values of `position` can be found [here](https://developer.mozilla.org/en-US/docs/Web/API/Element/insertAdjacentElement) (_default: 'beforeend'_).
+- `target` is an HTMLElement (_default: document.head_).
+- `position` defines where the created element will be placed. All possible values of `position` can be found [here](https://developer.mozilla.org/en-US/docs/Web/API/Element/insertAdjacentElement) (_default: 'beforeend'_).
 
 
 ### insertElement(element: HTMLElement): void
@@ -54,3 +54,5 @@ Predefined dom strategies are accessible via `DOM_STRATEGY` constant.
 ## What's Next?
 
 - [LoadingStrategy](./Loading-Strategy.md)
+
+TODO: Place new InsertionStrategy link here.

From 9d8acf855057b6d80a621f64dca1cf5a24110937 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 3 Apr 2020 10:45:53 +0300
Subject: [PATCH 53/68] feat: implement new LazyLoadService

---
 .../apps/dev-app/src/app/app.component.ts     | 20 +++++++++---------
 .../app/angular/src/app/app.component.ts      | 21 ++++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/npm/ng-packs/apps/dev-app/src/app/app.component.ts b/npm/ng-packs/apps/dev-app/src/app/app.component.ts
index ea971ac3f4..d9018f0a39 100644
--- a/npm/ng-packs/apps/dev-app/src/app/app.component.ts
+++ b/npm/ng-packs/apps/dev-app/src/app/app.component.ts
@@ -1,5 +1,6 @@
-import { LazyLoadService } from '@abp/ng.core';
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
+import { concat } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -12,14 +13,13 @@ export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
 
   ngOnInit() {
-    this.lazyLoadService
-      .load(
-        ['fontawesome-all.min.css', 'fontawesome-v4-shims.min.css'],
-        'style',
-        null,
-        'head',
-        'afterbegin',
-      )
-      .subscribe();
+    concat(
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
+      ),
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
+      ),
+    ).subscribe();
   }
 }
diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts
index 6508fc9831..0c397f5bb8 100644
--- a/templates/app/angular/src/app/app.component.ts
+++ b/templates/app/angular/src/app/app.component.ts
@@ -1,5 +1,6 @@
-import { LazyLoadService } from '@abp/ng.core';
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
+import { concat } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -10,15 +11,15 @@ import { Component, OnInit } from '@angular/core';
 })
 export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
-  async ngOnInit() {
-    this.lazyLoadService
-      .load(
-        ['fontawesome-all.min.css', 'fontawesome-v4-shims.min.css'],
-        'style',
-        null,
-        'head',
-        'afterbegin'
+
+  ngOnInit() {
+    concat(
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
+      ),
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css')
       )
-      .subscribe();
+    ).subscribe();
   }
 }

From f9d56c64418326e9a93be50bc66392a2060fa203 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 3 Apr 2020 11:06:59 +0300
Subject: [PATCH 54/68] refactor: use forkJoin instead of concat

---
 npm/ng-packs/apps/dev-app/src/app/app.component.ts |  8 ++++----
 templates/app/angular/src/app/app.component.ts     | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/npm/ng-packs/apps/dev-app/src/app/app.component.ts b/npm/ng-packs/apps/dev-app/src/app/app.component.ts
index d9018f0a39..8187365734 100644
--- a/npm/ng-packs/apps/dev-app/src/app/app.component.ts
+++ b/npm/ng-packs/apps/dev-app/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
-import { concat } from 'rxjs';
+import { forkJoin } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -13,12 +13,12 @@ export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
 
   ngOnInit() {
-    concat(
+    forkJoin(
       this.lazyLoadService.load(
-        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
       ),
       this.lazyLoadService.load(
-        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
       ),
     ).subscribe();
   }
diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts
index 0c397f5bb8..e4e827c766 100644
--- a/templates/app/angular/src/app/app.component.ts
+++ b/templates/app/angular/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
-import { concat } from 'rxjs';
+import { forkJoin } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -13,13 +13,13 @@ export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
 
   ngOnInit() {
-    concat(
-      this.lazyLoadService.load(
-        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
-      ),
+    forkJoin(
       this.lazyLoadService.load(
         LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css')
       )
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
+      ),
     ).subscribe();
   }
 }

From d802b0174b19938710af2c2ae466d01170561a0a Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 3 Apr 2020 16:16:00 +0800
Subject: [PATCH 55/68] Start and shutdown quartz asynchronously

---
 .../src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
index c16ab14f4d..0c6c65b1ac 100644
--- a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
+++ b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
@@ -22,13 +22,13 @@ namespace Volo.Abp.Quartz
         {
             _scheduler = context.ServiceProvider.GetService<IScheduler>();
             _scheduler.JobFactory = context.ServiceProvider.GetService<IJobFactory>();
-            _scheduler.Start();
+            AsyncHelper.RunSync(() => _scheduler.Start());
         }
 
         public override void OnApplicationShutdown(ApplicationShutdownContext context)
         {
             //TODO: ABP may provide two methods for application shutdown: OnPreApplicationShutdown & OnApplicationShutdown
-            _scheduler.Shutdown();
+            AsyncHelper.RunSync(() => _scheduler.Shutdown());
         }
     }
 }

From 34128a63aaac8171dc00d8d654f25f98f32b68ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 3 Apr 2020 11:40:23 +0300
Subject: [PATCH 56/68] Extract TypeHelper.IsNullable.

---
 .../Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
index b62f21f124..5f66f4788e 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
 
@@ -15,7 +14,7 @@ namespace Volo.Abp.Reflection
             {
                 return false;
             }
-
+            
             var type = obj.GetType();
             if (!type.GetTypeInfo().IsGenericType)
             {
@@ -37,9 +36,7 @@ namespace Volo.Abp.Reflection
                 return true;
             }
 
-            if (includeNullables &&
-                type.IsGenericType &&
-                type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            if (includeNullables && IsNullable(type))
             {
                 return IsPrimitiveExtendedInternal(type.GenericTypeArguments[0], includeEnums);
             }
@@ -47,6 +44,11 @@ namespace Volo.Abp.Reflection
             return false;
         }
 
+        public static bool IsNullable(Type type)
+        {
+            return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
+        }
+
         public static Type GetFirstGenericArgumentIfNullable(this Type t)
         {
             if (t.GetGenericArguments().Length > 0 && t.GetGenericTypeDefinition() == typeof(Nullable<>))

From 70444944c77878e1b87ea835c15522c720c9b478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 3 Apr 2020 11:44:13 +0300
Subject: [PATCH 57/68] Resolve #3339: Dynamic C# API Clients may not handle
 DateTime on QueryString when client and server cultures are different

---
 .../DynamicHttpProxyInterceptor.cs            | 15 ++++--
 .../Http/Client/DynamicProxying/UrlBuilder.cs | 22 ++++++++-
 .../DynamicProxying/IRegularTestController.cs |  5 +-
 .../DynamicProxying/RegularTestController.cs  | 22 +++++++--
 .../RegularTestControllerClientProxy_Tests.cs | 46 ++++++++++++++++---
 5 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
index 3e0124237f..d5d90ed182 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -56,7 +56,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             IJsonSerializer jsonSerializer,
             IRemoteServiceHttpClientAuthenticator clientAuthenticator,
             ICancellationTokenProvider cancellationTokenProvider,
-            ICorrelationIdProvider correlationIdProvider, 
+            ICorrelationIdProvider correlationIdProvider,
             IOptions<AbpCorrelationIdOptions> correlationIdOptions,
             ICurrentTenant currentTenant)
         {
@@ -110,7 +110,14 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             //TODO: Think on that
             if (TypeHelper.IsPrimitiveExtended(typeof(T), true))
             {
-                return (T)Convert.ChangeType(responseAsString, typeof(T));
+                if (typeof(DateTime).IsAssignableFrom(typeof(T)))
+                {
+                    return (T)(object)DateTime.Parse(responseAsString.Trim('\"'), CultureInfo.InvariantCulture);
+                }
+                else
+                {
+                    return (T)Convert.ChangeType(responseAsString, typeof(T));
+                }
             }
 
             return JsonSerializer.Deserialize<T>(responseAsString);
@@ -151,8 +158,8 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             }
 
             return await response.Content.ReadAsStringAsync();
-        } 
-        
+        }
+
         private ApiVersionInfo GetApiVersionInfo(ActionApiDescriptionModel action)
         {
             var apiVersion = FindBestApiVersion(action);
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs
index dcb9868b7f..dae7853e08 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs
@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
+using JetBrains.Annotations;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.Http.ProxyScripting.Generators;
+using Volo.Abp.Reflection;
 
 namespace Volo.Abp.Http.Client.DynamicProxying
 {
@@ -88,10 +91,25 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             }
         }
 
-        private static void AddQueryStringParameter(StringBuilder urlBuilder, bool isFirstParam, string name, object value)
+        private static void AddQueryStringParameter(
+            StringBuilder urlBuilder,
+            bool isFirstParam,
+            string name,
+            [NotNull] object value)
         {
             urlBuilder.Append(isFirstParam ? "?" : "&");
-            urlBuilder.Append(name + "=" + System.Net.WebUtility.UrlEncode(value.ToString()));
+
+            urlBuilder.Append(name + "=" + System.Net.WebUtility.UrlEncode(ConvertValueToString(value)));
+        }
+
+        private static string ConvertValueToString([NotNull] object value)
+        {
+            if (value is DateTime dateTimeValue)
+            {
+                return dateTimeValue.ToUniversalTime().ToString("u");
+            }
+
+            return value.ToString();
         }
     }
 }
diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/IRegularTestController.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/IRegularTestController.cs
index 0e7b9d9163..546968d402 100644
--- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/IRegularTestController.cs
+++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/IRegularTestController.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 namespace Volo.Abp.Http.DynamicProxying
 {
@@ -8,6 +9,8 @@ namespace Volo.Abp.Http.DynamicProxying
 
         Task GetException1Async();
 
+        Task<DateTime> GetWithDateTimeParameterAsync(DateTime dateTime1);
+
         Task<string> PostValueWithHeaderAndQueryStringAsync(string headerValue, string qsValue);
 
         Task<string> PostValueWithBodyAsync(string bodyValue);
diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs
index 717b62701e..ef2a8bface 100644
--- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs
+++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs
@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Application.Services;
 using Volo.Abp.AspNetCore.Mvc;
@@ -25,6 +27,14 @@ namespace Volo.Abp.Http.DynamicProxying
             throw new UserFriendlyException("This is an error message!");
         }
 
+        [HttpGet]
+        [Route("get-with-datetime-parameter")]
+        public Task<DateTime> GetWithDateTimeParameterAsync(DateTime dateTime1)
+        {
+            var culture = CultureInfo.CurrentCulture;
+            return Task.FromResult(dateTime1);
+        }
+
         [HttpPost]
         [Route("post-with-header-and-qs")]
         public Task<string> PostValueWithHeaderAndQueryStringAsync([FromHeader] string headerValue, [FromQuery] string qsValue)
@@ -48,7 +58,7 @@ namespace Volo.Abp.Http.DynamicProxying
 
         [HttpPost]
         [Route("post-object-with-query")]
-        public Task<Car> PostObjectWithQueryAsync( Car bodyValue)
+        public Task<Car> PostObjectWithQueryAsync(Car bodyValue)
         {
             return Task.FromResult(bodyValue);
         }
@@ -59,7 +69,7 @@ namespace Volo.Abp.Http.DynamicProxying
         {
             return Task.FromResult(bodyValue);
         }
-        
+
         [HttpGet]
         [Route("post-object-and-id-with-url/{id}")]
         public Task<Car> GetObjectandIdAsync(int id, [FromBody] Car bodyValue)
@@ -67,7 +77,7 @@ namespace Volo.Abp.Http.DynamicProxying
             bodyValue.Year = id;
             return Task.FromResult(bodyValue);
         }
-        
+
         [HttpGet]
         [Route("post-object-and-id-with-url-and-query/{id}")]
         public Task<Car> GetObjectAndIdWithQueryAsync(int id, Car bodyValue)
@@ -116,7 +126,11 @@ namespace Volo.Abp.Http.DynamicProxying
     {
         [FromQuery]
         public int Year { get; set; }
+
         [FromQuery]
         public string Model { get; set; }
+
+        [FromQuery]
+        public DateTime FirstReleaseDate { get; set; }
     }
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestControllerClientProxy_Tests.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestControllerClientProxy_Tests.cs
index 28a024f68e..85825263bd 100644
--- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestControllerClientProxy_Tests.cs
+++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestControllerClientProxy_Tests.cs
@@ -1,7 +1,9 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Volo.Abp.Http.Client;
+using Volo.Abp.Localization;
 using Xunit;
 
 namespace Volo.Abp.Http.DynamicProxying
@@ -30,6 +32,25 @@ namespace Volo.Abp.Http.DynamicProxying
             exception.Error.Message.ShouldBe("This is an error message!");
         }
 
+        [Fact]
+        public async Task GetWithDateTimeParameterAsync()
+        {
+            var dateTime1 = new DateTime(2020, 04, 19, 19, 05, 01);
+            var result = await _controller.GetWithDateTimeParameterAsync(dateTime1);
+            result.ShouldBe(dateTime1);
+        }
+
+        [Fact]
+        public async Task GetWithDateTimeParameterAsync_With_Different_Culture()
+        {
+            using (CultureHelper.Use("es"))
+            {
+                var dateTime1 = new DateTime(2020, 04, 19, 19, 05, 01);
+                var result = await _controller.GetWithDateTimeParameterAsync(dateTime1);
+                result.ShouldBe(dateTime1);
+            }
+        }
+
         [Fact]
         public async Task PostValueWithHeaderAndQueryStringAsync()
         {
@@ -54,7 +75,7 @@ namespace Volo.Abp.Http.DynamicProxying
         [Fact]
         public async Task PostObjectWithBodyAsync()
         {
-            var result = await _controller.PostObjectWithBodyAsync(new Car { Year = 1976, Model = "Ford" });
+            var result = await _controller.PostObjectWithBodyAsync(new Car { Year = 1976, Model = "Ford", FirstReleaseDate = new DateTime(1976, 02, 22, 15, 0, 6, 22) });
             result.Year.ShouldBe(1976);
             result.Model.ShouldBe("Ford");
         }
@@ -62,15 +83,26 @@ namespace Volo.Abp.Http.DynamicProxying
         [Fact]
         public async Task PostObjectWithQueryAsync()
         {
-            var result = await _controller.PostObjectWithQueryAsync(new Car { Year = 1976, Model = "Ford" });
+            var result = await _controller.PostObjectWithQueryAsync(new Car { Year = 1976, Model = "Ford", FirstReleaseDate = new DateTime(1976, 02, 22, 15, 0, 6, 22) });
             result.Year.ShouldBe(1976);
             result.Model.ShouldBe("Ford");
         }
 
+        [Fact]
+        public async Task PostObjectWithQueryAsync_With_Different_Culture()
+        {
+            using (CultureHelper.Use("tr"))
+            {
+                var result = await _controller.PostObjectWithQueryAsync(new Car { Year = 1976, Model = "Ford", FirstReleaseDate = new DateTime(1976, 02, 22, 15, 0, 6, 22) });
+                result.Year.ShouldBe(1976);
+                result.Model.ShouldBe("Ford");
+            }
+        }
+
         [Fact]
         public async Task GetObjectWithUrlAsync()
         {
-            var result = await _controller.GetObjectWithUrlAsync(new Car { Year = 1976, Model = "Ford" });
+            var result = await _controller.GetObjectWithUrlAsync(new Car { Year = 1976, Model = "Ford", FirstReleaseDate = new DateTime(1976, 02, 22, 15, 0, 6, 22) });
             result.Year.ShouldBe(1976);
             result.Model.ShouldBe("Ford");
         }
@@ -78,7 +110,7 @@ namespace Volo.Abp.Http.DynamicProxying
         [Fact]
         public async Task GetObjectandIdAsync()
         {
-            var result = await _controller.GetObjectandIdAsync(42, new Car { Year = 1976, Model = "Ford" });
+            var result = await _controller.GetObjectandIdAsync(42, new Car { Year = 1976, Model = "Ford", FirstReleaseDate = new DateTime(1976, 02, 22, 15, 0, 6, 22) });
             result.Year.ShouldBe(42);
             result.Model.ShouldBe("Ford");
         }
@@ -86,7 +118,7 @@ namespace Volo.Abp.Http.DynamicProxying
         [Fact]
         public async Task GetObjectAndIdWithQueryAsync()
         {
-            var result = await _controller.GetObjectAndIdWithQueryAsync(42, new Car { Year = 1976, Model = "Ford" });
+            var result = await _controller.GetObjectAndIdWithQueryAsync(42, new Car { Year = 1976, Model = "Ford", FirstReleaseDate = new DateTime(1976, 02, 22, 15, 0, 6, 22) });
             result.Year.ShouldBe(42);
             result.Model.ShouldBe("Ford");
         }
@@ -97,7 +129,7 @@ namespace Volo.Abp.Http.DynamicProxying
             var result = await _controller.PatchValueWithBodyAsync("mybody");
             result.ShouldBe("mybody");
         }
-        
+
         [Fact]
         public async Task PutValueWithHeaderAndQueryStringAsync()
         {

From efaa08d1b1e828325af6aab4e05b4b711c89cc24 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 3 Apr 2020 12:07:14 +0300
Subject: [PATCH 58/68] docs: add more advanced lazy load examples

---
 docs/en/UI/Angular/Lazy-Load-Service.md | 65 ++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/docs/en/UI/Angular/Lazy-Load-Service.md b/docs/en/UI/Angular/Lazy-Load-Service.md
index 6d9d9ea4e8..a48efeebc7 100644
--- a/docs/en/UI/Angular/Lazy-Load-Service.md
+++ b/docs/en/UI/Angular/Lazy-Load-Service.md
@@ -89,7 +89,7 @@ Please refer to [LoadingStrategy](./Loading-Strategy.md) to see all available lo
 
 ### Advanced Usage
 
-You have quite a bit of freedom to define how your lazy load will be implemented. Here is an example:
+You have quite a bit of **freedom to define how your lazy load will work**. Here is an example:
 
 ```js
 const domStrategy = DOM_STRATEGY.PrependToHead();
@@ -110,6 +110,69 @@ this.lazyLoad.load(loadingStrategy, 1, 2000);
 This code will create a `<link>` element with given url and integrity hash, insert it to to top of the `<head>` element, and retry once after 2 seconds if first try fails.
 
 
+A common usecase is **loading multiple scripts and/or styles before using a feature**:
+
+```js
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
+import { frokJoin } from 'rxjs';
+
+@Component({
+  template: `
+    <some-component *ngIf="scriptsAndStylesLoaded$ | async"></some-component>
+  `
+})
+class DemoComponent {
+  private stylesLoaded$ = forkJoin(
+    this.lazyLoad.load(
+      LOADING_STRATEGY.PrependAnonymousStyleToHead('/assets/library-dark-theme.css'),
+      LOADING_STRATEGY.PrependAnonymousStyleToHead('/assets/library.css'),
+    ),
+  );
+
+  private scriptsLoaded$ = forkJoin(
+    this.lazyLoad.load(
+      LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/library.js'),
+      LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/other-library.css'),
+    ),
+  );
+
+  scriptsAndStylesLoaded$ = forkJoin(this.scriptsLoaded$, this.stylesLoaded$);
+
+  constructor(private lazyLoadService: LazyLoadService) {}
+}
+```
+
+RxJS `forkJoin` will load all scripts and styles in parallel and emit only when all of them are loaded. So, when `<some-component>` is placed, all required dependencies will be available.
+
+> Noticed we have prepended styles to the document head? This is sometimes necessary, because your application styles may be overriding some of the library styles. In such a case, you must be careful about the order of prepended styles. They will be placed one-by-one and, **when prepending, the last one placed will be on top**.
+
+
+Another frequent usecase is **loading dependent scripts in order**:
+
+```js
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
+import { concat } from 'rxjs';
+
+@Component({
+  template: `
+    <some-component *ngIf="scriptsLoaded$ | async"></some-component>
+  `
+})
+class DemoComponent {
+  scriptsLoaded$ = concat(
+    this.lazyLoad.load(
+      LOADING_STRATEGY.PrependAnonymousScriptToHead('/assets/library.js'),
+      LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/script-that-requires-library.js'),
+    ),
+  );
+
+  constructor(private lazyLoadService: LazyLoadService) {}
+}
+```
+
+In this example, the second file needs the first one to be loaded beforehand. RxJS `concat` function will let you load all scripts one-by-one in the given order and emit only when all of them are loaded.
+
+
 
 
 ## API

From 3b34c2f83fa165b29ed603344b871c270ac4883a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 3 Apr 2020 12:15:52 +0300
Subject: [PATCH 59/68] Update AbpTagHelperResourceService.cs

---
 .../Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
index 40fd3e6ea5..f4c66f56f2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
@@ -63,7 +63,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             foreach (var bundleFile in bundleFiles)
             {
                 var file = WebContentFileProvider.GetFileInfo(bundleFile);
-                if (!file.Exists)
+
+                if (file == null || !file.Exists)
                 {
                     throw new AbpException($"Could not find the bundle file from {nameof(IWebContentFileProvider)}");
                 }

From 6bf4726673d05b855f985ea25949a1b9a60dda7c Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 3 Apr 2020 12:46:44 +0300
Subject: [PATCH 60/68] docs: fix error in advanced examples

---
 docs/en/UI/Angular/Lazy-Load-Service.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/UI/Angular/Lazy-Load-Service.md b/docs/en/UI/Angular/Lazy-Load-Service.md
index a48efeebc7..f165075c8f 100644
--- a/docs/en/UI/Angular/Lazy-Load-Service.md
+++ b/docs/en/UI/Angular/Lazy-Load-Service.md
@@ -125,6 +125,8 @@ class DemoComponent {
   private stylesLoaded$ = forkJoin(
     this.lazyLoad.load(
       LOADING_STRATEGY.PrependAnonymousStyleToHead('/assets/library-dark-theme.css'),
+    ),
+    this.lazyLoad.load(
       LOADING_STRATEGY.PrependAnonymousStyleToHead('/assets/library.css'),
     ),
   );
@@ -132,6 +134,8 @@ class DemoComponent {
   private scriptsLoaded$ = forkJoin(
     this.lazyLoad.load(
       LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/library.js'),
+    ),
+    this.lazyLoad.load(
       LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/other-library.css'),
     ),
   );
@@ -162,6 +166,8 @@ class DemoComponent {
   scriptsLoaded$ = concat(
     this.lazyLoad.load(
       LOADING_STRATEGY.PrependAnonymousScriptToHead('/assets/library.js'),
+    ),
+    this.lazyLoad.load(
       LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/script-that-requires-library.js'),
     ),
   );

From 9b866be70efcbca6f43d2d10536594bf3090c583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 3 Apr 2020 15:09:25 +0300
Subject: [PATCH 61/68] Update Application-Services.md

---
 docs/en/Application-Services.md | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/docs/en/Application-Services.md b/docs/en/Application-Services.md
index da22479593..f7f7675f46 100644
--- a/docs/en/Application-Services.md
+++ b/docs/en/Application-Services.md
@@ -132,6 +132,8 @@ The `CreateAsync` method above manually creates a `Book` entity from given `Crea
 
 However, in many cases, it's very practical to use **auto object mapping** to set properties of an object from a similar object. ABP provides an [object to object mapping](Object-To-Object-Mapping.md) infrastructure to make this even easier.
 
+Object to object mapping provides abstractions and it is implemented by the [AutoMapper](https://automapper.org/) library by default.
+
 Let's create another method to get a book. First, define the method in the `IBookAppService` interface:
 
 ````csharp
@@ -158,7 +160,7 @@ public class BookDto
 }
 ````
 
-we creating a [Profile](https://docs.automapper.org/en/stable/Configuration.html#profile-instances) class. Example:
+AutoMapper requires to create a mapping [profile class](https://docs.automapper.org/en/stable/Configuration.html#profile-instances). Example:
 
 ````csharp
 public class MyProfile : Profile
@@ -187,22 +189,10 @@ public class MyModule : AbpModule
 }
 ````
 
-`AddMaps` registers all profile classes defined in the assembly of the given class, typically your module class. It also registers for the [attribute mapping](https://docs.automapper.org/en/stable/Attribute-mapping.html). For more information, please refer to the [object to object mapping](Object-To-Object-Mapping.md) document.
+`AddMaps` registers all profile classes defined in the assembly of the given class, typically your module class. It also registers for the [attribute mapping](https://docs.automapper.org/en/stable/Attribute-mapping.html).
 
 Then you can implement the `GetAsync` method as shown below:
 
-````csharp
-public async Task<BookDto> GetAsync(Guid id)
-{
-    var book = await _bookRepository.GetAsync(id);
-    return book.MapTo<BookDto>();
-}
-````
-
-`MapTo` extension method converts `Book` object to `BookDto` object by copying all properties with the same naming.
-
-An alternative to the `MapTo` is using the `IObjectMapper` service:
-
 ````csharp
 public async Task<BookDto> GetAsync(Guid id)
 {
@@ -211,8 +201,6 @@ public async Task<BookDto> GetAsync(Guid id)
 }
 ````
 
-While the second syntax is a bit harder to write, it better works if you write unit tests.
-
 See the [object to object mapping document](Object-To-Object-Mapping.md) for more.
 
 ## Validation

From fd132087973f9bb170d253fc8e50287563b1fe8b Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Fri, 3 Apr 2020 18:04:25 +0300
Subject: [PATCH 62/68] auditlog repository updated

---
 .../Volo/Abp/AuditLogging/IAuditLogRepository.cs           | 2 +-
 .../EntityFrameworkCore/EfCoreAuditLogRepository.cs        | 5 ++---
 .../Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs    | 7 ++++---
 .../Volo/Abp/AuditLogging/AuditLogRepository_Tests.cs      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs
index 9efc4ae0f6..0e907b2a8e 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs
@@ -46,7 +46,7 @@ namespace Volo.Abp.AuditLogging
             DateTime startDate,
             DateTime endDate);
 
-        Task<EntityChange> GetEntityChange(Guid auditLogId, Guid entityChangeId, bool includeDetails = true);
+        Task<EntityChange> GetEntityChange(Guid entityChangeId);
 
         Task<List<EntityChange>> GetEntityChangeListAsync(
             string sorting = null,
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs
index b6308c5741..80e381e02b 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs
@@ -141,10 +141,9 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
             return GetQueryable().IncludeDetails();
         }
 
-        public Task<EntityChange> GetEntityChange(Guid auditLogId, Guid entityChangeId, bool includeDetails = true)
+        public Task<EntityChange> GetEntityChange(Guid entityChangeId)
         {
-            return DbContext.Set<EntityChange>().AsNoTracking().IncludeDetails(includeDetails)
-                .Where(x => x.Id == entityChangeId && x.AuditLogId == auditLogId).FirstAsync();
+            return DbContext.Set<EntityChange>().AsNoTracking().IncludeDetails().Where(x => x.Id == entityChangeId).FirstAsync();
         }
 
         public virtual async Task<List<EntityChange>> GetEntityChangeListAsync(
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs
index 89ed33ee5f..3541dfc88d 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs
@@ -140,11 +140,12 @@ namespace Volo.Abp.AuditLogging.MongoDB
             return result.ToDictionary(element => element.Day.ClearTime(), element => element.avgExecutionTime);
         }
 
-        public virtual async Task<EntityChange> GetEntityChange(Guid auditLogId, Guid entityChangeId, bool includeDetails = true)
+        public virtual async Task<EntityChange> GetEntityChange(Guid entityChangeId)
         {
             return (await GetMongoQueryable()
-                    .Where(x => x.Id == auditLogId && x.EntityChanges.Any(y => y.Id == entityChangeId)).FirstAsync())
-                .EntityChanges.First(x => x.Id == entityChangeId);
+                            .Where(x => x.EntityChanges.Any(y => y.Id == entityChangeId))
+                            .FirstAsync()
+                    ).EntityChanges.First(x => x.Id == entityChangeId);
         }
 
         public virtual async Task<List<EntityChange>> GetEntityChangeListAsync(
diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo/Abp/AuditLogging/AuditLogRepository_Tests.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo/Abp/AuditLogging/AuditLogRepository_Tests.cs
index 78abe1862d..6de00a0f49 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo/Abp/AuditLogging/AuditLogRepository_Tests.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo/Abp/AuditLogging/AuditLogRepository_Tests.cs
@@ -538,7 +538,7 @@ namespace Volo.Abp.AuditLogging
 
             var entityChanges = await AuditLogRepository.GetEntityChangeListAsync();
             var entityChange =
-                await AuditLogRepository.GetEntityChange(entityChanges.First().AuditLogId, entityChanges.First().Id);
+                await AuditLogRepository.GetEntityChange(entityChanges.First().Id);
 
             entityChange.ChangeTime.ShouldBe(entityChanges.First().ChangeTime);
         }

From 342db112965ac848d342200790a17b77b1b85fa2 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Sat, 4 Apr 2020 12:56:10 +0300
Subject: [PATCH 63/68] Create .npmrc file when run abp switch-to-preview
 command

resolves https://github.com/abpframework/abp/issues/3258
---
 .../ProjectModification/NpmPackagesUpdater.cs | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
index 263e94c377..280af81687 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -51,9 +52,14 @@ namespace Volo.Abp.Cli.ProjectModification
                 {
                     var fileDirectory = Path.GetDirectoryName(file).EnsureEndsWith(Path.DirectorySeparatorChar);
 
+                    if (IsAngularProject(fileDirectory))
+                    {
+                        CreateNpmrcFile(Path.GetDirectoryName(file));
+                    }
+
                     RunYarn(fileDirectory);
 
-                    if (IsAngularProject(fileDirectory) == false)
+                    if (!IsAngularProject(fileDirectory))
                     {
                         Thread.Sleep(500);
                         RunGulp(fileDirectory);
@@ -62,6 +68,21 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
+        private void CreateNpmrcFile(string directoryName)
+        {
+            var fileName = Path.Combine(directoryName, ".npmrc");
+
+            if (File.Exists(fileName))
+            {
+                return;
+            }
+
+            using var fs = File.Create(fileName);
+
+            var content = new UTF8Encoding(true).GetBytes("@abp:registry:https://www.myget.org/F/abp-nightly/npm");
+            fs.Write(content, 0, content.Length);
+        }
+
         private bool IsAngularProject(string fileDirectory)
         {
             return File.Exists(Path.Combine(fileDirectory, "angular.json"));

From f6bf2dbb34b20340a696d528ecae03012e576167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 4 Apr 2020 21:37:47 +0300
Subject: [PATCH 64/68] Improve the exception message in the
 AbpTagHelperResourceService.

---
 .../Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
index f4c66f56f2..88387e8937 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
@@ -66,7 +66,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 
                 if (file == null || !file.Exists)
                 {
-                    throw new AbpException($"Could not find the bundle file from {nameof(IWebContentFileProvider)}");
+                    throw new AbpException($"Could not find the bundle file '{bundleFile}' from {nameof(IWebContentFileProvider)}");
                 }
 
                 AddHtmlTag(context, output, bundleFile + "?_v=" + file.LastModified.UtcTicks);

From 5532475b3e9f780f026bb3fb66515475e632d1ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 4 Apr 2020 22:59:26 +0300
Subject: [PATCH 65/68] Created "how to" guides

---
 .../Azure-Active-Directory-Authentication-MVC.md}        | 2 +-
 .../Post.md => How-To/Customize-Login-Page-MVC.md}       | 2 +-
 .../Post.md => How-To/Customize-SignIn-Manager.md}       | 6 +-----
 docs/en/How-To/Index.md                                  | 9 +++++++++
 docs/en/docs-nav.json                                    | 4 ++++
 5 files changed, 16 insertions(+), 7 deletions(-)
 rename docs/en/{Blog-Posts/2020-04-01/Post.md => How-To/Azure-Active-Directory-Authentication-MVC.md} (98%)
 rename docs/en/{Blog-Posts/2020-04-03/Post.md => How-To/Customize-Login-Page-MVC.md} (98%)
 rename docs/en/{Blog-Posts/2020-04-02/Post.md => How-To/Customize-SignIn-Manager.md} (98%)
 create mode 100644 docs/en/How-To/Index.md

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/How-To/Azure-Active-Directory-Authentication-MVC.md
similarity index 98%
rename from docs/en/Blog-Posts/2020-04-01/Post.md
rename to docs/en/How-To/Azure-Active-Directory-Authentication-MVC.md
index 2fb937467b..1d650f46b1 100644
--- a/docs/en/Blog-Posts/2020-04-01/Post.md
+++ b/docs/en/How-To/Azure-Active-Directory-Authentication-MVC.md
@@ -1,4 +1,4 @@
-# Using Azure Active Directory Authentication in ABP ASP.NET Core MVC application
+# How to Use the Azure Active Directory Authentication for MVC / Razor Page Applications
 
 ## Introduction
 
diff --git a/docs/en/Blog-Posts/2020-04-03/Post.md b/docs/en/How-To/Customize-Login-Page-MVC.md
similarity index 98%
rename from docs/en/Blog-Posts/2020-04-03/Post.md
rename to docs/en/How-To/Customize-Login-Page-MVC.md
index a95eb6c873..db237c932d 100644
--- a/docs/en/Blog-Posts/2020-04-03/Post.md
+++ b/docs/en/How-To/Customize-Login-Page-MVC.md
@@ -1,4 +1,4 @@
-# Custom Login PageModel in **ABP** ASP.NET Core MVC application
+# How to Customize the Login Page for MVC / Razor Page Applications
 
 ## Introduction
 
diff --git a/docs/en/Blog-Posts/2020-04-02/Post.md b/docs/en/How-To/Customize-SignIn-Manager.md
similarity index 98%
rename from docs/en/Blog-Posts/2020-04-02/Post.md
rename to docs/en/How-To/Customize-SignIn-Manager.md
index 7919d49032..8c9733a6af 100644
--- a/docs/en/Blog-Posts/2020-04-02/Post.md
+++ b/docs/en/How-To/Customize-SignIn-Manager.md
@@ -1,17 +1,13 @@
-# Custom SignIn Manager
+# Customize the SignInManager
 
 ## Introduction
 
 ABP Framework uses Microsoft Identity underneath hence supports customization as much as Microsoft Identity does.
 
-
-
 ## Sample Code
 
 https://github.com/abpframework/abp-samples/blob/master/aspnet-core/BookStore-AzureAD/src/Acme.BookStore.Web/CustomSignInManager.cs
 
-
-
 ## Creating CustomSignInManager
 
 To create your own custom SignIn Manager, you need to inherit `SignInManager<Volo.Abp.Identity.IdentityUser>`.
diff --git a/docs/en/How-To/Index.md b/docs/en/How-To/Index.md
new file mode 100644
index 0000000000..d6b31fa7ed
--- /dev/null
+++ b/docs/en/How-To/Index.md
@@ -0,0 +1,9 @@
+# "How To" Guides
+
+This section contains "how to" guides for some specific questions frequently asked. While some of them are common development tasks and not directly related to the ABP Framework, we think it is useful to have some concrete examples those directly work with your ABP based applications.
+
+## Authentication
+
+* [How to Customize the Login Page for MVC / Razor Page Applications](Customize-Login-Page-MVC.md)
+* [How to Use the Azure Active Directory Authentication for MVC / Razor Page Applications](Azure-Active-Directory-Authentication-MVC.md)
+* [Customize the SignInManager](Customize-SignIn-Manager.md) (as an example of customization)
\ No newline at end of file
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 4dcdaa6435..8034913c4c 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -75,6 +75,10 @@
             }
           ]
         },
+        {
+          "text": "\"How to\" Guides",
+          "path": "How-To/Index.md"
+        },
         {
           "text": "Migrating from the ASP.NET Boilerplate",
           "path": "AspNet-Boilerplate-Migration-Guide.md"

From b38c7ebc3cb2c66a1c07840fa4883184527014d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 4 Apr 2020 23:25:52 +0300
Subject: [PATCH 66/68] Revised the "How to Customize the Login Page for MVC /
 Razor Page Applications" guide.

---
 docs/en/How-To/Customize-Login-Page-MVC.md | 63 +++++++---------------
 1 file changed, 20 insertions(+), 43 deletions(-)

diff --git a/docs/en/How-To/Customize-Login-Page-MVC.md b/docs/en/How-To/Customize-Login-Page-MVC.md
index db237c932d..d4c69ddb9c 100644
--- a/docs/en/How-To/Customize-Login-Page-MVC.md
+++ b/docs/en/How-To/Customize-Login-Page-MVC.md
@@ -1,22 +1,14 @@
 # How to Customize the Login Page for MVC / Razor Page Applications
 
-## Introduction
+When you create a new application using the [application startup template](../Startup-Templates/Application.md), source code of the login page will not be inside your solution, so you can not directly change it. The login page comes from the [Account Module](../Modules/Account) that is used a [NuGet package](https://www.nuget.org/packages/Volo.Abp.Account.Web) reference.
 
-ABP Framework uses Microsoft Identity underneath hence supports customization as much as Microsoft Identity does.
+This document explains how to customize the login page for your own application.
 
+## Create a Login PageModel
 
+Create a new class inheriting from the [LoginModel](https://github.com/abpframework/abp/blob/037ef9abe024c03c1f89ab6c933710bcfe3f5c93/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs) of the Account module.
 
-## Sample Code
-
-https://github.com/abpframework/abp-samples/blob/master/aspnet-core/BookStore-AzureAD/src/Acme.BookStore.Web/Pages/CustomLoginModel.cs
-
-
-
-## Creating Login PageModel
-
-To create your own custom Login PageModel, you need to inherit [Abp LoginModel](https://github.com/abpframework/abp/blob/037ef9abe024c03c1f89ab6c933710bcfe3f5c93/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs).
-
-````xml
+````csharp
 public class CustomLoginModel : LoginModel
 {
     public CustomLoginModel(
@@ -28,46 +20,23 @@ public class CustomLoginModel : LoginModel
 }
 ````
 
+> Naming convention is important here. If your class name doesn't end with `LoginModel`, you need to manually replace the `LoginModel` using the [dependency injection](../Dependency-Injection.md) system.
 
+Then you can override any method you need and add new methods and properties needed by the UI.
 
-## Overriding Methods
-
-Afterwards you can override a method like `CreateExternalUserAsync`:
-
-````xml
-protected override async Task<Volo.Abp.Identity.IdentityUser> CreateExternalUserAsync(ExternalLoginInfo info)
-{
-    var emailAddress = info.Principal.FindFirstValue(AbpClaimTypes.Email);
-
-    var user = new IdentityUser(GuidGenerator.Create(), emailAddress, emailAddress, CurrentTenant.Id);
-
-    CheckIdentityErrors(await UserManager.CreateAsync(user));
-    CheckIdentityErrors(await UserManager.SetEmailAsync(user, emailAddress));
-    CheckIdentityErrors(await UserManager.AddLoginAsync(user, info));
-
-    return user;
-}
-````
-
-
-
-## Overriding Login Page UI
+## Overriding the Login Page UI
 
-Overriding `.cshtml` files can be easily done via [Virtual File System](https://docs.abp.io/en/abp/latest/Virtual-File-System). Create folder named **Account** under **Pages** directory. Create **Login.cshtml** under Pages/Account directory. 
+Create folder named **Account** under **Pages** directory and create a **Login.cshtml** under this folder. It will automatically override the `Login.cshtml` file defined in the Account Module thanks to the [Virtual File System](../Virtual-File-System.md).
 
-Set the model with your newly created Login Page Model and customize to your preferences like:
+A good way to customize a page is to copy its source code. [Click here](https://github.com/abpframework/abp/blob/dev/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml) for the source code of the login page. At the time this document has been written, the source code was like below:
 
 ````xml
 @page
 @using Volo.Abp.Account.Settings
 @using Volo.Abp.Settings
-@model Acme.BookStore.Web.CustomLoginModel
+@model Acme.BookStore.Web.Pages.Account.CustomLoginModel
 @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
 @inject Volo.Abp.Settings.ISettingProvider SettingProvider
-
-<div class="jumbotron">
-    <p>My Customized Login Page! </p>
-</div>
 @if (Model.EnableLocalLogin)
 {
     <div class="card mt-3 shadow-sm rounded">
@@ -133,4 +102,12 @@ Set the model with your newly created Login Page Model and customize to your pre
 }
 ````
 
-Further readings, [ASP.NET Core (MVC / Razor Pages) User Interface Customization Guide](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Customization-User-Interface#asp-net-core-mvc-razor-pages-user-interface-customization-guide).
\ No newline at end of file
+Just changed the `@model` to `Acme.BookStore.Web.Pages.Account.CustomLoginModel`  to use the customized `PageModel` class. You can change it however your application needs.
+
+## The Source Code
+
+You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/aspnet-core/BookStore-AzureAD).
+
+## See Also
+
+* [ASP.NET Core (MVC / Razor Pages) User Interface Customization Guide](../UI/AspNetCore/Customization-User-Interface).
\ No newline at end of file

From 41c159b3ab8948141d61bfbbf134ccbbc355f1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 4 Apr 2020 23:34:01 +0300
Subject: [PATCH 67/68] Update Customize-Login-Page-MVC.md

---
 docs/en/How-To/Customize-Login-Page-MVC.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/How-To/Customize-Login-Page-MVC.md b/docs/en/How-To/Customize-Login-Page-MVC.md
index d4c69ddb9c..49b4b4c39e 100644
--- a/docs/en/How-To/Customize-Login-Page-MVC.md
+++ b/docs/en/How-To/Customize-Login-Page-MVC.md
@@ -106,7 +106,7 @@ Just changed the `@model` to `Acme.BookStore.Web.Pages.Account.CustomLoginModel`
 
 ## The Source Code
 
-You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/aspnet-core/BookStore-AzureAD).
+You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/aspnet-core/Authentication-Customization).
 
 ## See Also
 

From eff8f583df4d179077a502c02a388a4e5ebc93e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 5 Apr 2020 14:47:19 +0300
Subject: [PATCH 68/68] Fix tui-editor script contributor.

---
 .../Packages/TuiEditor/TuiEditorScriptContributor.cs  | 11 ++++++++++-
 npm/packs/tui-editor/abp.resourcemapping.js           |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs
index 586bcd3db9..e788c612cf 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs
@@ -17,7 +17,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
             context.Files.AddIfNotContains("/libs/to-mark/to-mark.min.js");
-            context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.min.js");
+
+            if (context.FileProvider.GetFileInfo("/libs/tui-code-snippet/tui-code-snippet.min.js").Exists)
+            {
+                context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.min.js");
+            }
+            else
+            {
+                context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.js");
+            }
+
             context.Files.AddIfNotContains("/libs/squire-rte/squire.js");
             context.Files.AddIfNotContains("/libs/tui-editor/tui-editor-Editor.min.js");
         }
diff --git a/npm/packs/tui-editor/abp.resourcemapping.js b/npm/packs/tui-editor/abp.resourcemapping.js
index 9263853c1d..53a3e493f7 100644
--- a/npm/packs/tui-editor/abp.resourcemapping.js
+++ b/npm/packs/tui-editor/abp.resourcemapping.js
@@ -1,7 +1,7 @@
 module.exports = {
     mappings: {
         "@node_modules/to-mark/dist/to-mark.min.js": "@libs/to-mark/",
-        "@node_modules/tui-code-snippet/dist/tui-code-snippet.min.js": "@libs/tui-code-snippet/",
+        "@node_modules/tui-code-snippet/dist/*.*": "@libs/tui-code-snippet/",
         "@node_modules/squire-rte/build/squire.js": "@libs/squire-rte/",
         "@node_modules/tui-editor/dist/*.*": "@libs/tui-editor/"
     }