From 4eadee29c64e9e2b730444378ee9ee5dbeb220aa Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 23 Oct 2019 17:21:24 +0800
Subject: [PATCH 01/75] Added DataTimeValueConverters function.

Resolve #1983
---
 .../Abp/EntityFrameworkCore/AbpDbContext.cs   | 43 +++++++++++++++
 .../AbpDateTimeValueConverter.cs              | 17 ++++++
 .../AbpDateTimeValueConverter_Tests.cs        |  9 ++++
 .../Volo/Abp/TestApp/Domain/Person.cs         |  6 +++
 .../AbpDateTimeValueConverter_Tests.cs        | 53 +++++++++++++++++++
 5 files changed, 128 insertions(+)
 create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs
 create mode 100644 framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter_Tests.cs
 create mode 100644 framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 3d4b45d75d..9064ddc2ba 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -18,10 +18,12 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities.Events;
 using Volo.Abp.EntityFrameworkCore.EntityHistory;
+using Volo.Abp.EntityFrameworkCore.ValueConverters;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Reflection;
 using Volo.Abp.Threading;
+using Volo.Abp.Timing;
 
 namespace Volo.Abp.EntityFrameworkCore
 {
@@ -48,6 +50,8 @@ namespace Volo.Abp.EntityFrameworkCore
 
         public IAuditingManager AuditingManager { get; set; }
 
+        public IClock Clock { get; set; }
+
         public ILogger<AbpDbContext<TDbContext>> Logger { get; set; }
 
         private static readonly MethodInfo ConfigureBasePropertiesMethodInfo
@@ -57,6 +61,13 @@ namespace Volo.Abp.EntityFrameworkCore
                     BindingFlags.Instance | BindingFlags.NonPublic
                 );
 
+        private static readonly MethodInfo ConfigureValueConverterMethodInfo
+            = typeof(AbpDbContext<TDbContext>)
+                .GetMethod(
+                    nameof(ConfigureValueConverter),
+                    BindingFlags.Instance | BindingFlags.NonPublic
+                );
+
         protected AbpDbContext(DbContextOptions<TDbContext> options)
             : base(options)
         {
@@ -75,6 +86,10 @@ namespace Volo.Abp.EntityFrameworkCore
                 ConfigureBasePropertiesMethodInfo
                     .MakeGenericMethod(entityType.ClrType)
                     .Invoke(this, new object[] { modelBuilder, entityType });
+
+                ConfigureValueConverterMethodInfo
+                    .MakeGenericMethod(entityType.ClrType)
+                    .Invoke(this, new object[] { modelBuilder, entityType });
             }
         }
 
@@ -488,6 +503,34 @@ namespace Volo.Abp.EntityFrameworkCore
             }
         }
 
+        protected virtual void ConfigureValueConverter<TEntity>(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType)
+            where TEntity : class
+        {
+            if (mutableEntityType.BaseType == null &&
+                !typeof(TEntity).IsDefined(typeof(DisableDateTimeNormalizationAttribute), true) &&
+                !typeof(TEntity).IsDefined(typeof(OwnedAttribute), true) &&
+                !mutableEntityType.IsOwned())
+            {
+                var dateTimeValueConverter = new AbpDateTimeValueConverter(Clock);
+
+                var dateTimePropertyInfos = typeof(TEntity).GetProperties()
+                    .Where(property =>
+                        (property.PropertyType == typeof(DateTime) ||
+                         property.PropertyType == typeof(DateTime?)) &&
+                        property.CanWrite &&
+                        !property.IsDefined(typeof(DisableDateTimeNormalizationAttribute), true)
+                    ).ToList();
+
+                dateTimePropertyInfos.ForEach(property =>
+                {
+                    modelBuilder
+                        .Entity<TEntity>()
+                        .Property(property.Name)
+                        .HasConversion(dateTimeValueConverter);
+                });
+            }
+        }
+
         protected virtual bool ShouldFilterEntity<TEntity>(IMutableEntityType entityType) where TEntity : class
         {
             if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEntity)))
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs
new file mode 100644
index 0000000000..e3562c4134
--- /dev/null
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs
@@ -0,0 +1,17 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.Timing;
+
+namespace Volo.Abp.EntityFrameworkCore.ValueConverters
+{
+    public class AbpDateTimeValueConverter : ValueConverter<DateTime?, DateTime?>
+    {
+        public AbpDateTimeValueConverter(IClock clock, [CanBeNull] ConverterMappingHints mappingHints = null)
+            : base(
+                x => x.HasValue ? clock.Normalize(x.Value) : x,
+                x => x.HasValue ? clock.Normalize(x.Value) : x, mappingHints)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter_Tests.cs
new file mode 100644
index 0000000000..c2793b3b67
--- /dev/null
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter_Tests.cs
@@ -0,0 +1,9 @@
+using Volo.Abp.TestApp.Testing;
+
+namespace Volo.Abp.EntityFrameworkCore.ValueConverters
+{
+    public class AbpDateTimeValueConverter_Tests : AbpDateTimeValueConverter_Tests<AbpEntityFrameworkCoreTestModule>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs
index 3bbec118a2..9075740f11 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.ObjectModel;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Timing;
 
 namespace Volo.Abp.TestApp.Domain
 {
@@ -15,6 +16,11 @@ namespace Volo.Abp.TestApp.Domain
 
         public virtual int Age { get; set; }
 
+        public virtual DateTime? Birthday { get; set; }
+
+        [DisableDateTimeNormalization]
+        public virtual DateTime? LastActive { get; set; }
+
         public virtual Collection<Phone> Phones { get; set; }
 
         private Person()
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
new file mode 100644
index 0000000000..cbeef807cb
--- /dev/null
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Modularity;
+using Volo.Abp.TestApp.Domain;
+using Volo.Abp.Timing;
+using Xunit;
+
+namespace Volo.Abp.TestApp.Testing
+{
+    public abstract class AbpDateTimeValueConverter_Tests<TStartupModule> : TestAppTestBase<TStartupModule>
+        where TStartupModule : IAbpModule
+    {
+        private readonly IBasicRepository<Person, Guid> _personRepository;
+
+        protected AbpDateTimeValueConverter_Tests()
+        {
+            _personRepository = GetRequiredService<IBasicRepository<Person, Guid>>();
+        }
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            services.Configure<AbpClockOptions>(options => options.Kind = DateTimeKind.Utc);
+        }
+
+        [Fact]
+        public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_Test()
+        {
+            var personId = Guid.Parse("4125582e-d100-4c27-aa84-e4de85830dca");
+            await _personRepository.InsertAsync(new Person(personId, "bob lee", 18)
+            {
+                Birthday = DateTime.Parse("2020-01-01 00:00:00"),
+                LastActive = DateTime.Parse("2020-01-01 00:00:00"),
+            }, true);
+
+            var person = await _personRepository.GetAsync(personId);
+
+            person.ShouldNotBeNull();
+            person.CreationTime.Kind.ShouldBe(DateTimeKind.Utc);
+
+            person.Birthday.ShouldNotBeNull();
+            person.Birthday.Value.Kind.ShouldBe(DateTimeKind.Utc);
+            person.Birthday.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00");
+
+            //LastActive DisableDateTimeNormalization
+            person.LastActive.ShouldNotBeNull();
+            person.LastActive.Value.Kind.ShouldBe(DateTimeKind.Unspecified);
+            person.LastActive.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00");
+        }
+    }
+}
\ No newline at end of file

From a898b4abe8135812aea6069c2f32fb33baf182c3 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 23 Oct 2019 18:09:49 +0800
Subject: [PATCH 02/75] Handling Clock in AbpDbContext may be null.

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 9064ddc2ba..aa91755f5d 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
@@ -511,6 +511,11 @@ namespace Volo.Abp.EntityFrameworkCore
                 !typeof(TEntity).IsDefined(typeof(OwnedAttribute), true) &&
                 !mutableEntityType.IsOwned())
             {
+                if (Clock == null)
+                {
+                    return;
+                }
+
                 var dateTimeValueConverter = new AbpDateTimeValueConverter(Clock);
 
                 var dateTimePropertyInfos = typeof(TEntity).GetProperties()

From 91ba0f2594c83d00e2a8c35aea82579ed862f570 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 23 Oct 2019 20:50:26 +0800
Subject: [PATCH 03/75] Configuring AbpClockOptions in
 AbpEntityFrameworkCoreTestModule.

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs            | 2 +-
 .../EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs | 6 +++++-
 .../Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs  | 5 -----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index aa91755f5d..b42a2cfc66 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -511,7 +511,7 @@ namespace Volo.Abp.EntityFrameworkCore
                 !typeof(TEntity).IsDefined(typeof(OwnedAttribute), true) &&
                 !mutableEntityType.IsOwned())
             {
-                if (Clock == null)
+                if (Clock == null || !Clock.SupportsMultipleTimezone)
                 {
                     return;
                 }
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
index b1b92ab5b2..85eb1119d5 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
@@ -1,4 +1,5 @@
-using Microsoft.Data.Sqlite;
+using System;
+using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -10,6 +11,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.TestApp;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.TestApp.EntityFrameworkCore;
+using Volo.Abp.Timing;
 
 namespace Volo.Abp.EntityFrameworkCore
 {
@@ -41,6 +43,8 @@ namespace Volo.Abp.EntityFrameworkCore
                     abpDbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection);
                 });
             });
+
+            Configure<AbpClockOptions>(options => options.Kind = DateTimeKind.Utc);
         }
 
         public override void OnPreApplicationInitialization(ApplicationInitializationContext context)
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
index cbeef807cb..6b0caaa7b6 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
@@ -20,11 +20,6 @@ namespace Volo.Abp.TestApp.Testing
             _personRepository = GetRequiredService<IBasicRepository<Person, Guid>>();
         }
 
-        protected override void AfterAddApplication(IServiceCollection services)
-        {
-            services.Configure<AbpClockOptions>(options => options.Kind = DateTimeKind.Utc);
-        }
-
         [Fact]
         public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_Test()
         {

From 7d39a35a1bd1495ad7fb5658c61505dee2821938 Mon Sep 17 00:00:00 2001
From: Super <gdlcf88@outlook.com>
Date: Thu, 7 Nov 2019 18:31:42 +0800
Subject: [PATCH 04/75] Add missing DataTables options for tenant-management
 module.

---
 .../Pages/TenantManagement/Tenants/Index.js                    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
index 18d0cceafc..581a71b774 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
@@ -17,6 +17,9 @@
 
         var _dataTable = _$wrapper.find('table').DataTable(abp.libs.datatables.normalizeConfiguration({
             order: [[1, "asc"]],
+            processing: true,
+            paging: true,
+            serverSide: true,
             ajax: abp.libs.datatables.createAjax(_tenantAppService.getList),
             columnDefs: [
                 {

From 1569ebcd1a5d5fcbbfb82d4ebf364cac30c3299d Mon Sep 17 00:00:00 2001
From: bartvanhoey <bartvanhoey@hotmail.com>
Date: Sat, 9 Nov 2019 08:41:31 +0100
Subject: [PATCH 05/75] 
 datepicker-requirements-right-below-date-picker-implementation

---
 docs/en/Tutorials/Angular/Part-II.md | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/docs/en/Tutorials/Angular/Part-II.md b/docs/en/Tutorials/Angular/Part-II.md
index ed6afcb947..07ae82e778 100644
--- a/docs/en/Tutorials/Angular/Part-II.md
+++ b/docs/en/Tutorials/Angular/Part-II.md
@@ -218,25 +218,6 @@ Open `book-list.component.html` and add the form in the body template of the mod
 
 > We've used [NgBootstrap datepicker](https://ng-bootstrap.github.io/#/components/datepicker/overview) in this component.
 
-Open the `book-list.component.ts` and then create an array, named `bookTypeArr`:
-
-```js
-//...
-form: FormGroup;
-
-bookTypeArr = Object.keys(Books.BookType).filter(
-    bookType => typeof this.booksType[bookType] === 'number'
-);
-```
-
-The `bookTypeArr` contains the fields of the `BookType` enum. Resulting array is shown below:
-
-```js
-['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...]
-```
-
-This array was used in the previous form template (in the `ngFor` loop).
-
 #### Datepicker Requirements
 
 You need to import `NgbDatepickerModule` to the `books.module.ts`:
@@ -268,6 +249,27 @@ export class BookListComponent implements OnInit {
 
 > The `NgbDateAdapter` converts Datepicker value to `Date` type. See the [datepicker adapters](https://ng-bootstrap.github.io/#/components/datepicker/overview) for more details.
 
+
+Open the `book-list.component.ts` and then create an array, named `bookTypeArr`:
+
+```js
+//...
+form: FormGroup;
+
+bookTypeArr = Object.keys(Books.BookType).filter(
+    bookType => typeof this.booksType[bookType] === 'number'
+);
+```
+
+The `bookTypeArr` contains the fields of the `BookType` enum. Resulting array is shown below:
+
+```js
+['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...]
+```
+
+This array was used in the previous form template (in the `ngFor` loop).
+
+
 ![new-book-form](images/bookstore-new-book-form.png)
 
 #### Saving the Book

From b4940f135cf6cb122b12267f0a693b11807865d0 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Sun, 10 Nov 2019 14:28:06 +0800
Subject: [PATCH 06/75] Added Keyless Entity Types unit test.

https://docs.microsoft.com/en-us/ef/core/modeling/keyless-entity-types
---
 .../AbpEntityFrameworkCoreTestModule.cs       |  3 ++
 .../EntityFrameworkCore/PersonRepository.cs   | 24 +++++++++++++++
 .../EntityFrameworkCore/TestAppDbContext.cs   |  9 ++++++
 .../Abp/TestApp/Domain/IPersonRepository.cs   | 13 +++++++++
 .../Volo/Abp/TestApp/Domain/PersonView.cs     | 19 ++++++++++++
 .../AbpDateTimeValueConverter_Tests.cs        | 29 +++++++++++++++++--
 6 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs
 create mode 100644 framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs
 create mode 100644 framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs

diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
index 85eb1119d5..8925c2bff3 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
@@ -60,6 +60,9 @@ namespace Volo.Abp.EntityFrameworkCore
             using (var context = new TestMigrationsDbContext(new DbContextOptionsBuilder<TestMigrationsDbContext>().UseSqlite(connection).Options))
             {
                 context.GetService<IRelationalDatabaseCreator>().CreateTables();
+                context.Database.ExecuteSqlRaw(
+                    @"CREATE VIEW View_PersonView AS 
+                      SELECT Id, Name, CreationTime, Birthday, LastActive FROM People");
             }
             
             return connection;
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs
new file mode 100644
index 0000000000..e42d88c2b8
--- /dev/null
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.TestApp.Domain;
+
+namespace Volo.Abp.TestApp.EntityFrameworkCore
+{
+    public class PersonRepository : EfCoreRepository<TestAppDbContext, Person, Guid>, IPersonRepository
+    {
+        public PersonRepository(IDbContextProvider<TestAppDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public async Task<PersonView> GetViewAsync(Guid id)
+        {
+            return await DbContext.PersonView.Where(x => x.Id == id).FirstOrDefaultAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
index bfcecdeb65..5e243b9a03 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
@@ -11,6 +11,8 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
 
         public DbSet<City> Cities { get; set; }
 
+        public DbSet<PersonView> PersonView { get; set; }
+
         public DbSet<ThirdDbContextDummyEntity> DummyEntities { get; set; }
 
         public DbSet<EntityWithIntPk> EntityWithIntPks { get; set; }
@@ -29,6 +31,13 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
             {
                 b.HasKey(p => new {p.PersonId, p.Number});
             });
+
+            modelBuilder
+                .Entity<PersonView>(p =>
+                {
+                    p.HasNoKey();
+                    p.ToView("View_PersonView");
+                });
         }
     }
 }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs
new file mode 100644
index 0000000000..ac094de826
--- /dev/null
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace Volo.Abp.TestApp.Domain
+{
+    public interface IPersonRepository : IBasicRepository<Person, Guid>
+    {
+        Task<PersonView> GetViewAsync(Guid id);
+    }
+}
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs
new file mode 100644
index 0000000000..72249fa541
--- /dev/null
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs
@@ -0,0 +1,19 @@
+using System;
+using Volo.Abp.Timing;
+
+namespace Volo.Abp.TestApp.Domain
+{
+    public class PersonView
+    {
+        public Guid Id { get; set; }
+
+        public string Name { get; set; }
+
+        public DateTime CreationTime { get; set; }
+
+        public DateTime? Birthday { get; set; }
+
+        [DisableDateTimeNormalization]
+        public DateTime? LastActive { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
index 6b0caaa7b6..bf95982daa 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
@@ -13,11 +13,11 @@ namespace Volo.Abp.TestApp.Testing
     public abstract class AbpDateTimeValueConverter_Tests<TStartupModule> : TestAppTestBase<TStartupModule>
         where TStartupModule : IAbpModule
     {
-        private readonly IBasicRepository<Person, Guid> _personRepository;
+        private readonly IPersonRepository _personRepository;
 
         protected AbpDateTimeValueConverter_Tests()
         {
-            _personRepository = GetRequiredService<IBasicRepository<Person, Guid>>();
+            _personRepository = GetRequiredService<IPersonRepository>();
         }
 
         [Fact]
@@ -44,5 +44,30 @@ namespace Volo.Abp.TestApp.Testing
             person.LastActive.Value.Kind.ShouldBe(DateTimeKind.Unspecified);
             person.LastActive.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00");
         }
+
+        [Fact]
+        public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_View_Test()
+        {
+            var personId = Guid.Parse("7a942bca-c911-4473-93aa-2daf88e18fb9");
+            await _personRepository.InsertAsync(new Person(personId, "bob lee", 18)
+            {
+                Birthday = DateTime.Parse("2020-01-01 00:00:00"),
+                LastActive = DateTime.Parse("2020-01-01 00:00:00"),
+            }, true);
+
+            var person = await _personRepository.GetViewAsync(personId);
+
+            person.ShouldNotBeNull();
+            person.CreationTime.Kind.ShouldBe(DateTimeKind.Utc);
+
+            person.Birthday.ShouldNotBeNull();
+            person.Birthday.Value.Kind.ShouldBe(DateTimeKind.Utc);
+            person.Birthday.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00");
+
+            //LastActive DisableDateTimeNormalization
+            person.LastActive.ShouldNotBeNull();
+            person.LastActive.Value.Kind.ShouldBe(DateTimeKind.Unspecified);
+            person.LastActive.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00");
+        }
     }
 }
\ No newline at end of file

From 6944da4a8200b6f6b26a7601f9569d2a28eba677 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Sun, 10 Nov 2019 14:38:52 +0800
Subject: [PATCH 07/75] Remove the id property from the view.

---
 .../EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs | 2 +-
 .../Abp/TestApp/EntityFrameworkCore/PersonRepository.cs     | 4 ++--
 .../Volo/Abp/TestApp/Domain/IPersonRepository.cs            | 2 +-
 .../Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs  | 2 --
 .../Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs  | 6 +++---
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
index 8925c2bff3..71522d0216 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
@@ -62,7 +62,7 @@ namespace Volo.Abp.EntityFrameworkCore
                 context.GetService<IRelationalDatabaseCreator>().CreateTables();
                 context.Database.ExecuteSqlRaw(
                     @"CREATE VIEW View_PersonView AS 
-                      SELECT Id, Name, CreationTime, Birthday, LastActive FROM People");
+                      SELECT Name, CreationTime, Birthday, LastActive FROM People");
             }
             
             return connection;
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs
index e42d88c2b8..ab8c1920a7 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs
@@ -16,9 +16,9 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
         {
         }
 
-        public async Task<PersonView> GetViewAsync(Guid id)
+        public async Task<PersonView> GetViewAsync(string name)
         {
-            return await DbContext.PersonView.Where(x => x.Id == id).FirstOrDefaultAsync();
+            return await DbContext.PersonView.Where(x => x.Name == name).FirstOrDefaultAsync();
         }
     }
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs
index ac094de826..9058522346 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs
@@ -8,6 +8,6 @@ namespace Volo.Abp.TestApp.Domain
 {
     public interface IPersonRepository : IBasicRepository<Person, Guid>
     {
-        Task<PersonView> GetViewAsync(Guid id);
+        Task<PersonView> GetViewAsync(string name);
     }
 }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs
index 72249fa541..e77827c263 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs
@@ -5,8 +5,6 @@ namespace Volo.Abp.TestApp.Domain
 {
     public class PersonView
     {
-        public Guid Id { get; set; }
-
         public string Name { get; set; }
 
         public DateTime CreationTime { get; set; }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
index bf95982daa..e36225e53c 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
@@ -48,14 +48,14 @@ namespace Volo.Abp.TestApp.Testing
         [Fact]
         public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_View_Test()
         {
-            var personId = Guid.Parse("7a942bca-c911-4473-93aa-2daf88e18fb9");
-            await _personRepository.InsertAsync(new Person(personId, "bob lee", 18)
+            var personName = "bob lee";
+            await _personRepository.InsertAsync(new Person(Guid.NewGuid(), personName, 18)
             {
                 Birthday = DateTime.Parse("2020-01-01 00:00:00"),
                 LastActive = DateTime.Parse("2020-01-01 00:00:00"),
             }, true);
 
-            var person = await _personRepository.GetViewAsync(personId);
+            var person = await _personRepository.GetViewAsync(personName);
 
             person.ShouldNotBeNull();
             person.CreationTime.Kind.ShouldBe(DateTimeKind.Utc);

From 357be9a8e348796c55753bb1fad68fdd1d0acd23 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 12 Nov 2019 17:51:54 +0800
Subject: [PATCH 08/75] Implement AbpDateTimeModelBinderProvider &
 AbpDateTimeModelBinder

Resolve #2143
---
 .../AspNetCore/Mvc/AbpMvcOptionsExtensions.cs |   3 +-
 .../ModelBinding/AbpDateTimeModelBinder.cs    |  49 +++++++++
 .../AbpDateTimeModelBinderProvider.cs         |  47 ++++++++
 .../ModelBinding/ModelBindingController.cs    |  61 +++++++++++
 .../ModelBindingController_Tests.cs           | 100 ++++++++++++++++++
 5 files changed, 259 insertions(+), 1 deletion(-)
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs
 create mode 100644 framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs
 create mode 100644 framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs
index 59c7de8840..a633edb37e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs
@@ -4,6 +4,7 @@ using Volo.Abp.AspNetCore.Mvc.Auditing;
 using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Mvc.Features;
+using Volo.Abp.AspNetCore.Mvc.ModelBinding;
 using Volo.Abp.AspNetCore.Mvc.Uow;
 using Volo.Abp.AspNetCore.Mvc.Validation;
 
@@ -35,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc
 
         private static void AddModelBinders(MvcOptions options)
         {
-            //options.ModelBinderProviders.Add(new AbpDateTimeModelBinderProvider());
+            options.ModelBinderProviders.Insert(0, new AbpDateTimeModelBinderProvider());
         }
 
         private static void AddMetadataProviders(MvcOptions options, IServiceCollection services)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs
new file mode 100644
index 0000000000..1916b9aa16
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.Timing;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    public class AbpDateTimeModelBinder : IModelBinder
+    {
+        private readonly Type _type;
+        private readonly SimpleTypeModelBinder _simpleTypeModelBinder;
+        private readonly IClock _clock;
+
+        public AbpDateTimeModelBinder(ModelBinderProviderContext context)
+        {
+            _type = context.Metadata.ModelType;
+            _clock = context.Services.GetRequiredService<IClock>();
+            _simpleTypeModelBinder = new SimpleTypeModelBinder(context.Metadata.ModelType,
+                context.Services.GetRequiredService<ILoggerFactory>());
+        }
+
+        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            await _simpleTypeModelBinder.BindModelAsync(bindingContext);
+
+            if (!bindingContext.Result.IsModelSet)
+            {
+                return;
+            }
+
+            if (_type == typeof(DateTime))
+            {
+                var dateTime = (DateTime) bindingContext.Result.Model;
+                bindingContext.Result = ModelBindingResult.Success(_clock.Normalize(dateTime));
+            }
+            else
+            {
+                var dateTime = (DateTime?) bindingContext.Result.Model;
+                if (dateTime != null)
+                {
+                    bindingContext.Result = ModelBindingResult.Success(_clock.Normalize(dateTime.Value));
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs
new file mode 100644
index 0000000000..fd55e2b61a
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Volo.Abp.Timing;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    public class AbpDateTimeModelBinderProvider : IModelBinderProvider
+    {
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context.Metadata.ModelType != typeof(DateTime) &&
+                context.Metadata.ModelType != typeof(DateTime?))
+            {
+                return null;
+            }
+
+            if (context.Metadata.ContainerType == null)
+            {
+                if (context.Metadata is DefaultModelMetadata defaultModelMetadata &&
+                    defaultModelMetadata.Attributes.Attributes.All(x => x.GetType() != typeof(DisableDateTimeNormalizationAttribute)))
+                {
+                    return new AbpDateTimeModelBinder(context);
+                }
+            }
+            else
+            {
+                var dateNormalizationDisabledForClass =
+                    context.Metadata.ContainerType.IsDefined(typeof(DisableDateTimeNormalizationAttribute), true);
+
+                var dateNormalizationDisabledForProperty = context.Metadata.ContainerType
+                    .GetProperty(context.Metadata.PropertyName)
+                    ?.IsDefined(typeof(DisableDateTimeNormalizationAttribute), true);
+
+                if (!dateNormalizationDisabledForClass &&
+                    dateNormalizationDisabledForProperty != null &&
+                    !dateNormalizationDisabledForProperty.Value)
+                {
+                    return new AbpDateTimeModelBinder(context);
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs
new file mode 100644
index 0000000000..2c5a69e7e7
--- /dev/null
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs
@@ -0,0 +1,61 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Timing;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    [Route("api/model-Binding-test")]
+    public class ModelBindingController : AbpController
+    {
+        [HttpGet("DateTimeKind")]
+        public string DateTimeKind(DateTime input)
+        {
+            return input.Kind.ToString().ToLower();
+        }
+
+        [HttpGet("NullableDateTimeKind")]
+        public string NullableDateTimeKind(DateTime? input)
+        {
+            return input.Value.Kind.ToString().ToLower();
+        }
+
+        [HttpGet("DisableDateTimeNormalizationDateTimeKind")]
+        public string DisableDateTimeNormalizationDateTimeKind([DisableDateTimeNormalization]DateTime input)
+        {
+            return input.Kind.ToString().ToLower();
+        }
+
+        [HttpGet("DisableDateTimeNormalizationNullableDateTimeKind")]
+        public string DisableDateTimeNormalizationNullableDateTimeKind([DisableDateTimeNormalization]DateTime? input)
+        {
+            return input.Value.Kind.ToString().ToLower();
+        }
+
+        [HttpGet("ComplexTypeDateTimeKind")]
+        public string ComplexTypeDateTimeKind(GetDateTimeKindModel input)
+        {
+            return input.Time1.Kind.ToString().ToLower() + "_" +
+                   input.Time2.Kind.ToString().ToLower() + "_" +
+                   input.Time3.Value.Kind.ToString().ToLower() + "_" +
+                   input.InnerModel.Time4.Kind.ToString().ToLower();
+        }
+    }
+
+    public class GetDateTimeKindModel
+    {
+        [DisableDateTimeNormalization]
+        public DateTime Time1 { get; set; }
+
+        public DateTime Time2 { get; set; }
+
+        public DateTime? Time3 { get; set; }
+
+        public GetDateTimeKindInnerModel InnerModel { get; set; }
+
+        [DisableDateTimeNormalization]
+        public class GetDateTimeKindInnerModel
+        {
+            public DateTime Time4 { get; set; }
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs
new file mode 100644
index 0000000000..632a02194f
--- /dev/null
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Shouldly;
+using Volo.Abp.Timing;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    public abstract class ModelBindingController_Tests : AspNetCoreMvcTestBase
+    {
+        protected DateTimeKind DateTimeKind { get; set; }
+
+        protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+        {
+            services.Configure<AbpClockOptions>(x => x.Kind = DateTimeKind);
+        }
+
+        [Fact]
+        public async Task DateTimeKind_Test()
+        {
+            var response = await Client.GetAsync("/api/model-Binding-test/DateTimeKind?input=2010-01-01T00:00:00Z");
+
+            response.StatusCode.ShouldBe(HttpStatusCode.OK);
+            var resultAsString = await response.Content.ReadAsStringAsync();
+            resultAsString.ShouldBe(DateTimeKind.ToString().ToLower());
+        }
+
+        [Fact]
+        public async Task NullableDateTimeKind_Test()
+        {
+            var response =
+                await Client.GetAsync("/api/model-Binding-test/NullableDateTimeKind?input=2010-01-01T00:00:00Z");
+
+            response.StatusCode.ShouldBe(HttpStatusCode.OK);
+            var resultAsString = await response.Content.ReadAsStringAsync();
+            resultAsString.ShouldBe(DateTimeKind.ToString().ToLower());
+        }
+
+        [Fact]
+        public async Task DisableDateTimeNormalizationDateTimeKind_Test()
+        {
+            var response =
+                await Client.GetAsync(
+                    "/api/model-Binding-test/DisableDateTimeNormalizationDateTimeKind?input=2010-01-01T00:00:00Z");
+
+            response.StatusCode.ShouldBe(HttpStatusCode.OK);
+            var resultAsString = await response.Content.ReadAsStringAsync();
+            //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local.
+            resultAsString.ShouldBe(DateTimeKind.Local.ToString().ToLower());
+        }
+
+        [Fact]
+        public async Task DisableDateTimeNormalizationNullableDateTimeKind_Test()
+        {
+            var response =
+                await Client.GetAsync(
+                    "/api/model-Binding-test/DisableDateTimeNormalizationNullableDateTimeKind?input=2010-01-01T00:00:00Z");
+
+            response.StatusCode.ShouldBe(HttpStatusCode.OK);
+            var resultAsString = await response.Content.ReadAsStringAsync();
+            //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local.
+            resultAsString.ShouldBe(DateTimeKind.Local.ToString().ToLower());
+        }
+
+        [Fact]
+        public async Task ComplexTypeDateTimeKind_Test()
+        {
+            var response = await Client.GetAsync("/api/model-Binding-test/ComplexTypeDateTimeKind?" +
+                                                 "Time1=2010-01-01T00:00:00Z&" +
+                                                 "Time2=2010-01-01T00:00:00Z&" +
+                                                 "Time3=2010-01-01T00:00:00Z&" +
+                                                 "InnerModel.Time4=2010-01-01T00:00:00Z");
+
+            response.StatusCode.ShouldBe(HttpStatusCode.OK);
+            var resultAsString = await response.Content.ReadAsStringAsync();
+            //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local.
+            resultAsString.ShouldBe(
+                $"local_{DateTimeKind.ToString().ToLower()}_{DateTimeKind.ToString().ToLower()}_local");
+        }
+    }
+
+    public class ModelBindingController_Utc_Tests : ModelBindingController_Tests
+    {
+        public ModelBindingController_Utc_Tests()
+        {
+            DateTimeKind = DateTimeKind.Utc;
+        }
+    }
+
+    public class ModelBindingController_Local_Tests : ModelBindingController_Tests
+    {
+        public ModelBindingController_Local_Tests()
+        {
+            DateTimeKind = DateTimeKind.Local;
+        }
+    }
+}
\ No newline at end of file

From af68bc2110c9adfb7a932fd5215df6dc361996ea Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 15 Nov 2019 14:30:19 +0800
Subject: [PATCH 09/75] Implement external login only.

---
 .../Account/IdentityServerSupportedLoginModel.cs      | 11 ++++++-----
 .../Areas/Account/Controllers/LogoutController.cs     |  7 ++++++-
 .../Pages/Account/Login.cshtml.cs                     |  4 +++-
 3 files changed, 15 insertions(+), 7 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 b6902e86d8..0714d5b323 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
@@ -1,4 +1,4 @@
-using IdentityModel;
+using IdentityModel;
 using IdentityServer4.Events;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
@@ -40,7 +40,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             IdentityServerEvents = identityServerEvents;
         }
 
-        public override async Task OnGetAsync()
+        public override async Task<IActionResult> OnGetAsync()
         {
             LoginInput = new LoginInputModel();
 
@@ -63,7 +63,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             {
                 LoginInput.UserNameOrEmailAddress = context.LoginHint;
                 ExternalProviders = new[] { new ExternalProviderModel { AuthenticationScheme = context.IdP } };
-                return;
+                return Page();
             }
 
             var schemes = await _schemeProvider.GetAllSchemesAsync();
@@ -96,9 +96,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             if (IsExternalLoginOnly)
             {
-                //return await ExternalLogin(vm.ExternalLoginScheme, returnUrl);
-                throw new NotImplementedException();
+                return await base.OnPostExternalLogin(providers.First().AuthenticationScheme);
             }
+
+            return Page();
         }
 
         [UnitOfWork] //TODO: Will be removed when we implement action filter
diff --git a/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs b/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs
index 1f1b43b853..eb7d1cbc84 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs
@@ -17,10 +17,15 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
         }
 
         //todo@alper: this method can be moved to AccountController like "account/logout"
-        public async Task<IActionResult> Index()
+        public async Task<IActionResult> Index(string returnUrl = null)
         {
             await _signInManager.SignOutAsync();
 
+            if (returnUrl != null)
+            {
+                return LocalRedirect(returnUrl);
+            }
+
             return RedirectToPage("/Account/Login");
         }
     }
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 cc82de414f..74691dba33 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
@@ -56,7 +56,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             _accountOptions = accountOptions.Value;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             LoginInput = new LoginInputModel();
 
@@ -80,6 +80,8 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 //return await ExternalLogin(vm.ExternalLoginScheme, returnUrl);
                 throw new NotImplementedException();
             }
+
+            return Page();
         }
 
         [UnitOfWork] //TODO: Will be removed when we implement action filter

From 7e0fd93bebad4976070b5c8fa8e31645f8750e54 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 15 Nov 2019 15:04:03 +0800
Subject: [PATCH 10/75] Add Abp.Account.EnableLocalLogin setting.

---
 .../Pages/Account/IdentityServerSupportedLoginModel.cs    | 6 ++++--
 .../Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs    | 8 +++++---
 .../Settings/AccountSettingDefinitionProvider.cs          | 4 ++++
 .../Volo.Abp.Account.Web/Settings/AccountSettingNames.cs  | 2 ++
 4 files changed, 15 insertions(+), 5 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 0714d5b323..f1abf44750 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
@@ -12,8 +12,10 @@ using System.Linq;
 using System.Security.Claims;
 using System.Security.Principal;
 using System.Threading.Tasks;
+using Volo.Abp.Account.Web.Settings;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Settings;
 using Volo.Abp.Uow;
 
 namespace Volo.Abp.Account.Web.Pages.Account
@@ -77,7 +79,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 })
                 .ToList();
 
-            EnableLocalLogin = true; //TODO: We can get default from a setting?
+            EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
             if (context?.ClientId != null)
             {
                 var client = await ClientStore.FindEnabledClientByIdAsync(context.ClientId);
@@ -105,7 +107,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
         [UnitOfWork] //TODO: Will be removed when we implement action filter
         public override async Task<IActionResult> OnPostAsync(string action)
         {
-            EnableLocalLogin = true; //TODO: We can get default from a setting?
+            EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
 
             if (action == "Cancel")
             {
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 74691dba33..e7e625416a 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
@@ -10,8 +10,10 @@ using System.Diagnostics;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Volo.Abp.Account.Web.Settings;
 using Volo.Abp.Identity;
 using Volo.Abp.Security.Claims;
+using Volo.Abp.Settings;
 using Volo.Abp.Uow;
 using Volo.Abp.Validation;
 using IdentityUser = Volo.Abp.Identity.IdentityUser;
@@ -71,8 +73,8 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 })
                 .ToList();
 
-            EnableLocalLogin = true; //TODO: We can get default from a setting?
-            
+            EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
+
             ExternalProviders = providers.ToArray();
 
             if (IsExternalLoginOnly)
@@ -87,7 +89,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
         [UnitOfWork] //TODO: Will be removed when we implement action filter
         public virtual async Task<IActionResult> OnPostAsync(string action)
         {
-            EnableLocalLogin = true; //TODO: We can get default from a setting?
+            EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
 
             ValidateModel();
 
diff --git a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs
index 8d3ccba7c9..be16fa7045 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs
@@ -9,6 +9,10 @@ namespace Volo.Abp.Account.Web.Settings
             context.Add(
                 new SettingDefinition(AccountSettingNames.IsSelfRegistrationEnabled, "true")
             );
+
+            context.Add(
+                new SettingDefinition(AccountSettingNames.EnableLocalLogin, "true")
+            );
         }
     }
 }
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs
index 3122dbdc6a..a167be0ce8 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs
@@ -3,5 +3,7 @@
     public class AccountSettingNames
     {
         public const string IsSelfRegistrationEnabled = "Abp.Account.IsSelfRegistrationEnabled";
+
+        public const string EnableLocalLogin = "Abp.Account.EnableLocalLogin";
     }
 }

From cfd2845a9e8c0895c64031cd09915e6e7ac60c2c Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 18 Nov 2019 17:59:04 +0800
Subject: [PATCH 11/75] Hide language switch menu if the app has only one
 language.

Resolve #2204
---
 .../Toolbar/LanguageSwitch/Default.cshtml     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml
index fe6e8c36fd..ae3255abbf 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml
@@ -1,14 +1,18 @@
-@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.LanguageSwitch
+@using System.Linq
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.LanguageSwitch
 @model LanguageSwitchViewComponentModel
-<div class="dropdown">
-    <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        @Model.CurrentLanguage.DisplayName
-    </a>
+@if (Model.OtherLanguages.Any())
+{
+    <div class="dropdown">
+        <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            @Model.CurrentLanguage.DisplayName
+        </a>
 
-    <div class="dropdown-menu dropdown-menu-right border-0 shadow-sm" aria-labelledby="dropdownMenuLink">
-        @foreach (var language in Model.OtherLanguages)
-        {
-            <a class="dropdown-item" href="/Abp/Languages/Switch?culture=@(language.CultureName)&uiCulture=@(language.UiCultureName)&returnUrl=@Context.Request.Path">@language.DisplayName</a>
-        }
-    </div>
-</div>
\ No newline at end of file
+        <div class="dropdown-menu dropdown-menu-right border-0 shadow-sm" aria-labelledby="dropdownMenuLink">
+            @foreach (var language in Model.OtherLanguages)
+            {
+                <a class="dropdown-item" href="/Abp/Languages/Switch?culture=@(language.CultureName)&uiCulture=@(language.UiCultureName)&returnUrl=@Context.Request.Path">@language.DisplayName</a>
+            }
+        </div>
+    </div> 
+}

From 0fa2cbafe3c32a72e46323839655fe6d16e792ba Mon Sep 17 00:00:00 2001
From: brittos <crystalcvo@gmail.com>
Date: Mon, 18 Nov 2019 15:58:01 -0300
Subject: [PATCH 12/75] Create dotnetcore.yml

---
 .github/workflows/dotnetcore.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/dotnetcore.yml

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
new file mode 100644
index 0000000000..0f9d2a6777
--- /dev/null
+++ b/.github/workflows/dotnetcore.yml
@@ -0,0 +1,17 @@
+name: .NET Core
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.2.108
+    - name: Build with dotnet
+      run: dotnet build --configuration Release

From a80fd3abbc69ab428dada46a8e989a3faf8f96ab Mon Sep 17 00:00:00 2001
From: brittos <crystalcvo@gmail.com>
Date: Mon, 18 Nov 2019 16:01:31 -0300
Subject: [PATCH 13/75] Delete dotnetcore.yml

---
 .github/workflows/dotnetcore.yml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .github/workflows/dotnetcore.yml

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
deleted file mode 100644
index 0f9d2a6777..0000000000
--- a/.github/workflows/dotnetcore.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: .NET Core
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.2.108
-    - name: Build with dotnet
-      run: dotnet build --configuration Release

From fbf09340a049c295523a5afe34b00386713f77f6 Mon Sep 17 00:00:00 2001
From: brittos <crystalcvo@gmail.com>
Date: Mon, 18 Nov 2019 16:34:34 -0300
Subject: [PATCH 14/75] Update pt-BR.json

fix localization
---
 .../AbpIoLocalization/Www/Localization/Resources/pt-BR.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json
index a01d460e01..c34a08f7ed 100644
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json
@@ -18,10 +18,10 @@
     "AbpShortDescription": "ABP é uma arquitetura completa e uma forte infraestrutura para criar aplicativos da web modernos! Segue as melhores práticas e convenções para fornecer uma sólida experiência de desenvolvimento.",
     "SourceCodeUpper": "CÓDIGO FONTE",
     "LatestReleaseLogs": "Últimos registros de lançamento",
-    "Infrastructure": "Infra-estrutura",
+    "Infrastructure": "Infraestrutura",
     "Architecture": "Arquitetura",
     "Modular": "Modular",
-    "DontRepeatYourself": "Não se repita",
+    "DontRepeatYourself": "Não repita a si mesmo",
     "DeveloperFocused": "Desenvolvedor focado",
     "FullStackApplicationInfrastructure": "Infraestrutura de aplicativos full stack.",
     "DomainDrivenDesign": "Design Orientado a Domínio",
@@ -30,7 +30,7 @@
     "AuthorizationExplanation": "Autorização avançada com usuário, função e sistema de permissão refinado. Criada na biblioteca Microsoft Identity.",
     "MultiTenancy": "Múltiplos inquilinos",
     "MultiTenancyExplanation": "Aplicativos SaaS facilitados! Multilocação integrada do banco de dados à interface do usuário.",
-    "CrossCuttingConcerns": "Preocupações transversais",
+    "CrossCuttingConcerns": "Características transversais",
     "CrossCuttingConcernsExplanation": "Infraestrutura completa para autorização, validação, tratamento de exceções, armazenamento em cache, log de auditoria, gerenciamento de transações e assim por diante.",
     "BuiltInBundlingMinification": "Pacote & Minificação Integrados",
     "BuiltInBundlingMinificationExplanation": "Pare de usar ferramentas externas para empacotamento e minificação. O ABP oferece uma maneira mais simples, dinâmica, poderosa, modular e integrada!",

From 67ed3bb372b6e920179da437bc084cac69f336fb Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <ebicoglu@users.noreply.github.com>
Date: Tue, 19 Nov 2019 11:33:51 +0300
Subject: [PATCH 15/75] Update Index.md

---
 docs/en/Modules/Index.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/en/Modules/Index.md b/docs/en/Modules/Index.md
index bd608c4528..9d1c1d301f 100644
--- a/docs/en/Modules/Index.md
+++ b/docs/en/Modules/Index.md
@@ -19,8 +19,7 @@ There are some **free and open source** application modules developed and mainta
 * **Identity**: Used to manage roles, users and their permissions.
 * **Identity Server**: Integrates to IdentityServer4.
 * **Permission Management**: Used to persist permissions.
-* **[Setting Management](Setting-Management.md)**: Used to persist  
-and manage the [settings](../Settings.md).
+* **[Setting Management](Setting-Management.md)**: Used to persist and manage the [settings](../Settings.md).
 * **Tenant Management**: Used to manage tenants for a [multi-tenant](../Multi-Tenancy.md) application.
 * **Users**: Used to abstract users, so other modules can depend on this instead of the Identity module.
 

From 99957e4c29b983beab556aa9361d4b76e746e5f3 Mon Sep 17 00:00:00 2001
From: Super <gdlcf88@outlook.com>
Date: Wed, 20 Nov 2019 17:25:15 +0800
Subject: [PATCH 16/75] Create dotnetcore.yml

---
 .github/workflows/dotnetcore.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/dotnetcore.yml

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
new file mode 100644
index 0000000000..0f9d2a6777
--- /dev/null
+++ b/.github/workflows/dotnetcore.yml
@@ -0,0 +1,17 @@
+name: .NET Core
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.2.108
+    - name: Build with dotnet
+      run: dotnet build --configuration Release

From 667294cc8b363bacb7705dc29a6b1dfd65772e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 21 Nov 2019 17:39:22 +0300
Subject: [PATCH 17/75] #2231 Change applicationUrls for the microservice demo
 applications

---
 .../applications/AuthServer.Host/Properties/launchSettings.json | 2 +-
 .../BackendAdminApp.Host/Properties/launchSettings.json         | 2 +-
 .../PublicWebSite.Host/Properties/launchSettings.json           | 2 +-
 .../BackendAdminAppGateway.Host/Properties/launchSettings.json  | 2 +-
 .../InternalGateway.Host/Properties/launchSettings.json         | 2 +-
 .../PublicWebSiteGateway.Host/Properties/launchSettings.json    | 2 +-
 .../BloggingService.Host/Properties/launchSettings.json         | 2 +-
 .../IdentityService.Host/Properties/launchSettings.json         | 2 +-
 .../ProductService.Host/Properties/launchSettings.json          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/applications/AuthServer.Host/Properties/launchSettings.json
index 64eeed40fe..d8e84747ac 100644
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "AuthServer.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:64999",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Properties/launchSettings.json
index affa8826fb..f7ea179db1 100644
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "BackendAdminApp.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:51954",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Properties/launchSettings.json
index 3945c0c403..9b9ac6527f 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "PublicWebSite.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:53435",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Properties/launchSettings.json
index 981961f411..f56a0bdb72 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "BackendAdminAppGateway.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:65115",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Properties/launchSettings.json
index f65859f468..c56831d419 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "InternalGateway.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:65129",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Properties/launchSettings.json
index fa3d33da52..b24931efcf 100644
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "PublicWebSiteGateway.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:64897",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/microservices/BloggingService.Host/Properties/launchSettings.json
index b8f8803266..0ad1aabc2a 100644
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "BloggingService.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:62157",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/microservices/IdentityService.Host/Properties/launchSettings.json
index cd85573717..d47ed9055c 100644
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "IdentityService.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:63568",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Properties/launchSettings.json b/samples/MicroserviceDemo/microservices/ProductService.Host/Properties/launchSettings.json
index b93ef90918..d6620ecc08 100644
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     "ProductService.Host": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:60244",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

From 0b9563e36f43f93740a1da762aa0d4cda57195ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 21 Nov 2019 17:39:50 +0300
Subject: [PATCH 18/75] Resolved #2231: Create PS1 file to run the microservice
 demo from the command line.

---
 .gitignore                                               | 1 +
 samples/MicroserviceDemo/_run/01_AuthServer.ps1          | 2 ++
 samples/MicroserviceDemo/_run/02_IdentityService.ps1     | 2 ++
 samples/MicroserviceDemo/_run/03_BloggingService.ps1     | 2 ++
 samples/MicroserviceDemo/_run/04_ProductService.ps1      | 2 ++
 samples/MicroserviceDemo/_run/05_InternalGateway.ps1     | 2 ++
 .../MicroserviceDemo/_run/06_BackendAdminAppGateway.ps1  | 2 ++
 .../MicroserviceDemo/_run/07_PublicWebSiteGateway.ps1    | 2 ++
 samples/MicroserviceDemo/_run/08_BackendAdminApp.ps1     | 2 ++
 samples/MicroserviceDemo/_run/09_PublicWebSite.ps1       | 2 ++
 samples/MicroserviceDemo/_run/10_Run_All_Application.ps1 | 9 +++++++++
 samples/MicroserviceDemo/_run/11_Run_Browser.ps1         | 1 +
 samples/MicroserviceDemo/_run/12_ConsoleClientDemo.ps1   | 2 ++
 13 files changed, 31 insertions(+)
 create mode 100644 samples/MicroserviceDemo/_run/01_AuthServer.ps1
 create mode 100644 samples/MicroserviceDemo/_run/02_IdentityService.ps1
 create mode 100644 samples/MicroserviceDemo/_run/03_BloggingService.ps1
 create mode 100644 samples/MicroserviceDemo/_run/04_ProductService.ps1
 create mode 100644 samples/MicroserviceDemo/_run/05_InternalGateway.ps1
 create mode 100644 samples/MicroserviceDemo/_run/06_BackendAdminAppGateway.ps1
 create mode 100644 samples/MicroserviceDemo/_run/07_PublicWebSiteGateway.ps1
 create mode 100644 samples/MicroserviceDemo/_run/08_BackendAdminApp.ps1
 create mode 100644 samples/MicroserviceDemo/_run/09_PublicWebSite.ps1
 create mode 100644 samples/MicroserviceDemo/_run/10_Run_All_Application.ps1
 create mode 100644 samples/MicroserviceDemo/_run/11_Run_Browser.ps1
 create mode 100644 samples/MicroserviceDemo/_run/12_ConsoleClientDemo.ps1

diff --git a/.gitignore b/.gitignore
index 4eabbccebd..73d74ec7c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -289,4 +289,5 @@ samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Logs/logs.txt
 samples/MicroserviceDemo/applications/PublicWebSite.Host/Logs/logs.txt
 samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Logs/logs.txt
 samples/MicroserviceDemo/microservices/BloggingService.Host/Logs/logs.txt
+samples/MicroserviceDemo/applications/ConsoleClientDemo/Logs/logs.txt
 modules/docs/app/Volo.DocsTestApp/Logs/logs.txt
diff --git a/samples/MicroserviceDemo/_run/01_AuthServer.ps1 b/samples/MicroserviceDemo/_run/01_AuthServer.ps1
new file mode 100644
index 0000000000..14d1b32981
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/01_AuthServer.ps1
@@ -0,0 +1,2 @@
+cd ../applications/AuthServer.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/02_IdentityService.ps1 b/samples/MicroserviceDemo/_run/02_IdentityService.ps1
new file mode 100644
index 0000000000..c47c8406c3
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/02_IdentityService.ps1
@@ -0,0 +1,2 @@
+cd ../microservices/IdentityService.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/03_BloggingService.ps1 b/samples/MicroserviceDemo/_run/03_BloggingService.ps1
new file mode 100644
index 0000000000..65b2c9ca11
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/03_BloggingService.ps1
@@ -0,0 +1,2 @@
+cd ../microservices/BloggingService.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/04_ProductService.ps1 b/samples/MicroserviceDemo/_run/04_ProductService.ps1
new file mode 100644
index 0000000000..1181edd4e0
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/04_ProductService.ps1
@@ -0,0 +1,2 @@
+cd ../microservices/ProductService.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/05_InternalGateway.ps1 b/samples/MicroserviceDemo/_run/05_InternalGateway.ps1
new file mode 100644
index 0000000000..f27befba7b
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/05_InternalGateway.ps1
@@ -0,0 +1,2 @@
+cd ../gateways/InternalGateway.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/06_BackendAdminAppGateway.ps1 b/samples/MicroserviceDemo/_run/06_BackendAdminAppGateway.ps1
new file mode 100644
index 0000000000..3d819542c2
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/06_BackendAdminAppGateway.ps1
@@ -0,0 +1,2 @@
+cd ../gateways/BackendAdminAppGateway.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/07_PublicWebSiteGateway.ps1 b/samples/MicroserviceDemo/_run/07_PublicWebSiteGateway.ps1
new file mode 100644
index 0000000000..009f45bc66
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/07_PublicWebSiteGateway.ps1
@@ -0,0 +1,2 @@
+cd ../gateways/PublicWebSiteGateway.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/08_BackendAdminApp.ps1 b/samples/MicroserviceDemo/_run/08_BackendAdminApp.ps1
new file mode 100644
index 0000000000..356d7ac981
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/08_BackendAdminApp.ps1
@@ -0,0 +1,2 @@
+cd ../applications/BackendAdminApp.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/09_PublicWebSite.ps1 b/samples/MicroserviceDemo/_run/09_PublicWebSite.ps1
new file mode 100644
index 0000000000..24d31ced0f
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/09_PublicWebSite.ps1
@@ -0,0 +1,2 @@
+cd ../applications/PublicWebSite.Host
+dotnet run
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/10_Run_All_Application.ps1 b/samples/MicroserviceDemo/_run/10_Run_All_Application.ps1
new file mode 100644
index 0000000000..9129959d85
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/10_Run_All_Application.ps1
@@ -0,0 +1,9 @@
+start powershell .\01_AuthServer.ps1
+start powershell .\02_IdentityService.ps1
+start powershell .\03_BloggingService.ps1
+start powershell .\04_ProductService.ps1
+start powershell .\05_InternalGateway.ps1
+start powershell .\06_BackendAdminAppGateway.ps1
+start powershell .\07_PublicWebSiteGateway.ps1
+start powershell .\08_BackendAdminApp.ps1
+start powershell .\09_PublicWebSite.ps1
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/11_Run_Browser.ps1 b/samples/MicroserviceDemo/_run/11_Run_Browser.ps1
new file mode 100644
index 0000000000..50c010b9bb
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/11_Run_Browser.ps1
@@ -0,0 +1 @@
+start chrome http://localhost:64999,http://localhost:63568,http://localhost:62157,http://localhost:60244,http://localhost:65129/swagger,http://localhost:65115/swagger,http://localhost:64897/swagger,http://localhost:51954,http://localhost:53435
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/12_ConsoleClientDemo.ps1 b/samples/MicroserviceDemo/_run/12_ConsoleClientDemo.ps1
new file mode 100644
index 0000000000..0fc3d40edc
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/12_ConsoleClientDemo.ps1
@@ -0,0 +1,2 @@
+cd ../applications/ConsoleClientDemo
+dotnet run
\ No newline at end of file

From c5fc902fb3aa45422d7efb5728d12b0e31b0ff8c Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 22 Nov 2019 11:48:52 +0300
Subject: [PATCH 19/75] feat(permissin-guard): add a handling permission
 condition

---
 .../packages/core/src/lib/guards/permission.guard.ts         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
index ca69eb127d..97c6c3ebc8 100644
--- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
+++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
@@ -2,9 +2,10 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate } from '@angular/router';
 import { Store } from '@ngxs/store';
 import { Observable } from 'rxjs';
-import { ConfigState } from '../states';
 import { tap } from 'rxjs/operators';
+import snq from 'snq';
 import { RestOccurError } from '../actions';
+import { ConfigState } from '../states';
 
 @Injectable({
   providedIn: 'root',
@@ -13,7 +14,7 @@ export class PermissionGuard implements CanActivate {
   constructor(private store: Store) {}
 
   canActivate({ data }: ActivatedRouteSnapshot): Observable<boolean> {
-    const resource = data.requiredPolicy as string;
+    const resource = snq(() => data.routes.requiredPolicy) || (data.requiredPolicy as string);
     return this.store.select(ConfigState.getGrantedPolicy(resource)).pipe(
       tap(access => {
         if (!access) {

From 790a26c45853bb516677f4d2fd1f31771de032b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 22 Nov 2019 13:28:15 +0300
Subject: [PATCH 20/75] Add readme

---
 ...lientDemo.ps1 => 10_ConsoleClientDemo.ps1} |  0
 samples/MicroserviceDemo/_run/README.md       | 19 +++++++++++++++++++
 ...lication.ps1 => __Run_All_Application.ps1} |  0
 .../{11_Run_Browser.ps1 => __Run_Browser.ps1} |  0
 4 files changed, 19 insertions(+)
 rename samples/MicroserviceDemo/_run/{12_ConsoleClientDemo.ps1 => 10_ConsoleClientDemo.ps1} (100%)
 create mode 100644 samples/MicroserviceDemo/_run/README.md
 rename samples/MicroserviceDemo/_run/{10_Run_All_Application.ps1 => __Run_All_Application.ps1} (100%)
 rename samples/MicroserviceDemo/_run/{11_Run_Browser.ps1 => __Run_Browser.ps1} (100%)

diff --git a/samples/MicroserviceDemo/_run/12_ConsoleClientDemo.ps1 b/samples/MicroserviceDemo/_run/10_ConsoleClientDemo.ps1
similarity index 100%
rename from samples/MicroserviceDemo/_run/12_ConsoleClientDemo.ps1
rename to samples/MicroserviceDemo/_run/10_ConsoleClientDemo.ps1
diff --git a/samples/MicroserviceDemo/_run/README.md b/samples/MicroserviceDemo/_run/README.md
new file mode 100644
index 0000000000..f81e093cc2
--- /dev/null
+++ b/samples/MicroserviceDemo/_run/README.md
@@ -0,0 +1,19 @@
+# Run the Microservice Demo Solution
+
+This folder contains PowerShell files to run the system:
+
+* **__Run_All_Application.ps1**: Runs all the applications in one click.
+* **__Run_Browser.ps1**: Opens all the UIs of the applications in Google Chrome browser.
+
+Other files runs the individual applications.
+
+> This files are only tested in Windows 10.
+
+### Pre-Requirements
+
+- [SQL Server](https://www.microsoft.com/en-us/sql-server/sql-server-downloads) 2015+ (can be [express edition](https://www.microsoft.com/en-us/sql-server/sql-server-editions-express))
+- [Redis](https://redis.io/download) 5.0+
+- [RabbitMQ](https://www.rabbitmq.com/install-windows.html) 3.7.11+
+- [MongoDB](https://www.mongodb.com/download-center) 4.0+
+- [ElasticSearch](https://www.elastic.co/downloads/elasticsearch) 6.6+
+- [Kibana](https://www.elastic.co/downloads/kibana) 6.6+ (optional, recommended to see logs)
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/_run/10_Run_All_Application.ps1 b/samples/MicroserviceDemo/_run/__Run_All_Application.ps1
similarity index 100%
rename from samples/MicroserviceDemo/_run/10_Run_All_Application.ps1
rename to samples/MicroserviceDemo/_run/__Run_All_Application.ps1
diff --git a/samples/MicroserviceDemo/_run/11_Run_Browser.ps1 b/samples/MicroserviceDemo/_run/__Run_Browser.ps1
similarity index 100%
rename from samples/MicroserviceDemo/_run/11_Run_Browser.ps1
rename to samples/MicroserviceDemo/_run/__Run_Browser.ps1

From d8bdcffd4c69787e69fb7ae3c3375a44a0067e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 22 Nov 2019 15:31:24 +0300
Subject: [PATCH 21/75] Fix claims mapping for the microservice demo

---
 .../BackendAdminAppGatewayHostModule.cs       | 29 +++++++++++++------
 .../InternalGatewayHostModule.cs              | 29 +++++++++++++------
 .../PublicWebSiteGatewayHostModule.cs         | 29 +++++++++++++------
 .../BloggingServiceHostModule.cs              | 27 ++++++++++++-----
 .../IdentityServiceHostModule.cs              | 29 +++++++++++++------
 .../ProductServiceHostModule.cs               | 29 +++++++++++++------
 6 files changed, 119 insertions(+), 53 deletions(-)

diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs
index d30dc8e4fb..81a109a6f0 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs
@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
 using Ocelot.DependencyInjection;
@@ -52,14 +55,6 @@ namespace BackendAdminAppGateway.Host
                     options.Authority = configuration["AuthServer:Authority"];
                     options.ApiName = configuration["AuthServer:ApiName"];
                     options.RequireHttpsMetadata = false;
-                    //TODO: Should create an extension method for that (may require to create a new ABP package depending on the IdentityServer4.AccessTokenValidation)
-                    //options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
-                    //options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
-                    //options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
-                    //options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
-                    //options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
-                    //options.InboundJwtClaimTypeMap["phone_number_verified"] = AbpClaimTypes.PhoneNumberVerified;
-                    //options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
                 });
 
             context.Services.AddSwaggerGen(options =>
@@ -94,6 +89,22 @@ namespace BackendAdminAppGateway.Host
             app.UseVirtualFiles();
             app.UseRouting();
             app.UseAuthentication();
+
+            app.Use(async (ctx, next) =>
+            {
+                var currentPrincipalAccessor = ctx.RequestServices.GetRequiredService<ICurrentPrincipalAccessor>();
+                var map = new Dictionary<string, string>()
+                {
+                    { "sub", AbpClaimTypes.UserId },
+                    { "role", AbpClaimTypes.Role },
+                    { "email", AbpClaimTypes.Email },
+                    //any other map
+                };
+                var mapClaims = currentPrincipalAccessor.Principal.Claims.Where(p => map.Keys.Contains(p.Type)).ToList();
+                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
+                await next();
+            });
+
             app.UseSwagger();
             app.UseSwaggerUI(options =>
             {
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs
index 8b470f826f..a3572551f9 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs
@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
 using Ocelot.DependencyInjection;
@@ -41,14 +44,6 @@ namespace InternalGateway.Host
                     options.Authority = configuration["AuthServer:Authority"];
                     options.ApiName = configuration["AuthServer:ApiName"];
                     options.RequireHttpsMetadata = false;
-                    //TODO: Should create an extension method for that (may require to create a new ABP package depending on the IdentityServer4.AccessTokenValidation)
-                    //options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
-                    //options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
-                    //options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
-                    //options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
-                    //options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
-                    //options.InboundJwtClaimTypeMap["phone_number_verified"] = AbpClaimTypes.PhoneNumberVerified;
-                    //options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
                 });
 
             context.Services.AddSwaggerGen(options =>
@@ -83,6 +78,22 @@ namespace InternalGateway.Host
             app.UseVirtualFiles();
             app.UseRouting();
             app.UseAuthentication();
+
+            app.Use(async (ctx, next) =>
+            {
+                var currentPrincipalAccessor = ctx.RequestServices.GetRequiredService<ICurrentPrincipalAccessor>();
+                var map = new Dictionary<string, string>()
+                {
+                    { "sub", AbpClaimTypes.UserId },
+                    { "role", AbpClaimTypes.Role },
+                    { "email", AbpClaimTypes.Email },
+                    //any other map
+                };
+                var mapClaims = currentPrincipalAccessor.Principal.Claims.Where(p => map.Keys.Contains(p.Type)).ToList();
+                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
+                await next();
+            });
+
             app.UseSwagger();
             app.UseSwaggerUI(options =>
             {
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs
index 2add48443a..0129663e5a 100644
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs
@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
 using Ocelot.DependencyInjection;
@@ -39,14 +42,6 @@ namespace PublicWebSiteGateway.Host
                     options.Authority = configuration["AuthServer:Authority"];
                     options.ApiName = configuration["AuthServer:ApiName"];
                     options.RequireHttpsMetadata = false;
-                    //TODO: Should create an extension method for that (may require to create a new ABP package depending on the IdentityServer4.AccessTokenValidation)
-                    //options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
-                    //options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
-                    //options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
-                    //options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
-                    //options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
-                    //options.InboundJwtClaimTypeMap["phone_number_verified"] = AbpClaimTypes.PhoneNumberVerified;
-                    //options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
                 });
 
             context.Services.AddSwaggerGen(options =>
@@ -81,6 +76,22 @@ namespace PublicWebSiteGateway.Host
             app.UseVirtualFiles();
             app.UseRouting();
             app.UseAuthentication();
+
+            app.Use(async (ctx, next) =>
+            {
+                var currentPrincipalAccessor = ctx.RequestServices.GetRequiredService<ICurrentPrincipalAccessor>();
+                var map = new Dictionary<string, string>()
+                {
+                    { "sub", AbpClaimTypes.UserId },
+                    { "role", AbpClaimTypes.Role },
+                    { "email", AbpClaimTypes.Email },
+                    //any other map
+                };
+                var mapClaims = currentPrincipalAccessor.Principal.Claims.Where(p => map.Keys.Contains(p.Type)).ToList();
+                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
+                await next();
+            });
+
             app.UseSwagger();
             app.UseSwaggerUI(options =>
             {
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
index 1f80e0c605..2d7e945cf5 100644
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
@@ -57,14 +60,6 @@ namespace BloggingService.Host
                     options.Authority = configuration["AuthServer:Authority"];
                     options.ApiName = configuration["AuthServer:ApiName"];
                     options.RequireHttpsMetadata = false;
-                    //TODO: Should create an extension method for that (may require to create a new ABP package depending on the IdentityServer4.AccessTokenValidation)
-                    //options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
-                    //options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
-                    //options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
-                    //options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
-                    //options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
-                    //options.InboundJwtClaimTypeMap["phone_number_verified"] = AbpClaimTypes.PhoneNumberVerified;
-                    //options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
                 });
 
             context.Services.AddSwaggerGen(options =>
@@ -113,6 +108,22 @@ namespace BloggingService.Host
             app.UseVirtualFiles();
             app.UseRouting();
             app.UseAuthentication();
+
+            app.Use(async (ctx, next) =>
+            {
+                var currentPrincipalAccessor = ctx.RequestServices.GetRequiredService<ICurrentPrincipalAccessor>();
+                var map = new Dictionary<string, string>()
+                {
+                    { "sub", AbpClaimTypes.UserId },
+                    { "role", AbpClaimTypes.Role },
+                    { "email", AbpClaimTypes.Email },
+                    //any other map
+                };
+                var mapClaims = currentPrincipalAccessor.Principal.Claims.Where(p => map.Keys.Contains(p.Type)).ToList();
+                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
+                await next();
+            });
+
             app.UseAbpRequestLocalization(); //TODO: localization?
             app.UseSwagger();
             app.UseSwaggerUI(options =>
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
index 96899af0a0..2bf102a465 100644
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
 using StackExchange.Redis;
@@ -44,14 +47,6 @@ namespace IdentityService.Host
                     options.Authority = configuration["AuthServer:Authority"];
                     options.ApiName = configuration["AuthServer:ApiName"];
                     options.RequireHttpsMetadata = false;
-                    //TODO: Should create an extension method for that (may require to create a new ABP package depending on the IdentityServer4.AccessTokenValidation)
-                    //options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
-                    //options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
-                    //options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
-                    //options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
-                    //options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
-                    //options.InboundJwtClaimTypeMap["phone_number_verified"] = AbpClaimTypes.PhoneNumberVerified;
-                    //options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
                 });
 
             context.Services.AddSwaggerGen(options =>
@@ -95,6 +90,22 @@ namespace IdentityService.Host
             app.UseVirtualFiles();
             app.UseRouting();
             app.UseAuthentication();
+
+            app.Use(async (ctx, next) =>
+            {
+                var currentPrincipalAccessor = ctx.RequestServices.GetRequiredService<ICurrentPrincipalAccessor>();
+                var map = new Dictionary<string, string>()
+                {
+                    { "sub", AbpClaimTypes.UserId },
+                    { "role", AbpClaimTypes.Role },
+                    { "email", AbpClaimTypes.Email },
+                    //any other map
+                };
+                var mapClaims = currentPrincipalAccessor.Principal.Claims.Where(p => map.Keys.Contains(p.Type)).ToList();
+                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
+                await next();
+            });
+
             app.UseAbpRequestLocalization(); //TODO: localization?
             app.UseSwagger();
             app.UseSwaggerUI(options =>
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
index 8389067092..97235133f9 100644
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
 using ProductManagement;
@@ -46,14 +49,6 @@ namespace ProductService.Host
                     options.Authority = configuration["AuthServer:Authority"];
                     options.ApiName = configuration["AuthServer:ApiName"];
                     options.RequireHttpsMetadata = false;
-                    //TODO: Should create an extension method for that (may require to create a new ABP package depending on the IdentityServer4.AccessTokenValidation)
-                    //options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
-                    //options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
-                    //options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
-                    //options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
-                    //options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
-                    //options.InboundJwtClaimTypeMap["phone_number_verified"] = AbpClaimTypes.PhoneNumberVerified;
-                    //options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
                 });
 
             context.Services.AddSwaggerGen(options =>
@@ -97,6 +92,22 @@ namespace ProductService.Host
             app.UseVirtualFiles();
             app.UseRouting();
             app.UseAuthentication();
+
+            app.Use(async (ctx, next) =>
+            {
+                var currentPrincipalAccessor = ctx.RequestServices.GetRequiredService<ICurrentPrincipalAccessor>();
+                var map = new Dictionary<string, string>()
+                {
+                    { "sub", AbpClaimTypes.UserId },
+                    { "role", AbpClaimTypes.Role },
+                    { "email", AbpClaimTypes.Email },
+                    //any other map
+                };
+                var mapClaims = currentPrincipalAccessor.Principal.Claims.Where(p => map.Keys.Contains(p.Type)).ToList();
+                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
+                await next();
+            });
+
             app.UseAbpRequestLocalization(); //TODO: localization?
             app.UseSwagger();
             app.UseSwaggerUI(options =>

From 3125fd6a46bcdf098a480c88ac3ecf7dbe2998eb Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 22 Nov 2019 15:40:15 +0300
Subject: [PATCH 22/75] localization

---
 .../Abp/IdentityServer/Localization/Resources/tr.json     | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/tr.json

diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/tr.json b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/tr.json
new file mode 100644
index 0000000000..9340b7999f
--- /dev/null
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/tr.json
@@ -0,0 +1,8 @@
+{
+  "culture": "tr",
+  "texts": {
+    "Volo.IdentityServer:DuplicateIdentityResourceName": "Identity Resource adı zaten mevcut: {Name}",
+    "Volo.IdentityServer:DuplicateApiResourceName": "Api Resource adı zaten mevcut: {Name}",
+    "Volo.IdentityServer:DuplicateClientId": "ClientId already zaten mevcut: {ClientId}"
+  }
+}
\ No newline at end of file

From 26ae9a0179f085716cf073ac0ad33fa35e6171e1 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 22 Nov 2019 17:23:03 +0300
Subject: [PATCH 23/75] chore: update angular versions

---
 templates/app/angular/package.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json
index 5caed49ce5..2035c3e6b2 100644
--- a/templates/app/angular/package.json
+++ b/templates/app/angular/package.json
@@ -18,23 +18,23 @@
     "@abp/ng.setting-management": "^1.0.4",
     "@abp/ng.tenant-management": "^1.0.4",
     "@abp/ng.theme.basic": "^1.0.4",
-    "@angular/animations": "~8.2.13",
-    "@angular/common": "~8.2.13",
-    "@angular/compiler": "~8.2.13",
-    "@angular/core": "~8.2.13",
-    "@angular/forms": "~8.2.13",
-    "@angular/platform-browser": "~8.2.13",
-    "@angular/platform-browser-dynamic": "~8.2.13",
-    "@angular/router": "~8.2.13",
+    "@angular/animations": "~8.2.14",
+    "@angular/common": "~8.2.14",
+    "@angular/compiler": "~8.2.14",
+    "@angular/core": "~8.2.14",
+    "@angular/forms": "~8.2.14",
+    "@angular/platform-browser": "~8.2.14",
+    "@angular/platform-browser-dynamic": "~8.2.14",
+    "@angular/router": "~8.2.14",
     "rxjs": "~6.4.0",
     "tslib": "^1.10.0",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.803.17",
-    "@angular/cli": "~8.3.17",
-    "@angular/compiler-cli": "~8.2.13",
-    "@angular/language-service": "~8.2.13",
+    "@angular-devkit/build-angular": "~0.803.19",
+    "@angular/cli": "~8.3.19",
+    "@angular/compiler-cli": "~8.2.14",
+    "@angular/language-service": "~8.2.14",
     "@angularclass/hmr": "^2.1.3",
     "@ngxs/hmr-plugin": "^3.5.1",
     "@ngxs/logger-plugin": "^3.5.1",

From 3516a811c9aead4a85d1c6983a7b337fa7b2f414 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 22 Nov 2019 17:23:23 +0300
Subject: [PATCH 24/75] chore: change home component selector

---
 templates/app/angular/src/app/app.component.ts            | 1 +
 templates/app/angular/src/app/home/home.component.spec.ts | 2 +-
 templates/app/angular/src/app/home/home.component.ts      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts
index f1d46f7b08..4780afbfd5 100644
--- a/templates/app/angular/src/app/app.component.ts
+++ b/templates/app/angular/src/app/app.component.ts
@@ -22,6 +22,7 @@ export class AppComponent implements OnInit {
           'fontawesome-v4-shims.min.css',
         ],
         'style',
+        null,
         'head',
       )
       .subscribe();
diff --git a/templates/app/angular/src/app/home/home.component.spec.ts b/templates/app/angular/src/app/home/home.component.spec.ts
index c0c7686591..b52901d692 100644
--- a/templates/app/angular/src/app/home/home.component.spec.ts
+++ b/templates/app/angular/src/app/home/home.component.spec.ts
@@ -13,7 +13,7 @@ describe('HomeComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HomeModule, NgxsModule.forRoot(), RouterTestingModule],
+      imports: [ NgxsModule.forRoot(), HomeModule, RouterTestingModule],
       providers: [{ provide: OAuthService, useValue: { hasValidAccessToken: () => false } }],
     });
     fixture = TestBed.createComponent(HomeComponent);
diff --git a/templates/app/angular/src/app/home/home.component.ts b/templates/app/angular/src/app/home/home.component.ts
index aa56d34131..a42b960493 100644
--- a/templates/app/angular/src/app/home/home.component.ts
+++ b/templates/app/angular/src/app/home/home.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { OAuthService } from 'angular-oauth2-oidc';
 
 @Component({
-  selector: 'abp-home',
+  selector: 'app-home',
   templateUrl: './home.component.html',
 })
 export class HomeComponent {

From 6b78dbff863e92f6c41358fceb25210763571388 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 22 Nov 2019 17:23:46 +0300
Subject: [PATCH 25/75] feat(core): add undefined and empty string params
 control to rest service

---
 .../core/src/lib/services/rest.service.ts     | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts
index 4057a4a29a..0ad32ba010 100644
--- a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts
@@ -23,17 +23,31 @@ export class RestService {
     config = config || ({} as Rest.Config);
     const { observe = Rest.Observe.Body, skipHandleError } = config;
     const url = (api || this.store.selectSnapshot(ConfigState.getApiUrl())) + request.url;
-    const { method, ...options } = request;
+    const { method, params, ...options } = request;
 
-    return this.http.request<T>(method, url, { observe, ...options } as any).pipe(
-      observe === Rest.Observe.Body ? take(1) : tap(),
-      catchError(err => {
-        if (skipHandleError) {
-          return throwError(err);
-        }
+    return this.http
+      .request<T>(method, url, {
+        observe,
+        ...(params && {
+          params: Object.keys(params).reduce(
+            (acc, key) => ({
+              ...acc,
+              ...(typeof params[key] !== 'undefined' && params[key] !== '' && { [key]: params[key] }),
+            }),
+            {},
+          ),
+        }),
+        ...options,
+      } as any)
+      .pipe(
+        observe === Rest.Observe.Body ? take(1) : tap(),
+        catchError(err => {
+          if (skipHandleError) {
+            return throwError(err);
+          }
 
-        return this.handleError(err);
-      }),
-    );
+          return this.handleError(err);
+        }),
+      );
   }
 }

From 9e67e1e7709c5ebd5236719b3d0d02fc14ee61ba Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sat, 23 Nov 2019 18:24:42 +0800
Subject: [PATCH 26/75] Update for Module-Architecture docs.

---
 docs/en/Best-Practices/Module-Architecture.md    |  2 +-
 .../Best-Practices/Module-Architecture.md        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/en/Best-Practices/Module-Architecture.md b/docs/en/Best-Practices/Module-Architecture.md
index f37d60d68b..88f376352f 100644
--- a/docs/en/Best-Practices/Module-Architecture.md
+++ b/docs/en/Best-Practices/Module-Architecture.md
@@ -85,5 +85,5 @@ Next section describes the packages in more details.
 
 #### Web Layer
 
-* Do create a **Web** package, named as *CompanyName.ModuleName.Web*, that contains pages, views, scripts, styles, images and other UI components.
+* **Do** create a **Web** package, named as *CompanyName.ModuleName.Web*, that contains pages, views, scripts, styles, images and other UI components.
   * Web package only depends on the **HttpApi** package.
\ No newline at end of file
diff --git a/docs/zh-Hans/Best-Practices/Module-Architecture.md b/docs/zh-Hans/Best-Practices/Module-Architecture.md
index ad38509ef8..6f761ef8cb 100644
--- a/docs/zh-Hans/Best-Practices/Module-Architecture.md
+++ b/docs/zh-Hans/Best-Practices/Module-Architecture.md
@@ -57,33 +57,33 @@
 * **推荐** 将领域层划分为两个项目:
   * **Domain.Shared** 包(项目) 命名为*CompanyName.ModuleName.Domain.Shared*,包含常量,枚举和其他类型, 它不能包含实体,存储库,域服务或任何其他业务对象. 可以安全地与模块中的所有层使用. 此包也可以与第三方客户端使用.
   * **Domain** 包(项目) 命名为*CompanyName.ModuleName.Domain*, 包含实体, 仓储接口,领域服务接口及其实现和其他领域对象.
-    * Domain package 依赖于 **Domain.Share** package.
+    * Domain 包依赖于 **Domain.Share** 包.
 
 #### 应用服务层
 
 * **推荐** 将应用服务层划分为两个项目:
   * **Application.Contracts** 包(项目) 命名为*CompanyName.ModuleName.Application.Contracts,包含应用服务接口和相关的数据传输对象(DTO).
-    * Application contract package 依赖于 **Domain.Shared** package.
+    * Application contract 包依赖于 **Domain.Shared** 包.
   * **Application** 包(项目)命名为*CompanyName.ModuleName.Application*,包含应用服务实现.
-    * Application package 依赖于 **Domain** 和 **Application.Contracts** packages.
+    * Application 包依赖于 **Domain** 包和 **Application.Contracts** 包.
 
 #### 基础设施层
 
 * **推荐** 为每个orm/数据库集成创建一个独立的集成包, 比如Entity Framework Core 和 MongoDB.
-  * **推荐** 例如, 创建一个抽象Entity Framework Core集成的*CompanyName.ModuleName.EntityFrameworkCore* package. ORM 集成 package 依赖于 **Domain** package.
+  * **推荐** 例如, 创建一个抽象Entity Framework Core集成的*CompanyName.ModuleName.EntityFrameworkCore* 包. ORM 集成包依赖于 **Domain** 包.
   * **不推荐** 依赖于orm/数据库集成包中的其他层.
 * **推荐** 为每个主要的库创建一个独立的集成包, 在不影响其他包的情况下可以被另一个库替换.
 
 #### HTTP 层
 
 * **推荐** 创建命名为*CompanyName.ModuleName.HttpApi*的**HTTP API**包, 为模块开发REST风格的HTTP API.
-  * HTTP API package 只依赖于 **Application.Contracts** package. 不要依赖 Application package.
+  * HTTP API 包只依赖于 **Application.Contracts** 包. 不要依赖 Application 包.
   * **推荐** 为每个应用服务创建一个Controller (通常通过实现其接口). 这些控制器使用应用服务接口来委托操作. 它根据需要配置路由, HTTP方法和其他与Web相关的东西.
-* **推荐** 创建一个为HTTP API包提供客户端服务的**HTTP API Client**包, 它的命名为*companyname.modulename.httpapi*. 这些客户端服务将应用服务接口实现远程端点的客户端.
-  * HTTP API Client package 仅依赖于 **Application.Contracts** package.
+* **推荐** 创建一个为HTTP API包提供客户端服务的**HTTP API Client**包, 它的命名为*Companyname.ModuleName.HttpApi.Client*. 这些客户端服务将应用服务接口实现远程端点的客户端.
+  * HTTP API Client 包仅依赖于 **Application.Contracts** 包.
   * **推荐** 使用ABP框架提供的动态代理HTTP C＃客户端的功能.
 
 #### Web 层
 
 * **推荐** 创建命名为*CompanyName.ModuleName.Web*的 **Web**包. 包含页面,视图,脚本,样式,图像和其他UI组件.
-  * Web package 仅依赖于 **HttpApi** package.
\ No newline at end of file
+  * Web 包仅依赖于 **HttpApi** 包.
\ No newline at end of file

From d761851399115dcfd77c6adafba01f3f7c65a5ca Mon Sep 17 00:00:00 2001
From: maliming <liming.ma@volosoft.com>
Date: Sat, 23 Nov 2019 18:32:03 +0800
Subject: [PATCH 27/75] Remove "Preview" stage note!

---
 docs/zh-Hans/Index.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/zh-Hans/Index.md b/docs/zh-Hans/Index.md
index fbe003b8e7..d946d8f0bb 100644
--- a/docs/zh-Hans/Index.md
+++ b/docs/zh-Hans/Index.md
@@ -6,12 +6,6 @@ ABP是一个**开源应用程序框架**,专注于基于ASP.NET Core的Web应用
 
 浏览左侧导航菜单以深入了解文档.
 
-## 项目状态
-
-ABP是开源[ASP.NET Boilerplate](https://aspnetboilerplate.com/)框架的**下一代框架**, 它目前处于早期预览阶段,尚未准备好在生产中使用. 文档仍在进行中,远未完成.
-
-对于短期和生产级应用程序, 建议使用[ASP.NET Boilerplate](https://aspnetboilerplate.com/)框架,该框架具有丰富的功能集,成熟,积极维护和最新.
-
 ## 入门
 
 使用ABP开发新项目的最简单方法是使用启动模板:

From 2080e0c23304cb35a5787624a5d892542300947d Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sat, 23 Nov 2019 18:32:12 +0800
Subject: [PATCH 28/75] Delete cutstom workflows.

---
 .github/workflows/dotnetcore.yml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .github/workflows/dotnetcore.yml

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
deleted file mode 100644
index 0f9d2a6777..0000000000
--- a/.github/workflows/dotnetcore.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: .NET Core
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.2.108
-    - name: Build with dotnet
-      run: dotnet build --configuration Release

From 030d593ee97250a73423e1deaa15f2a1c82223ad Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sun, 24 Nov 2019 03:19:32 +0800
Subject: [PATCH 29/75] Fix a spelling mistake.

---
 docs/en/Best-Practices/Module-Architecture.md      | 2 +-
 docs/zh-Hans/Best-Practices/Module-Architecture.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/Best-Practices/Module-Architecture.md b/docs/en/Best-Practices/Module-Architecture.md
index 88f376352f..d9f833726f 100644
--- a/docs/en/Best-Practices/Module-Architecture.md
+++ b/docs/en/Best-Practices/Module-Architecture.md
@@ -57,7 +57,7 @@ Next section describes the packages in more details.
 * **Do** divide the domain layer into two projects:
   * **Domain.Shared** package, named as *CompanyName.ModuleName.Domain.Shared*, that contains constants, enums and other types those can be safely shared with the all layers of the module. This package can also be shared to 3rd-party clients. It can not contain entities, repositories, domain services or any other business objects.
   * **Domain** package, named as *CompanyName.ModuleName.Domain*, that contains entities, repository interfaces, domain service interfaces and their implementations and other domain objects.
-    * Domain package depends on the **Domain.Share** package.
+    * Domain package depends on the **Domain.Shared** package.
 
 #### Application Layer
 
diff --git a/docs/zh-Hans/Best-Practices/Module-Architecture.md b/docs/zh-Hans/Best-Practices/Module-Architecture.md
index 6f761ef8cb..648bf660b1 100644
--- a/docs/zh-Hans/Best-Practices/Module-Architecture.md
+++ b/docs/zh-Hans/Best-Practices/Module-Architecture.md
@@ -57,7 +57,7 @@
 * **推荐** 将领域层划分为两个项目:
   * **Domain.Shared** 包(项目) 命名为*CompanyName.ModuleName.Domain.Shared*,包含常量,枚举和其他类型, 它不能包含实体,存储库,域服务或任何其他业务对象. 可以安全地与模块中的所有层使用. 此包也可以与第三方客户端使用.
   * **Domain** 包(项目) 命名为*CompanyName.ModuleName.Domain*, 包含实体, 仓储接口,领域服务接口及其实现和其他领域对象.
-    * Domain 包依赖于 **Domain.Share** 包.
+    * Domain 包依赖于 **Domain.Shared** 包.
 
 #### 应用服务层
 

From 23c778f978c048647f07a0a075709de756fbb08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 23 Nov 2019 23:05:34 +0300
Subject: [PATCH 30/75] Fix typo: Surname

---
 .../Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
index 23632efce0..aca1535c3c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
@@ -34,7 +34,7 @@ namespace Volo.Abp.Identity
         public virtual string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the Surame for the user.
+        /// Gets or sets the Surname for the user.
         /// </summary>
         public virtual string Surname { get; set; }
 

From 63f48c706aa828ecda77a4e83724e72c4742eb0d Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 25 Nov 2019 14:41:29 +0800
Subject: [PATCH 31/75] Change SQL Server to LocalDb for the startup template
 connection strings

Resolve #2224
---
 .../MyCompanyName.MyProjectName.DbMigrator/appsettings.json   | 2 +-
 .../MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json | 2 +-
 .../appsettings.json                                          | 2 +-
 .../appsettings.json                                          | 2 +-
 .../src/MyCompanyName.MyProjectName.Web/appsettings.json      | 2 +-
 .../MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json | 4 ++--
 .../appsettings.json                                          | 2 +-
 .../MyCompanyName.MyProjectName.Web.Unified/appsettings.json  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
index dd942783d6..d45a2093e7 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "IdentityServer": {
     "Clients": {
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
index bad453f08a..2e0c5d044b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
@@ -3,7 +3,7 @@
     "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
   },
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json
index ffe84edc52..dd3055b873 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json
@@ -4,7 +4,7 @@
     "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
   },
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "AuthServer": {
     "Authority": "https://localhost:44305"
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
index 45f23d7895..6b650ad8c6 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
@@ -4,7 +4,7 @@
     "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
   },
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json
index 828ea38e60..03262e4a34 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json
@@ -3,7 +3,7 @@
     "SelfUrl": "https://localhost:44303"
   },
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "AuthServer": {
     "Authority": "https://localhost:44301"
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
index 9ee790cc41..6a2d586b0e 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true",
-    "MyProjectName": "Server=localhost;Database=MyProjectName_Module;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "MyProjectName": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Module;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
index 84503601a5..ea636d00ad 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
@@ -1,7 +1,7 @@
 {
   "AppSelfUrl": "https://localhost:44301/",
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.json
index 9536f7781f..e081a57a67 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.json
@@ -1,5 +1,5 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=localhost;Database=MyProjectName_Unified;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Unified;Trusted_Connection=True;MultipleActiveResultSets=true"
   }
 }
\ No newline at end of file

From d7c9a6044c32b7b20232a76c5e98b9d874c79cd7 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Mon, 25 Nov 2019 09:46:21 +0300
Subject: [PATCH 32/75] fix(theme-shared): breadcrumb type error

---
 .../core/src/lib/states/config.state.ts       | 164 ++++++++----------
 .../breadcrumb/breadcrumb.component.ts        |  29 ++--
 .../lib/tests/breadcrumb.component.spec.ts    |  15 ++
 3 files changed, 105 insertions(+), 103 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
index 381dc3e0f6..e18693ccb7 100644
--- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts
+++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
@@ -26,12 +26,9 @@ export class ConfigState {
   }
 
   static getOne(key: string) {
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State) => {
-        return state[key];
-      },
-    );
+    const selector = createSelector([ConfigState], (state: Config.State) => {
+      return state[key];
+    });
 
     return selector;
   }
@@ -45,87 +42,71 @@ export class ConfigState {
       throw new Error('The argument must be a dot string or an string array.');
     }
 
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State) => {
-        return (keys as string[]).reduce((acc, val) => {
-          if (acc) {
-            return acc[val];
-          }
-
-          return undefined;
-        }, state);
-      },
-    );
+    const selector = createSelector([ConfigState], (state: Config.State) => {
+      return (keys as string[]).reduce((acc, val) => {
+        if (acc) {
+          return acc[val];
+        }
+
+        return undefined;
+      }, state);
+    });
 
     return selector;
   }
 
-  static getRoute(path?: string, name?: string) {
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State) => {
-        const { flattedRoutes } = state;
-        return (flattedRoutes as ABP.FullRoute[]).find(route => {
-          if (path && route.path === path) {
-            return route;
-          } else if (name && route.name === name) {
-            return route;
-          }
-        });
-      },
-    );
+  static getRoute(path?: string, name?: string, url?: string) {
+    const selector = createSelector([ConfigState], (state: Config.State) => {
+      const { flattedRoutes } = state;
+      return (flattedRoutes as ABP.FullRoute[]).find(route => {
+        if (path && route.path === path) {
+          return route;
+        } else if (name && route.name === name) {
+          return route;
+        } else if (url && route.url === url) {
+          return route;
+        }
+      });
+    });
 
     return selector;
   }
 
   static getApiUrl(key?: string) {
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State): string => {
-        return state.environment.apis[key || 'default'].url;
-      },
-    );
+    const selector = createSelector([ConfigState], (state: Config.State): string => {
+      return state.environment.apis[key || 'default'].url;
+    });
 
     return selector;
   }
 
   static getSetting(key: string) {
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State) => {
-        return snq(() => state.setting.values[key]);
-      },
-    );
+    const selector = createSelector([ConfigState], (state: Config.State) => {
+      return snq(() => state.setting.values[key]);
+    });
     return selector;
   }
 
   static getSettings(keyword?: string) {
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State) => {
-        if (keyword) {
-          const keys = snq(() => Object.keys(state.setting.values).filter(key => key.indexOf(keyword) > -1), []);
-
-          if (keys.length) {
-            return keys.reduce((acc, key) => ({ ...acc, [key]: state.setting.values[key] }), {});
-          }
+    const selector = createSelector([ConfigState], (state: Config.State) => {
+      if (keyword) {
+        const keys = snq(() => Object.keys(state.setting.values).filter(key => key.indexOf(keyword) > -1), []);
+
+        if (keys.length) {
+          return keys.reduce((acc, key) => ({ ...acc, [key]: state.setting.values[key] }), {});
         }
+      }
 
-        return snq(() => state.setting.values, {});
-      },
-    );
+      return snq(() => state.setting.values, {});
+    });
     return selector;
   }
 
   static getGrantedPolicy(key: string) {
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State): boolean => {
-        if (!key) return true;
-        return snq(() => state.auth.grantedPolicies[key], false);
-      },
-    );
+    const selector = createSelector([ConfigState], (state: Config.State): boolean => {
+      if (!key) return true;
+      return snq(() => state.auth.grantedPolicies[key], false);
+    });
 
     return selector;
   }
@@ -141,47 +122,44 @@ export class ConfigState {
     if (!key) key = '';
 
     const keys = key.split('::') as string[];
-    const selector = createSelector(
-      [ConfigState],
-      (state: Config.State) => {
-        if (!state.localization) return defaultValue || key;
-
-        const { defaultResourceName } = state.environment.localization;
-        if (keys[0] === '') {
-          if (!defaultResourceName) {
-            throw new Error(
-              `Please check your environment. May you forget set defaultResourceName?
+    const selector = createSelector([ConfigState], (state: Config.State) => {
+      if (!state.localization) return defaultValue || key;
+
+      const { defaultResourceName } = state.environment.localization;
+      if (keys[0] === '') {
+        if (!defaultResourceName) {
+          throw new Error(
+            `Please check your environment. May you forget set defaultResourceName?
               Here is the example:
                { production: false,
                  localization: {
                    defaultResourceName: 'MyProjectName'
                   }
                }`,
-            );
-          }
-
-          keys[0] = snq(() => defaultResourceName);
+          );
         }
 
-        let localization = (keys as any).reduce((acc, val) => {
-          if (acc) {
-            return acc[val];
-          }
-
-          return undefined;
-        }, state.localization.values);
+        keys[0] = snq(() => defaultResourceName);
+      }
 
-        interpolateParams = interpolateParams.filter(params => params != null);
-        if (localization && interpolateParams && interpolateParams.length) {
-          interpolateParams.forEach(param => {
-            localization = localization.replace(/[\'\"]?\{[\d]+\}[\'\"]?/, param);
-          });
+      let localization = (keys as any).reduce((acc, val) => {
+        if (acc) {
+          return acc[val];
         }
 
-        if (typeof localization !== 'string') localization = '';
-        return localization || defaultValue || key;
-      },
-    );
+        return undefined;
+      }, state.localization.values);
+
+      interpolateParams = interpolateParams.filter(params => params != null);
+      if (localization && interpolateParams && interpolateParams.length) {
+        interpolateParams.forEach(param => {
+          localization = localization.replace(/[\'\"]?\{[\d]+\}[\'\"]?/, param);
+        });
+      }
+
+      if (typeof localization !== 'string') localization = '';
+      return localization || defaultValue || key;
+    });
 
     return selector;
   }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
index 90b49e8efb..7e6beb162a 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
@@ -16,21 +16,30 @@ export class BreadcrumbComponent implements OnInit {
 
   ngOnInit(): void {
     this.show = !!this.store.selectSnapshot(state => state.LeptonLayoutState);
+    if (this.show) {
+      const splittedUrl = this.router.url.split('/').filter(chunk => chunk);
 
-    const splittedUrl = this.router.url.split('/').filter(chunk => chunk);
+      const currentUrl: ABP.FullRoute =
+        this.store.selectSnapshot(ConfigState.getRoute(splittedUrl[0])) ||
+        this.store.selectSnapshot(ConfigState.getRoute(null, null, this.router.url));
 
-    const currentUrl: ABP.FullRoute = this.store.selectSnapshot(ConfigState.getRoute(splittedUrl[0]));
-    this.segments.push(currentUrl.name);
+      if (!currentUrl) {
+        this.show = false;
+        return;
+      }
+
+      this.segments.push(currentUrl.name);
 
-    if (splittedUrl.length > 1) {
-      const [, ...arr] = splittedUrl;
+      if (splittedUrl.length > 1) {
+        const [, ...arr] = splittedUrl;
 
-      let childRoute: ABP.FullRoute = currentUrl;
-      for (let i = 0; i < arr.length; i++) {
-        const element = arr[i];
-        childRoute = childRoute.children.find(child => child.path === element);
+        let childRoute: ABP.FullRoute = currentUrl;
+        for (let i = 0; i < arr.length; i++) {
+          const element = arr[i];
+          childRoute = childRoute.children.find(child => child.path === element);
 
-        this.segments.push(childRoute.name);
+          this.segments.push(childRoute.name);
+        }
       }
     }
   }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts
index 85b3729bf7..bf93d11188 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts
@@ -46,4 +46,19 @@ describe('BreadcrumbComponent', () => {
     expect(elements[1]).toHaveText('Identity');
     expect(elements[2]).toHaveText('Users');
   });
+
+  it('should not display the breadcrumb', () => {
+    const router = spectator.get(Router);
+    (router as any).url = '/identity/users';
+    spectator.detectChanges();
+    expect(spectator.query('ol.breadcrumb')).toBeFalsy();
+  });
+
+  it('should not display the breadcrumb when abp route not found', () => {
+    const router = spectator.get(Router);
+    (router as any).url = '/identity/users';
+    store.selectSnapshot.mockReturnValueOnce({ LeptonLayoutState: {} });
+    spectator.detectChanges();
+    expect(spectator.query('ol.breadcrumb')).toBeFalsy();
+  });
 });

From 8488b7adad088ba9728936ed97c183c78c1f1239 Mon Sep 17 00:00:00 2001
From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
Date: Mon, 25 Nov 2019 10:00:44 +0300
Subject: [PATCH 33/75] Create labeler.yml

---
 .github/workflows/labeler.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/workflows/labeler.yml

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 0000000000..3f1b8ad3a1
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,11 @@
+name: "Pull Request Labeler"
+on:
+  pull_request:
+    branches:
+      - master
+      - dev
+jobs:
+  angular-label:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/labeler@v2

From 42532e1f68ba9943b0ebb2ff4aeefedccd072881 Mon Sep 17 00:00:00 2001
From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
Date: Mon, 25 Nov 2019 10:01:10 +0300
Subject: [PATCH 34/75] Create labeler.yml

---
 .github/labeler.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .github/labeler.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 0000000000..738b727317
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,4 @@
+ui-angular:
+  - npm/ng-packs/**/*
+  - templates/app/angular/**/*
+  - templates/module/angular/**/*

From 4a2f7e1eccdbd5c77f13a20e087805d8f0132382 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Mon, 25 Nov 2019 11:49:31 +0300
Subject: [PATCH 35/75] fix(theme-shared): bread crumb type error

---
 .../components/breadcrumb/breadcrumb.component.ts  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
index 7e6beb162a..ae7a589617 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
@@ -17,15 +17,17 @@ export class BreadcrumbComponent implements OnInit {
   ngOnInit(): void {
     this.show = !!this.store.selectSnapshot(state => state.LeptonLayoutState);
     if (this.show) {
-      const splittedUrl = this.router.url.split('/').filter(chunk => chunk);
+      let splittedUrl = this.router.url.split('/').filter(chunk => chunk);
 
-      const currentUrl: ABP.FullRoute =
-        this.store.selectSnapshot(ConfigState.getRoute(splittedUrl[0])) ||
-        this.store.selectSnapshot(ConfigState.getRoute(null, null, this.router.url));
+      let currentUrl: ABP.FullRoute = this.store.selectSnapshot(ConfigState.getRoute(splittedUrl[0]));
 
       if (!currentUrl) {
-        this.show = false;
-        return;
+        currentUrl = this.store.selectSnapshot(ConfigState.getRoute(null, null, this.router.url));
+        splittedUrl = [this.router.url];
+        if (!currentUrl) {
+          this.show = false;
+          return;
+        }
       }
 
       this.segments.push(currentUrl.name);

From 383c4f6a29d2412e9225283b0c2f8d0e8db50936 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Mon, 25 Nov 2019 11:50:05 +0300
Subject: [PATCH 36/75] fix(theme-shared): modal animation and backdrop height

---
 .../lib/components/modal/modal.component.html | 58 ++++++++++---------
 .../lib/components/modal/modal.component.ts   |  4 +-
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html
index 9b712d7199..c3168bad92 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html
@@ -1,30 +1,34 @@
-<ng-container *ngIf="visible">
-  <div id="modal-container" class="modal show {{ modalClass }}" tabindex="-1" role="dialog">
-    <div class="modal-backdrop" [@fade]="isModalOpen" (click)="close()"></div>
-    <div
-      id="abp-modal-dialog"
-      class="modal-dialog modal-{{ size }}"
-      role="document"
-      [class.modal-dialog-centered]="centered"
-      [@dialog]="isModalOpen"
-      #abpModalContent
-    >
-      <div id="abp-modal-content" class="modal-content">
-        <div id="abp-modal-header" class="modal-header">
-          <ng-container *ngTemplateOutlet="abpHeader"></ng-container>
-          ​
-          <button id="abp-modal-close-button" type="button" class="close" aria-label="Close" (click)="close()">
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-        <div id="abp-modal-body" class="modal-body">
-          <ng-container *ngTemplateOutlet="abpBody"></ng-container>
-        </div>
-        <div id="abp-modal-footer" class="modal-footer">
-          <ng-container *ngTemplateOutlet="abpFooter"></ng-container>
-        </div>
+<div
+  *ngIf="visible"
+  [@fade]="isModalOpen"
+  id="modal-container"
+  class="modal show {{ modalClass }}"
+  tabindex="-1"
+  role="dialog"
+>
+  <div class="modal-backdrop" (click)="close()"></div>
+  <div
+    id="abp-modal-dialog"
+    class="modal-dialog modal-{{ size }}"
+    role="document"
+    [class.modal-dialog-centered]="centered"
+    #abpModalContent
+  >
+    <div id="abp-modal-content" class="modal-content">
+      <div id="abp-modal-header" class="modal-header">
+        <ng-container *ngTemplateOutlet="abpHeader"></ng-container>
+        ​
+        <button id="abp-modal-close-button" type="button" class="close" aria-label="Close" (click)="close()">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div id="abp-modal-body" class="modal-body">
+        <ng-container *ngTemplateOutlet="abpBody"></ng-container>
+      </div>
+      <div id="abp-modal-footer" class="modal-footer">
+        <ng-container *ngTemplateOutlet="abpFooter"></ng-container>
       </div>
     </div>
-    <ng-content></ng-content>
   </div>
-</ng-container>
+  <ng-content></ng-content>
+</div>
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 67b510442e..f95e0093b9 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
@@ -13,7 +13,7 @@ import {
 } from '@angular/core';
 import { fromEvent, Subject } from 'rxjs';
 import { debounceTime, filter, takeUntil } from 'rxjs/operators';
-import { dialogAnimation, fadeAnimation } from '../../animations/modal.animations';
+import { fadeAnimation } from '../../animations/modal.animations';
 import { Toaster } from '../../models/toaster';
 import { ConfirmationService } from '../../services/confirmation.service';
 import { ButtonComponent } from '../button/button.component';
@@ -23,7 +23,7 @@ export type ModalSize = 'sm' | 'md' | 'lg' | 'xl';
 @Component({
   selector: 'abp-modal',
   templateUrl: './modal.component.html',
-  animations: [fadeAnimation, dialogAnimation],
+  animations: [fadeAnimation],
 })
 export class ModalComponent implements OnDestroy {
   @Input()

From 1f8c4477cf79d1d891d159580728ce8ea76d6934 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Mon, 25 Nov 2019 11:50:42 +0300
Subject: [PATCH 37/75] fix(theme-shared): wrong folder name

---
 .../src/lib/{contants => constants}/scripts.ts  |  0
 .../src/lib/{contants => constants}/styles.ts   | 16 ++++++++++++++--
 .../theme-shared/src/lib/theme-shared.module.ts | 17 +++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)
 rename npm/ng-packs/packages/theme-shared/src/lib/{contants => constants}/scripts.ts (100%)
 rename npm/ng-packs/packages/theme-shared/src/lib/{contants => constants}/styles.ts (95%)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/scripts.ts b/npm/ng-packs/packages/theme-shared/src/lib/constants/scripts.ts
similarity index 100%
rename from npm/ng-packs/packages/theme-shared/src/lib/contants/scripts.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/constants/scripts.ts
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts b/npm/ng-packs/packages/theme-shared/src/lib/constants/styles.ts
similarity index 95%
rename from npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/constants/styles.ts
index ee242277d5..0278fa5e00 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/constants/styles.ts
@@ -45,15 +45,27 @@ export default `
 }
 
 .modal-backdrop {
-  position: absolute !important;
+  position: fixed !important;
   top: 0 !important;
   left: 0 !important;
-  width: 100% !important;
+  width: calc(100% - 7px) !important;
   height: 100% !important;
   background-color: rgba(0, 0, 0, 0.6) !important;
   z-index: 1040 !important;
 }
 
+.modal::-webkit-scrollbar {
+  width: 7px;
+}
+
+.modal::-webkit-scrollbar-track {
+  background: #ddd;
+}
+
+.modal::-webkit-scrollbar-thumb {
+  background: #8a8686;
+}
+
 .modal-dialog {
   z-index: 1050 !important;
 }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index 50072f3d6d..f9cf4097cd 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -14,7 +14,7 @@ import { ModalComponent } from './components/modal/modal.component';
 import { SortOrderIconComponent } from './components/sort-order-icon/sort-order-icon.component';
 import { TableEmptyMessageComponent } from './components/table-empty-message/table-empty-message.component';
 import { ToastComponent } from './components/toast/toast.component';
-import styles from './contants/styles';
+import styles from './constants/styles';
 import { TableSortDirective } from './directives/table-sort.directive';
 import { ErrorHandler } from './handlers/error.handler';
 import { chartJsLoaded$ } from './utils/widget-utils';
@@ -29,16 +29,7 @@ export function appendScript(injector: Injector) {
     import('chart.js').then(() => chartJsLoaded$.next(true));
 
     const lazyLoadService: LazyLoadService = injector.get(LazyLoadService);
-
-    return forkJoin(
-      lazyLoadService.load(
-        null,
-        'style',
-        styles,
-        'head',
-        'afterbegin',
-      ) /* lazyLoadService.load(null, 'script', scripts) */,
-    ).toPromise();
+    return lazyLoadService.load(null, 'style', styles, 'head', 'afterbegin').toPromise();
   };
 
   return fn;
@@ -75,6 +66,8 @@ export function appendScript(injector: Injector) {
   entryComponents: [ErrorComponent],
 })
 export class ThemeSharedModule {
+  constructor(private errorHandler: ErrorHandler) {}
+
   static forRoot(options = {} as RootParams): ModuleWithProviders {
     return {
       ngModule: ThemeSharedModule,
@@ -82,7 +75,7 @@ export class ThemeSharedModule {
         {
           provide: APP_INITIALIZER,
           multi: true,
-          deps: [Injector, ErrorHandler],
+          deps: [Injector],
           useFactory: appendScript,
         },
         { provide: MessageService, useClass: MessageService },

From 47b99a7221b11770913cee997c484432bc5d160e Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Mon, 25 Nov 2019 11:50:53 +0300
Subject: [PATCH 38/75] test(theme-shared): fix errors

---
 .../lib/tests/confirmation.service.spec.ts    |  2 +-
 .../src/lib/tests/modal.component.spec.ts     | 23 +++++++++++--------
 .../src/lib/tests/toaster.service.spec.ts     | 12 ++++++----
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
index 7c2cc013b2..361ec0c020 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
@@ -22,7 +22,7 @@ describe('ConfirmationService', () => {
   let service: ConfirmationService;
   const createComponent = createComponentFactory({
     component: DummyComponent,
-    imports: [CoreModule, ThemeSharedModule, NgxsModule.forRoot(), RouterTestingModule],
+    imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
     providers: [MessageService],
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
index a22dd75000..08656ff2d7 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
@@ -77,18 +77,21 @@ describe('ModalComponent', () => {
     expect(disappearFn).toHaveBeenCalled();
   });
 
-  it('should open the confirmation popup and works correct', () => {
-    spectator.click('#abp-modal-close-button');
-    expect(disappearFn).not.toHaveBeenCalled();
+  it('should open the confirmation popup and works correct', done => {
+    setTimeout(() => {
+      spectator.click('#abp-modal-close-button');
+      expect(disappearFn).not.toHaveBeenCalled();
 
-    expect(spectator.query('p-toast')).toBeTruthy();
-    spectator.click('button#cancel');
-    expect(spectator.query('div.modal')).toBeTruthy();
+      expect(spectator.query('p-toast')).toBeTruthy();
+      spectator.click('button#cancel');
+      expect(spectator.query('div.modal')).toBeTruthy();
 
-    spectator.click('#abp-modal-close-button');
-    spectator.click('button#confirm');
-    expect(spectator.query('div.modal')).toBeFalsy();
-    expect(disappearFn).toHaveBeenCalled();
+      spectator.click('#abp-modal-close-button');
+      spectator.click('button#confirm');
+      expect(spectator.query('div.modal')).toBeFalsy();
+      expect(disappearFn).toHaveBeenCalled();
+      done();
+    }, 100);
   });
 
   it('should close with the abpClose', done => {
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
index d8f97c28b2..149ecd1fad 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
@@ -1,12 +1,11 @@
 import { CoreModule } from '@abp/ng.core';
 import { Component } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
 import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
 import { NgxsModule } from '@ngxs/store';
+import { MessageService } from 'primeng/components/common/messageservice';
 import { ToasterService } from '../services/toaster.service';
 import { ThemeSharedModule } from '../theme-shared.module';
-import { RouterModule } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import { MessageService } from 'primeng/components/common/messageservice';
 
 @Component({
   selector: 'abp-dummy',
@@ -23,7 +22,7 @@ describe('ToasterService', () => {
   let service: ToasterService;
   const createComponent = createComponentFactory({
     component: DummyComponent,
-    imports: [CoreModule, ThemeSharedModule, NgxsModule.forRoot(), RouterTestingModule],
+    imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
     providers: [MessageService],
   });
 
@@ -63,7 +62,10 @@ describe('ToasterService', () => {
   });
 
   it('should display multiple toasts', () => {
-    service.addAll([{ summary: 'summary1', detail: 'detail1' }, { summary: 'summary2', detail: 'detail2' }]);
+    service.addAll([
+      { summary: 'summary1', detail: 'detail1' },
+      { summary: 'summary2', detail: 'detail2' },
+    ]);
     spectator.detectChanges();
     expect(spectator.queryAll('div.ui-toast-summary').map(node => node.textContent.trim())).toEqual([
       'summary1',

From a23c77bfa9610d5bbff5dd02a58c4fc391409152 Mon Sep 17 00:00:00 2001
From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
Date: Mon, 25 Nov 2019 11:54:23 +0300
Subject: [PATCH 39/75] Update labeler.yml

---
 .github/workflows/labeler.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 3f1b8ad3a1..e8ec2b19db 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -9,3 +9,5 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/labeler@v2
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From 367024ed3a03a6ee945ad28db65ca1516b963753 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Mon, 25 Nov 2019 13:22:31 +0300
Subject: [PATCH 40/75] docs: add a heading

---
 docs/en/Tutorials/Angular/Part-II.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/Tutorials/Angular/Part-II.md b/docs/en/Tutorials/Angular/Part-II.md
index 4c147ad9bd..1dbfe9b5cd 100644
--- a/docs/en/Tutorials/Angular/Part-II.md
+++ b/docs/en/Tutorials/Angular/Part-II.md
@@ -249,12 +249,13 @@ export class BookListComponent implements OnInit {
 
 > The `NgbDateAdapter` converts Datepicker value to `Date` type. See the [datepicker adapters](https://ng-bootstrap.github.io/#/components/datepicker/overview) for more details.
 
+#### Create the Book Type Array
 
 Open the `book-list.component.ts` and then create an array, named `bookTypeArr`:
 
 ```js
 //...
-form: FormGroup;
+booksType = Books.BookType;
 
 bookTypeArr = Object.keys(Books.BookType).filter(
     bookType => typeof this.booksType[bookType] === 'number'

From f12c33ad62514885c2436a06c85094e0777e6cbb Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 25 Nov 2019 20:33:44 +0800
Subject: [PATCH 41/75] Change the nullable parameter of ExposeServices to a
 non-nullable type.

Resolve #2252
---
 .../Abp/DependencyInjection/ExposeServicesAttribute.cs | 10 +++++-----
 .../Abp/DependencyInjection/ExposedServiceExplorer.cs  |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
index ad808e6026..a0096ef9ac 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
@@ -9,9 +9,9 @@ namespace Volo.Abp.DependencyInjection
     {
         public Type[] ServiceTypes { get; }
 
-        public bool? IncludeDefaults { get; set; }
+        public bool IncludeDefaults { get; set; }
 
-        public bool? IncludeSelf { get; set; }
+        public bool IncludeSelf { get; set; }
 
         public ExposeServicesAttribute(params Type[] serviceTypes)
         {
@@ -22,19 +22,19 @@ namespace Volo.Abp.DependencyInjection
         {
             var serviceList = ServiceTypes.ToList();
 
-            if (IncludeDefaults == true)
+            if (IncludeDefaults)
             {
                 foreach (var type in GetDefaultServices(targetType))
                 {
                     serviceList.AddIfNotContains(type);
                 }
 
-                if (IncludeSelf != false)
+                if (IncludeSelf)
                 {
                     serviceList.AddIfNotContains(targetType);
                 }
             }
-            else if (IncludeSelf == true)
+            else if (IncludeSelf)
             {
                 serviceList.AddIfNotContains(targetType);
             }
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs
index f7324014d4..cb0d727795 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs
@@ -10,7 +10,8 @@ namespace Volo.Abp.DependencyInjection
         private static readonly ExposeServicesAttribute DefaultExposeServicesAttribute =
             new ExposeServicesAttribute
             {
-                IncludeDefaults = true
+                IncludeDefaults = true,
+                IncludeSelf = true
             };
 
         public static List<Type> GetExposedServices(Type type)

From 8ee4784bd72f9fbf3179011c97662bc900411ddc Mon Sep 17 00:00:00 2001
From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
Date: Mon, 25 Nov 2019 15:54:59 +0300
Subject: [PATCH 42/75] Update labeler.yml

---
 .github/workflows/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index e8ec2b19db..9f4887a3e0 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -5,7 +5,7 @@ on:
       - master
       - dev
 jobs:
-  angular-label:
+  labeler:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/labeler@v2

From f47edb5edd35057153e7cb740c95ec2ed9815542 Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <ebicoglu@users.noreply.github.com>
Date: Mon, 25 Nov 2019 18:59:03 +0300
Subject: [PATCH 43/75] replaced BundlingOptions with AbpBundlingOptions

---
 docs/en/AspNetCore/Bundling-Minification.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/AspNetCore/Bundling-Minification.md b/docs/en/AspNetCore/Bundling-Minification.md
index 220562935d..8868d441e1 100644
--- a/docs/en/AspNetCore/Bundling-Minification.md
+++ b/docs/en/AspNetCore/Bundling-Minification.md
@@ -114,7 +114,7 @@ public class MyWebModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        Configure<BundlingOptions>(options =>
+        Configure<AbpBundlingOptions>(options =>
         {
             options
                 .ScriptBundles
@@ -151,7 +151,7 @@ public class MyWebExtensionModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        Configure<BundlingOptions>(options =>
+        Configure<AbpBundlingOptions>(options =>
         {
             options
                 .ScriptBundles
@@ -189,7 +189,7 @@ public class MyExtensionGlobalStyleContributor : BundleContributor
 Then you can use this contributor as like below:
 
 ````C#
-services.Configure<BundlingOptions>(options =>
+services.Configure<AbpBundlingOptions>(options =>
 {
     options
         .ScriptBundles
@@ -317,7 +317,7 @@ In some specific cases, it may be needed to create a **new** bundle **inherited*
 Example:
 
 ````c#
-services.Configure<BundlingOptions>(options =>
+services.Configure<AbpBundlingOptions>(options =>
 {
     options
         .StyleBundles

From 3dd1874e04c8aebf8b4e42b86f7d8964704622b4 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 26 Nov 2019 11:54:49 +0800
Subject: [PATCH 44/75] Update example package references.

---
 .../AbpConsoleDemo/AbpConsoleDemo.csproj                    | 2 +-
 .../Acme.BookStore.BookManagement.TestBase.csproj           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/BasicConsoleApplication/AbpConsoleDemo/AbpConsoleDemo.csproj b/samples/BasicConsoleApplication/AbpConsoleDemo/AbpConsoleDemo.csproj
index 5bdcf4c9e0..a120869979 100644
--- a/samples/BasicConsoleApplication/AbpConsoleDemo/AbpConsoleDemo.csproj
+++ b/samples/BasicConsoleApplication/AbpConsoleDemo/AbpConsoleDemo.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Autofac" Version="0.20.0" />
+    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/Acme.BookStore.BookManagement.TestBase.csproj b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/Acme.BookStore.BookManagement.TestBase.csproj
index 4ba25dc74e..ddd4e15cec 100644
--- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/Acme.BookStore.BookManagement.TestBase.csproj
+++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/Acme.BookStore.BookManagement.TestBase.csproj
@@ -14,9 +14,9 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="0.21.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="0.21.0" />
-    <PackageReference Include="Volo.Abp.TestBase" Version="0.21.0" />
+    <ProjectReference Include="..\..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
+    <ProjectReference Include="..\..\..\..\..\..\framework\src\Volo.Abp.TestBase\Volo.Abp.TestBase.csproj" />
     <ProjectReference Include="..\..\src\Acme.BookStore.BookManagement.Domain\Acme.BookStore.BookManagement.Domain.csproj" />
   </ItemGroup>
 

From 1f8827a30c739bfc64edccf9f9039c76c3b1712a Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 26 Nov 2019 12:48:04 +0300
Subject: [PATCH 45/75] added tenant name to my profile mvc

---
 .../Basic/Components/Toolbar/UserMenu/Default.cshtml     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml
index 548977ffe1..d1738165d3 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml
@@ -9,7 +9,14 @@
 @model ApplicationMenu
 <div class="dropdown">
     <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        @CurrentUser.UserName
+        @if (CurrentUser.TenantId != null)
+        {
+            <small><i>@CurrentTenant.Name</i>\</small>@CurrentUser.UserName
+        }
+        else
+        {
+            @CurrentUser.UserName
+        }
     </a>
 
     @if (Model.Items.Any())

From 6e49db7d82aafca7da2d090e4adfa9fb044e938d Mon Sep 17 00:00:00 2001
From: YinChang <yincahng0626@gmail.com>
Date: Tue, 26 Nov 2019 17:55:14 +0800
Subject: [PATCH 46/75] fix (theme-basic) dropdownLanguages$ already filtered
 selected langs ,so dropdown should appear when length >0

---
 .../application-layout/application-layout.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
index 3046313407..3b7ccb366d 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
@@ -158,7 +158,7 @@
 </ng-template>
 
 <ng-template #language>
-  <li *ngIf="(dropdownLanguages$ | async)?.length > 1" class="nav-item">
+  <li *ngIf="(dropdownLanguages$ | async)?.length > 0" class="nav-item">
     <div class="dropdown" ngbDropdown #languageDropdown="ngbDropdown" display="static">
       <a
         ngbDropdownToggle

From d01c83c5c0ef367d2e75b389dbf2ece96356236b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 26 Nov 2019 15:44:11 +0300
Subject: [PATCH 47/75] Remove unnecessary Volo.Abp.AspNetCore.MultiTenancy
 dependency.

---
 .../MyCompanyName.MyProjectName.HttpApi.Host.csproj             | 1 -
 .../MyProjectNameHttpApiHostModule.cs                           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
index d4928f19e3..cb09f98247 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
@@ -17,7 +17,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
   </ItemGroup>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
index 4d06a2e634..59ba519ce4 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
@@ -13,7 +13,6 @@ using MyCompanyName.MyProjectName.MultiTenancy;
 using StackExchange.Redis;
 using Microsoft.OpenApi.Models;
 using Volo.Abp;
-using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
 using Volo.Abp.Autofac;
@@ -27,7 +26,6 @@ namespace MyCompanyName.MyProjectName
     [DependsOn(
         typeof(MyProjectNameHttpApiModule),
         typeof(AbpAutofacModule),
-        typeof(AbpAspNetCoreMultiTenancyModule),
         typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
         typeof(MyProjectNameApplicationModule),
         typeof(MyProjectNameEntityFrameworkCoreDbMigrationsModule)

From eedab03ad1634097bebf21542071933768b9e5e5 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Tue, 26 Nov 2019 17:05:34 +0300
Subject: [PATCH 48/75] feat(core): add template ref to permission directive

---
 .../lib/directives/permission.directive.ts    | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
index 68a5ae6f75..1047d6ba30 100644
--- a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
+++ b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
@@ -1,4 +1,14 @@
-import { Directive, ElementRef, Input, OnDestroy, OnInit, Optional, Renderer2 } from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  Input,
+  OnDestroy,
+  OnInit,
+  Renderer2,
+  ViewContainerRef,
+  TemplateRef,
+  Optional,
+} from '@angular/core';
 import { Store } from '@ngxs/store';
 import { ConfigState } from '../states';
 import { takeUntilDestroy } from '../utils';
@@ -9,7 +19,13 @@ import { takeUntilDestroy } from '../utils';
 export class PermissionDirective implements OnInit, OnDestroy {
   @Input('abpPermission') condition: string;
 
-  constructor(@Optional() private elRef: ElementRef, private renderer: Renderer2, private store: Store) {}
+  constructor(
+    private elRef: ElementRef,
+    private renderer: Renderer2,
+    private store: Store,
+    @Optional() private templateRef: TemplateRef<any>,
+    private vcRef: ViewContainerRef,
+  ) {}
 
   ngOnInit() {
     if (this.condition) {
@@ -17,7 +33,11 @@ export class PermissionDirective implements OnInit, OnDestroy {
         .select(ConfigState.getGrantedPolicy(this.condition))
         .pipe(takeUntilDestroy(this))
         .subscribe(isGranted => {
-          if (!isGranted) {
+          if (this.templateRef && isGranted) {
+            this.vcRef.createEmbeddedView(this.templateRef);
+          } else if (this.templateRef && !isGranted) {
+            this.vcRef.clear();
+          } else if (!isGranted && !this.templateRef) {
             this.renderer.removeChild(
               (this.elRef.nativeElement as HTMLElement).parentElement,
               this.elRef.nativeElement,

From a3d751f482d4ca4ab9b8a23896b789479376e820 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Tue, 26 Nov 2019 17:59:23 +0300
Subject: [PATCH 49/75] feat(core): support to find requiredPolicy from child
 route

---
 .../packages/core/src/lib/guards/permission.guard.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
index 97c6c3ebc8..22d3e91414 100644
--- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
+++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
 import { Store } from '@ngxs/store';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
@@ -13,8 +13,14 @@ import { ConfigState } from '../states';
 export class PermissionGuard implements CanActivate {
   constructor(private store: Store) {}
 
-  canActivate({ data }: ActivatedRouteSnapshot): Observable<boolean> {
-    const resource = snq(() => data.routes.requiredPolicy) || (data.requiredPolicy as string);
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+    let resource = snq(() => route.data.routes.requiredPolicy) || (route.data.requiredPolicy as string);
+    if (!resource) {
+      resource = snq(
+        () => route.routeConfig.children.find(child => state.url.indexOf(child.path) > -1).data.requiredPolicy,
+      );
+    }
+
     return this.store.select(ConfigState.getGrantedPolicy(resource)).pipe(
       tap(access => {
         if (!access) {

From 95563de2a414f2b96a52e63e85cf7d256dcccbaa Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 09:01:54 +0300
Subject: [PATCH 50/75] fix(core): add view clear before creating view add snq
 to permission guard

---
 .../packages/core/src/lib/directives/permission.directive.ts    | 1 +
 npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
index 1047d6ba30..54657235c8 100644
--- a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
+++ b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
@@ -34,6 +34,7 @@ export class PermissionDirective implements OnInit, OnDestroy {
         .pipe(takeUntilDestroy(this))
         .subscribe(isGranted => {
           if (this.templateRef && isGranted) {
+            this.vcRef.clear();
             this.vcRef.createEmbeddedView(this.templateRef);
           } else if (this.templateRef && !isGranted) {
             this.vcRef.clear();
diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
index 22d3e91414..e23eeb40c2 100644
--- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
+++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
@@ -14,7 +14,7 @@ export class PermissionGuard implements CanActivate {
   constructor(private store: Store) {}
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-    let resource = snq(() => route.data.routes.requiredPolicy) || (route.data.requiredPolicy as string);
+    let resource = snq(() => route.data.routes.requiredPolicy) || snq(() => route.data.requiredPolicy as string);
     if (!resource) {
       resource = snq(
         () => route.routeConfig.children.find(child => state.url.indexOf(child.path) > -1).data.requiredPolicy,

From ec7f1f3f87fe86b2c4da15b704791a112b14c5e7 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 09:02:23 +0300
Subject: [PATCH 51/75] test(core): add nest tests to permission directive and
 guard

---
 .../lib/tests/permission.directive.spec.ts    | 22 +++++++++++++++++++
 .../src/lib/tests/permission.guard.spec.ts    | 18 +++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts
index c1d324620d..9dff7425a0 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts
@@ -43,4 +43,26 @@ describe('PermissionDirective', () => {
       expect(spy.mock.calls).toHaveLength(0);
     });
   });
+
+  describe('structural', () => {
+    beforeEach(() => {
+      spectator = createDirective(`<div id="test-element" *abpPermission="'test'">Testing Permission Directive</div>`);
+      directive = spectator.directive;
+    });
+
+    it('should be created', () => {
+      expect(directive).toBeTruthy();
+    });
+
+    it('should remove the element from DOM', () => {
+      expect(spectator.query('#test-element')).toBeFalsy();
+      grantedPolicy$.next(true);
+      expect(spectator.query('#test-element')).toBeTruthy();
+      grantedPolicy$.next(false);
+      expect(spectator.query('#test-element')).toBeFalsy();
+      grantedPolicy$.next(true);
+      grantedPolicy$.next(true);
+      expect(spectator.queryAll('#test-element')).toHaveLength(1);
+    });
+  });
 });
diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts
index b358005837..a995a4c822 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts
@@ -23,7 +23,7 @@ describe('PermissionGuard', () => {
   it('should return true when the grantedPolicy is true', done => {
     store.select.andReturn(of(true));
     const spy = jest.spyOn(store, 'dispatch');
-    guard.canActivate({ data: { requiredPolicy: '' } } as any).subscribe(res => {
+    guard.canActivate({ data: { requiredPolicy: 'test' } } as any, null).subscribe(res => {
       expect(res).toBe(true);
       expect(spy.mock.calls).toHaveLength(0);
       done();
@@ -33,11 +33,25 @@ describe('PermissionGuard', () => {
   it('should return false and dispatch RestOccurError when the grantedPolicy is false', done => {
     store.select.andReturn(of(false));
     const spy = jest.spyOn(store, 'dispatch');
-    guard.canActivate({ data: { requiredPolicy: '' } } as any).subscribe(res => {
+    guard.canActivate({ data: { requiredPolicy: 'test' } } as any, null).subscribe(res => {
       expect(res).toBe(false);
       expect(spy.mock.calls[0][0] instanceof RestOccurError).toBeTruthy();
       expect((spy.mock.calls[0][0] as RestOccurError).payload).toEqual({ status: 403 });
       done();
     });
   });
+
+  it('should find the requiredPolicy from child route', done => {
+    store.select.andReturn(of(false));
+    const spy = jest.spyOn(store, 'select');
+    guard
+      .canActivate(
+        { data: {}, routeConfig: { children: [{ path: 'test', data: { requiredPolicy: 'TestPolicy' } }] } } as any,
+        { url: 'test' } as any,
+      )
+      .subscribe(() => {
+        expect(spy.mock.calls[0][0]({ auth: { grantedPolicies: { TestPolicy: true } } })).toBe(true);
+        done();
+      });
+  });
 });

From 9be940181e2d68bd9bb7af44487b81996f4431ac Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 09:02:51 +0300
Subject: [PATCH 52/75] feat(core): add toLocalISOString function to Date
 prototype

---
 npm/ng-packs/packages/core/src/lib/core.module.ts   |  1 +
 .../packages/core/src/lib/utils/date-extensions.ts  | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 npm/ng-packs/packages/core/src/lib/utils/date-extensions.ts

diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts
index 67350b88ce..b3c687672d 100644
--- a/npm/ng-packs/packages/core/src/lib/core.module.ts
+++ b/npm/ng-packs/packages/core/src/lib/core.module.ts
@@ -28,6 +28,7 @@ import { ConfigState } from './states/config.state';
 import { ProfileState } from './states/profile.state';
 import { SessionState } from './states/session.state';
 import { getInitialData, localeInitializer } from './utils/initial-utils';
+import './utils/date-extensions';
 
 @NgModule({
   imports: [
diff --git a/npm/ng-packs/packages/core/src/lib/utils/date-extensions.ts b/npm/ng-packs/packages/core/src/lib/utils/date-extensions.ts
new file mode 100644
index 0000000000..3522b000c8
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/utils/date-extensions.ts
@@ -0,0 +1,13 @@
+export {};
+
+declare global {
+  interface Date {
+    toLocalISOString(): string;
+  }
+}
+
+Date.prototype.toLocalISOString = function(this: Date): string {
+  const timezoneOffset = this.getTimezoneOffset();
+
+  return new Date(this.getTime() - timezoneOffset * 60000).toISOString();
+};

From f21917ab2bb5f5dce51dde1a5e9fbbef36bc9f90 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 09:03:20 +0300
Subject: [PATCH 53/75] fix(tenant-management): add type error control

---
 .../src/lib/components/tenants/tenants.component.ts       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 18387ea784..49fadbe674 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
@@ -77,9 +77,13 @@ export class TenantsComponent implements OnInit {
   get isDisabledSaveButton(): boolean {
     if (!this.selectedModalContent) return false;
 
-    if (this.selectedModalContent.type === 'saveConnStr' && this.defaultConnectionStringForm.invalid) {
+    if (
+      this.selectedModalContent.type === 'saveConnStr' &&
+      this.defaultConnectionStringForm &&
+      this.defaultConnectionStringForm.invalid
+    ) {
       return true;
-    } else if (this.selectedModalContent.type === 'saveTenant' && this.tenantForm.invalid) {
+    } else if (this.selectedModalContent.type === 'saveTenant' && this.tenantForm && this.tenantForm.invalid) {
       return true;
     } else {
       return false;

From d17d6b1c16dca21c682b116d2d3847f10e4856bd Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 09:07:30 +0300
Subject: [PATCH 54/75] refactor(theme-shared): rename error.component

BREAKING CHANGE: renamed error.component to http-error-wrapper.component
---
 .../http-error-wrapper.component.html}        |  2 +-
 .../http-error-wrapper.component.scss}        |  1 -
 .../http-error-wrapper.component.ts}          | 19 +++++++++++++------
 .../src/lib/handlers/error.handler.ts         |  8 ++++----
 .../src/lib/tests/error.component.spec.ts     |  8 ++++----
 .../src/lib/tests/error.handler.spec.ts       | 14 ++++++++++----
 .../src/lib/theme-shared.module.ts            |  6 +++---
 7 files changed, 35 insertions(+), 23 deletions(-)
 rename npm/ng-packs/packages/theme-shared/src/lib/components/{error/error.component.html => http-error-wrapper/http-error-wrapper.component.html} (88%)
 rename npm/ng-packs/packages/theme-shared/src/lib/components/{error/error.component.scss => http-error-wrapper/http-error-wrapper.component.scss} (87%)
 rename npm/ng-packs/packages/theme-shared/src/lib/components/{error/error.component.ts => http-error-wrapper/http-error-wrapper.component.ts} (81%)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.html
similarity index 88%
rename from npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html
rename to npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.html
index 8801240bbf..95f259225c 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.html
@@ -1,4 +1,4 @@
-<div #container id="abp-error" class="error">
+<div #container id="abp-http-error-container" class="error" [style.backgroundColor]="backgroundColor">
   <button *ngIf="!hideCloseIcon" id="abp-close-button" type="button" class="close mr-2" (click)="destroy()">
     <span aria-hidden="true">&times;</span>
   </button>
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.scss
similarity index 87%
rename from npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.scss
rename to npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.scss
index a98b5a3ca6..b9f7690a5b 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.scss
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.scss
@@ -1,7 +1,6 @@
 .error {
   position: fixed;
   top: 0;
-  background-color: #fff;
   width: 100vw;
   height: 100vh;
   z-index: 999999;
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts
similarity index 81%
rename from npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts
index 70ddce726e..35ef50bf2a 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts
@@ -1,25 +1,26 @@
 import { Config, takeUntilDestroy } from '@abp/ng.core';
 import {
   AfterViewInit,
+  ApplicationRef,
   Component,
   ComponentFactoryResolver,
   ElementRef,
   EmbeddedViewRef,
+  Injector,
   OnDestroy,
+  OnInit,
   Type,
   ViewChild,
-  ApplicationRef,
-  Injector,
 } from '@angular/core';
 import { fromEvent, Subject } from 'rxjs';
 import { debounceTime, filter } from 'rxjs/operators';
 
 @Component({
-  selector: 'abp-error',
-  templateUrl: './error.component.html',
-  styleUrls: ['error.component.scss'],
+  selector: 'abp-http-error-wrapper',
+  templateUrl: './http-error-wrapper.component.html',
+  styleUrls: ['http-error-wrapper.component.scss'],
 })
-export class ErrorComponent implements AfterViewInit, OnDestroy {
+export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnInit {
   appRef: ApplicationRef;
 
   cfRes: ComponentFactoryResolver;
@@ -38,6 +39,8 @@ export class ErrorComponent implements AfterViewInit, OnDestroy {
 
   hideCloseIcon = false;
 
+  backgroundColor: string;
+
   @ViewChild('container', { static: false })
   containerRef: ElementRef<HTMLDivElement>;
 
@@ -45,6 +48,10 @@ export class ErrorComponent implements AfterViewInit, OnDestroy {
     return this.status ? `[${this.status}]` : '';
   }
 
+  ngOnInit() {
+    this.backgroundColor = window.getComputedStyle(document.body).getPropertyValue('background-color');
+  }
+
   ngAfterViewInit() {
     if (this.customComponent) {
       const customComponentRef = this.cfRes.resolveComponentFactory(this.customComponent).create(this.injector);
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 ec0d3ac808..e4663c38aa 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
@@ -15,7 +15,7 @@ import { Navigate, RouterError, RouterState, RouterDataResolved } from '@ngxs/ro
 import { Actions, ofActionSuccessful, Store } from '@ngxs/store';
 import { Observable, Subject } from 'rxjs';
 import snq from 'snq';
-import { ErrorComponent } from '../components/error/error.component';
+import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component';
 import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common';
 import { Toaster } from '../models/toaster';
 import { ConfirmationService } from '../services/confirmation.service';
@@ -45,7 +45,7 @@ export const DEFAULT_ERROR_MESSAGES = {
 
 @Injectable({ providedIn: 'root' })
 export class ErrorHandler {
-  componentRef: ComponentRef<ErrorComponent>;
+  componentRef: ComponentRef<HttpErrorWrapperComponent>;
 
   constructor(
     private actions: Actions,
@@ -196,11 +196,11 @@ export class ErrorHandler {
     );
   }
 
-  createErrorComponent(instance: Partial<ErrorComponent>) {
+  createErrorComponent(instance: Partial<HttpErrorWrapperComponent>) {
     const renderer = this.rendererFactory.createRenderer(null, null);
     const host = renderer.selectRootElement(document.body, true);
 
-    this.componentRef = this.cfRes.resolveComponentFactory(ErrorComponent).create(this.injector);
+    this.componentRef = this.cfRes.resolveComponentFactory(HttpErrorWrapperComponent).create(this.injector);
 
     for (const key in this.componentRef.instance) {
       if (this.componentRef.instance.hasOwnProperty(key)) {
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts
index 05e303e4c9..1d1f256c68 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts
@@ -1,14 +1,14 @@
 import { SpectatorHost, createHostFactory } from '@ngneat/spectator/jest';
-import { ErrorComponent } from '../components/error/error.component';
+import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component';
 import { LocalizationPipe } from '@abp/ng.core';
 import { Store } from '@ngxs/store';
 import { Renderer2, ElementRef } from '@angular/core';
 import { Subject } from 'rxjs';
 
 describe('ErrorComponent', () => {
-  let spectator: SpectatorHost<ErrorComponent>;
+  let spectator: SpectatorHost<HttpErrorWrapperComponent>;
   const createHost = createHostFactory({
-    component: ErrorComponent,
+    component: HttpErrorWrapperComponent,
     declarations: [LocalizationPipe],
     mocks: [Store],
     providers: [
@@ -18,7 +18,7 @@ describe('ErrorComponent', () => {
   });
 
   beforeEach(() => {
-    spectator = createHost('<abp-error></abp-error>');
+    spectator = createHost('<abp-http-error-wrapper></abp-http-error-wrapper>');
     spectator.component.destroy$ = new Subject();
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
index d3265691de..88ae00a874 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
@@ -22,14 +22,17 @@ describe('ErrorHandler', () => {
     component: DummyComponent,
     imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot([])],
     stubsEnabled: false,
-    routes: [{ path: '', component: DummyComponent }, { path: 'account/login', component: RouterOutletComponent }],
+    routes: [
+      { path: '', component: DummyComponent },
+      { path: 'account/login', component: RouterOutletComponent },
+    ],
   });
 
   beforeEach(() => {
     spectator = createComponent();
     store = spectator.get(Store);
 
-    const abpError = document.querySelector('abp-error');
+    const abpError = document.querySelector('abp-http-error-wrapper');
     if (abpError) document.body.removeChild(abpError);
   });
 
@@ -133,14 +136,17 @@ describe('ErrorHandler with custom error component', () => {
       ErrorModule,
     ],
     stubsEnabled: false,
-    routes: [{ path: '', component: DummyComponent }, { path: 'account/login', component: RouterOutletComponent }],
+    routes: [
+      { path: '', component: DummyComponent },
+      { path: 'account/login', component: RouterOutletComponent },
+    ],
   });
 
   beforeEach(() => {
     spectator = createComponent();
     store = spectator.get(Store);
 
-    const abpError = document.querySelector('abp-error');
+    const abpError = document.querySelector('abp-http-error-wrapper');
     if (abpError) document.body.removeChild(abpError);
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index f9cf4097cd..7464df328a 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -8,7 +8,7 @@ import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.componen
 import { ButtonComponent } from './components/button/button.component';
 import { ChartComponent } from './components/chart/chart.component';
 import { ConfirmationComponent } from './components/confirmation/confirmation.component';
-import { ErrorComponent } from './components/error/error.component';
+import { HttpErrorWrapperComponent } from './components/http-error-wrapper/http-error-wrapper.component';
 import { LoaderBarComponent } from './components/loader-bar/loader-bar.component';
 import { ModalComponent } from './components/modal/modal.component';
 import { SortOrderIconComponent } from './components/sort-order-icon/sort-order-icon.component';
@@ -42,7 +42,7 @@ export function appendScript(injector: Injector) {
     ButtonComponent,
     ChartComponent,
     ConfirmationComponent,
-    ErrorComponent,
+    HttpErrorWrapperComponent,
     LoaderBarComponent,
     ModalComponent,
     TableEmptyMessageComponent,
@@ -63,7 +63,7 @@ export function appendScript(injector: Injector) {
     TableSortDirective,
   ],
   providers: [DatePipe],
-  entryComponents: [ErrorComponent],
+  entryComponents: [HttpErrorWrapperComponent],
 })
 export class ThemeSharedModule {
   constructor(private errorHandler: ErrorHandler) {}

From 40641a63b40c8928591c7fd342c80097cfe5fe22 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 09:26:20 +0300
Subject: [PATCH 55/75] refactor(theme-shared): add snq for type error

---
 .../http-error-wrapper/http-error-wrapper.component.ts        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts
index 35ef50bf2a..a102672ad6 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts
@@ -14,6 +14,7 @@ import {
 } from '@angular/core';
 import { fromEvent, Subject } from 'rxjs';
 import { debounceTime, filter } from 'rxjs/operators';
+import snq from 'snq';
 
 @Component({
   selector: 'abp-http-error-wrapper',
@@ -49,7 +50,8 @@ export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnIn
   }
 
   ngOnInit() {
-    this.backgroundColor = window.getComputedStyle(document.body).getPropertyValue('background-color');
+    this.backgroundColor =
+      snq(() => window.getComputedStyle(document.body).getPropertyValue('background-color')) || '#fff';
   }
 
   ngAfterViewInit() {

From b12b607fc8b9c120c33446c342a0d494b918b704 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 09:57:17 +0300
Subject: [PATCH 56/75] refactor(core): add contidion change detection to
 permission directive

---
 .../lib/directives/permission.directive.ts    | 52 ++++++++++++-------
 .../lib/tests/permission.directive.spec.ts    | 21 +++++++-
 2 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
index 54657235c8..870e4ec144 100644
--- a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
+++ b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts
@@ -8,17 +8,22 @@ import {
   ViewContainerRef,
   TemplateRef,
   Optional,
+  SimpleChanges,
+  OnChanges,
 } from '@angular/core';
 import { Store } from '@ngxs/store';
 import { ConfigState } from '../states';
 import { takeUntilDestroy } from '../utils';
+import { Subscription } from 'rxjs';
 
 @Directive({
   selector: '[abpPermission]',
 })
-export class PermissionDirective implements OnInit, OnDestroy {
+export class PermissionDirective implements OnInit, OnDestroy, OnChanges {
   @Input('abpPermission') condition: string;
 
+  subscription: Subscription;
+
   constructor(
     private elRef: ElementRef,
     private renderer: Renderer2,
@@ -27,26 +32,37 @@ export class PermissionDirective implements OnInit, OnDestroy {
     private vcRef: ViewContainerRef,
   ) {}
 
+  private check() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+    }
+
+    this.subscription = this.store
+      .select(ConfigState.getGrantedPolicy(this.condition))
+      .pipe(takeUntilDestroy(this))
+      .subscribe(isGranted => {
+        if (this.templateRef && isGranted) {
+          this.vcRef.clear();
+          this.vcRef.createEmbeddedView(this.templateRef);
+        } else if (this.templateRef && !isGranted) {
+          this.vcRef.clear();
+        } else if (!isGranted && !this.templateRef) {
+          this.renderer.removeChild((this.elRef.nativeElement as HTMLElement).parentElement, this.elRef.nativeElement);
+        }
+      });
+  }
+
   ngOnInit() {
-    if (this.condition) {
-      this.store
-        .select(ConfigState.getGrantedPolicy(this.condition))
-        .pipe(takeUntilDestroy(this))
-        .subscribe(isGranted => {
-          if (this.templateRef && isGranted) {
-            this.vcRef.clear();
-            this.vcRef.createEmbeddedView(this.templateRef);
-          } else if (this.templateRef && !isGranted) {
-            this.vcRef.clear();
-          } else if (!isGranted && !this.templateRef) {
-            this.renderer.removeChild(
-              (this.elRef.nativeElement as HTMLElement).parentElement,
-              this.elRef.nativeElement,
-            );
-          }
-        });
+    if (this.templateRef && !this.condition) {
+      this.vcRef.createEmbeddedView(this.templateRef);
     }
   }
 
   ngOnDestroy(): void {}
+
+  ngOnChanges({ condition }: SimpleChanges) {
+    if ((condition || { currentValue: null }).currentValue) {
+      this.check();
+    }
+  }
 }
diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts
index 9dff7425a0..6d9dd3964f 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts
@@ -46,7 +46,10 @@ describe('PermissionDirective', () => {
 
   describe('structural', () => {
     beforeEach(() => {
-      spectator = createDirective(`<div id="test-element" *abpPermission="'test'">Testing Permission Directive</div>`);
+      spectator = createDirective(
+        '<div id="test-element" *abpPermission="condition">Testing Permission Directive</div>',
+        { hostProps: { condition: '' } },
+      );
       directive = spectator.directive;
     });
 
@@ -55,7 +58,10 @@ describe('PermissionDirective', () => {
     });
 
     it('should remove the element from DOM', () => {
-      expect(spectator.query('#test-element')).toBeFalsy();
+      expect(spectator.query('#test-element')).toBeTruthy();
+      expect(spectator.directive.subscription).toBeUndefined();
+      spectator.setHostInput({ condition: 'test' });
+      expect(spectator.directive.subscription).toBeTruthy();
       grantedPolicy$.next(true);
       expect(spectator.query('#test-element')).toBeTruthy();
       grantedPolicy$.next(false);
@@ -64,5 +70,16 @@ describe('PermissionDirective', () => {
       grantedPolicy$.next(true);
       expect(spectator.queryAll('#test-element')).toHaveLength(1);
     });
+
+    describe('#subscription', () => {
+      it('should call the unsubscribe', () => {
+        const spy = jest.fn(() => {});
+        spectator.setHostInput({ condition: 'test' });
+        spectator.directive.subscription.unsubscribe = spy;
+        spectator.setHostInput({ condition: 'test2' });
+
+        expect(spy).toHaveBeenCalled();
+      });
+    });
   });
 });

From 20c5921072cf304930da4aa1c6ca8ed89e1f75d4 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 10:17:37 +0300
Subject: [PATCH 57/75] refactor: change abpPermission using type

---
 .../src/lib/components/roles/roles.component.html      |  8 ++++----
 .../src/lib/components/users/users.component.html      |  8 ++++----
 .../src/lib/components/tenants/tenants.component.html  | 10 +++++-----
 .../application-layout.component.html                  |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
index fa0ee93d1a..59fa3f4199 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
@@ -6,7 +6,7 @@
       </div>
       <div class="text-right col col-md-6">
         <button
-          [abpPermission]="'AbpIdentity.Roles.Create'"
+          *abpPermission="'AbpIdentity.Roles.Create'"
           id="create-role"
           class="btn btn-primary"
           type="button"
@@ -73,18 +73,18 @@
                 <i class="fa fa-cog mr-1"></i>{{ 'AbpIdentity::Actions' | abpLocalization }}
               </button>
               <div ngbDropdownMenu>
-                <button [abpPermission]="'AbpIdentity.Roles.Update'" ngbDropdownItem (click)="edit(data.id)">
+                <button *abpPermission="'AbpIdentity.Roles.Update'" ngbDropdownItem (click)="edit(data.id)">
                   {{ 'AbpIdentity::Edit' | abpLocalization }}
                 </button>
                 <button
-                  [abpPermission]="'AbpIdentity.Roles.ManagePermissions'"
+                  *abpPermission="'AbpIdentity.Roles.ManagePermissions'"
                   ngbDropdownItem
                   (click)="providerKey = data.name; visiblePermissions = true"
                 >
                   {{ 'AbpIdentity::Permissions' | abpLocalization }}
                 </button>
                 <button
-                  [abpPermission]="'AbpIdentity.Roles.Delete'"
+                  *abpPermission="'AbpIdentity.Roles.Delete'"
                   ngbDropdownItem
                   (click)="delete(data.id, data.name)"
                 >
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
index 92e7dd5773..41d8244697 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
@@ -6,7 +6,7 @@
       </div>
       <div class="text-right col col-md-6">
         <button
-          [abpPermission]="'AbpIdentity.Users.Create'"
+          *abpPermission="'AbpIdentity.Users.Create'"
           id="create-role"
           class="btn btn-primary"
           type="button"
@@ -86,18 +86,18 @@
                 <i class="fa fa-cog mr-1"></i>{{ 'AbpIdentity::Actions' | abpLocalization }}
               </button>
               <div ngbDropdownMenu>
-                <button [abpPermission]="'AbpIdentity.Users.Update'" ngbDropdownItem (click)="edit(data.id)">
+                <button *abpPermission="'AbpIdentity.Users.Update'" ngbDropdownItem (click)="edit(data.id)">
                   {{ 'AbpIdentity::Edit' | abpLocalization }}
                 </button>
                 <button
-                  [abpPermission]="'AbpIdentity.Users.ManagePermissions'"
+                  *abpPermission="'AbpIdentity.Users.ManagePermissions'"
                   ngbDropdownItem
                   (click)="providerKey = data.id; visiblePermissions = true"
                 >
                   {{ 'AbpIdentity::Permissions' | abpLocalization }}
                 </button>
                 <button
-                  [abpPermission]="'AbpIdentity.Users.Delete'"
+                  *abpPermission="'AbpIdentity.Users.Delete'"
                   ngbDropdownItem
                   (click)="delete(data.id, data.userName)"
                 >
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
index 4396f48d89..b465324501 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
@@ -6,7 +6,7 @@
       </div>
       <div class="text-right col col-md-6">
         <button
-          [abpPermission]="'AbpTenantManagement.Tenants.Create'"
+          *abpPermission="'AbpTenantManagement.Tenants.Create'"
           id="create-tenants"
           class="btn btn-primary"
           type="button"
@@ -79,28 +79,28 @@
               </button>
               <div ngbDropdownMenu>
                 <button
-                  [abpPermission]="'AbpTenantManagement.Tenants.Update'"
+                  *abpPermission="'AbpTenantManagement.Tenants.Update'"
                   ngbDropdownItem
                   (click)="editTenant(data.id)"
                 >
                   {{ 'AbpTenantManagement::Edit' | abpLocalization }}
                 </button>
                 <button
-                  [abpPermission]="'AbpTenantManagement.Tenants.ManageConnectionStrings'"
+                  *abpPermission="'AbpTenantManagement.Tenants.ManageConnectionStrings'"
                   ngbDropdownItem
                   (click)="onEditConnectionString(data.id)"
                 >
                   {{ 'AbpTenantManagement::Permission:ManageConnectionStrings' | abpLocalization }}
                 </button>
                 <button
-                  [abpPermission]="'AbpTenantManagement.Tenants.ManageFeatures'"
+                  *abpPermission="'AbpTenantManagement.Tenants.ManageFeatures'"
                   ngbDropdownItem
                   (click)="providerKey = data.id; visibleFeatures = true"
                 >
                   {{ 'AbpTenantManagement::Permission:ManageFeatures' | abpLocalization }}
                 </button>
                 <button
-                  [abpPermission]="'AbpTenantManagement.Tenants.Delete'"
+                  *abpPermission="'AbpTenantManagement.Tenants.Delete'"
                   ngbDropdownItem
                   (click)="delete(data.id, data.name)"
                 >
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
index 3046313407..0e7032bba1 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
@@ -32,7 +32,7 @@
           </ng-container>
 
           <ng-template #defaultLink let-route>
-            <li class="nav-item" [abpPermission]="route.requiredPolicy">
+            <li class="nav-item" *abpPermission="route.requiredPolicy">
               <a class="nav-link" [routerLink]="[route.url]"
                 ><i *ngIf="route.iconClass" [ngClass]="route.iconClass"></i> {{ route.name | abpLocalization }}</a
               >
@@ -42,7 +42,7 @@
           <ng-template #dropdownLink let-route>
             <li
               #navbarRootDropdown
-              [abpPermission]="route.requiredPolicy"
+              *abpPermission="route.requiredPolicy"
               [abpVisibility]="routeContainer"
               class="nav-item dropdown"
               display="static"
@@ -86,7 +86,7 @@
           </ng-template>
 
           <ng-template #defaultChild let-child>
-            <div class="dropdown-submenu" [abpPermission]="child.requiredPolicy">
+            <div class="dropdown-submenu" *abpPermission="child.requiredPolicy">
               <a class="dropdown-item" [routerLink]="[child.url]">
                 <i *ngIf="child.iconClass" [ngClass]="child.iconClass"></i>
                 {{ child.name | abpLocalization }}</a
@@ -103,7 +103,7 @@
               [display]="isDropdownChildDynamic ? 'dynamic' : 'static'"
               placement="right-top"
               [autoClose]="true"
-              [abpPermission]="child.requiredPolicy"
+              *abpPermission="child.requiredPolicy"
               (openChange)="openChange($event, childrenContainer)"
             >
               <div ngbDropdownToggle [class.dropdown-toggle]="false">

From 22051fe7eb416d1d768bac480031518bde621553 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 13:35:09 +0300
Subject: [PATCH 58/75] feat(theme-basic): add two icons

---
 .../application-layout/application-layout.component.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
index ef704a0f5d..2730c0e2ef 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
@@ -213,10 +213,10 @@
         [class.d-block]="smallScreen"
         [class.abp-mh-25]="smallScreen && currentUserDropdown.isOpen()"
       >
-        <a class="dropdown-item" routerLink="/account/manage-profile">{{
+        <a class="dropdown-item" routerLink="/account/manage-profile"><i class="fa fa-cog mr-1"></i>{{
           'AbpAccount::ManageYourProfile' | abpLocalization
         }}</a>
-        <a class="dropdown-item" href="javascript:void(0)" (click)="logout()">{{
+        <a class="dropdown-item" href="javascript:void(0)" (click)="logout()"><i class="fa fa-power-off mr-1"></i>{{
           'AbpUi::Logout' | abpLocalization
         }}</a>
       </div>

From 6142b3164790093ce9c4f6e018ca26acee3c5f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 27 Nov 2019 15:21:48 +0300
Subject: [PATCH 59/75] Upgrade npm packages

---
 .../yarn.lock                                 | 222 +++++++++---------
 .../yarn.lock                                 | 222 +++++++++---------
 .../yarn.lock                                 | 222 +++++++++---------
 3 files changed, 333 insertions(+), 333 deletions(-)

diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
index 8721816bcc..c6bcef6b4f 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.2.tgz#4adf25fe08eb3e46e9195e5edf55890dd3b306c6"
-  integrity sha512-0CQiSuuauiEGRnX4GwyzY8Dk//0CUGsiw/m/YMx+4ekRGsg0RfheqY5yzx53KxGGGXIwEPwqtePp4OgGLE21uQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.3.tgz#490ba918cad5052bf580f264b1616ed03e935494"
+  integrity sha512-+ojuIFfNRMh8B45AoQW01cmqwQvsiSU5cSIbyAZdFhQlJZ/T8mPm9sGz7wvn0RUk/S31/RKFDWTnL70l95Qk1g==
   dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.2"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.3"
 
-"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.2.tgz#1d64a4b2455335449cdd320c7b7f2d17dcdb6af8"
-  integrity sha512-0hvTUuXazF4+w8XhctVEwm5itQdgaVbEYIyHibBhW4ItP/NlgSiTxJ4LoSt6NXJZphVuc2K3sY3ZETQgNVH+cQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "^1.0.2"
-    "@abp/bootstrap" "^1.0.2"
-    "@abp/bootstrap-datepicker" "^1.0.2"
-    "@abp/datatables.net-bs4" "^1.0.2"
-    "@abp/font-awesome" "^1.0.2"
-    "@abp/jquery-form" "^1.0.2"
-    "@abp/jquery-validation-unobtrusive" "^1.0.2"
-    "@abp/lodash" "^1.0.2"
-    "@abp/luxon" "^1.0.2"
-    "@abp/malihu-custom-scrollbar-plugin" "^1.0.2"
-    "@abp/select2" "^1.0.2"
-    "@abp/sweetalert" "^1.0.2"
-    "@abp/timeago" "^1.0.2"
-    "@abp/toastr" "^1.0.2"
-
-"@abp/aspnetcore.mvc.ui@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.2.tgz#0c227eb46851adf416f189933984670b8d585b38"
-  integrity sha512-B4g7pqwIAZ0y9NcLpfTmnU/YjGHB80E1tSPLRmOeIQNaOPrIab8BN0HnNekuGIGSgesc9J6VWVuA/+D1vzlyMg==
+"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.3.tgz#dd6e451f4694e191ade48abb2a6431a8ee387fa2"
+  integrity sha512-5fyEDhuDbjvpnetms/ay3nD1Z/Upsrd6ELShwEgP5X9smbtnJdFsjlFAnFJ1Aiu1h0+/w2uxDCQPXsv/G2hvpA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "^1.0.3"
+    "@abp/bootstrap" "^1.0.3"
+    "@abp/bootstrap-datepicker" "^1.0.3"
+    "@abp/datatables.net-bs4" "^1.0.3"
+    "@abp/font-awesome" "^1.0.3"
+    "@abp/jquery-form" "^1.0.3"
+    "@abp/jquery-validation-unobtrusive" "^1.0.3"
+    "@abp/lodash" "^1.0.3"
+    "@abp/luxon" "^1.0.3"
+    "@abp/malihu-custom-scrollbar-plugin" "^1.0.3"
+    "@abp/select2" "^1.0.3"
+    "@abp/sweetalert" "^1.0.3"
+    "@abp/timeago" "^1.0.3"
+    "@abp/toastr" "^1.0.3"
+
+"@abp/aspnetcore.mvc.ui@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.3.tgz#fd0ce62fe783ed1d217415599d602eadb04eff70"
+  integrity sha512-qPTve11VcyXGqSDhsUSeQZ89KeMaiX8QmcyhGJdW5Ebn84Q3S04v7LHRePG11OudB0LjlSqhWX1pBxoZO8woXw==
   dependencies:
     ansi-colors "^3.2.4"
     extend-object "^1.0.0"
@@ -41,135 +41,135 @@
     path "^0.12.7"
     rimraf "^2.6.3"
 
-"@abp/bootstrap-datepicker@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.2.tgz#36e8ee3d006740d161387c0a0f6a58bae44001ed"
-  integrity sha512-focQu8S3AIF2roG5zCB4Jvu6bTyReAB2cBAygIf+hVhQzKLQ1gbW8YVvdsyx1oPRN9ZtMoQ/bP91nu+4kXq5SA==
+"@abp/bootstrap-datepicker@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.3.tgz#d33057b3a27416f07ef9b868450e15bed32f3d32"
+  integrity sha512-ZOwg5I3VGr12xU9XlmJGMrOlwb51Uo+P8FT2c073Vtod2hn0g3n7BAtqgNE8ML2ikEZvazZtspmdk9GlqMzzzQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.2.tgz#be04792c11ca285de03bf8cc60d6c6791dddc886"
-  integrity sha512-4VP2ZOQSIT9nHRSW4r9odruR8hbq5gsyb6p8W4BEHMU07uwZYhIM9rlyqhz1ZtztIar+IP7NGm+xoNP+eT55Fw==
+"@abp/bootstrap@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.3.tgz#444d5eb5bb3b293f94da9af6c239e408e2147c71"
+  integrity sha512-7YOUYYwdfsph5i7qeTX1RS92lcunfEAWKnkhbQjQfcjn7YVgUH/Gopi8/Kbm+A9YBgocidK6cOPoAnyYHYYjbg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     bootstrap "^4.3.1"
 
-"@abp/core@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.2.tgz#87799b82ab11bbe625a710d2f9a7022e7aa6f58e"
-  integrity sha512-jix0I2ocFpi+io74jeOfhfcn6QYgSLLWg8CZzTb7jbs5VbB2ptFERgprKdO2/LtgQRpW6oaSYj1a3l4/e2dPEQ==
+"@abp/core@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.3.tgz#b7fc32a06b7e912c9723e00d957f43d51d87e9e4"
+  integrity sha512-lCfF9N1WdI5pQyx6XML4GfTYIrlkrxiYQhJFWnjSLPCIbFz+CTPKMKb1GUt3mJDKATKjuq6w4C6Auhg2QVPPGQ==
 
-"@abp/datatables.net-bs4@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.2.tgz#12a71c08c5f371349fcafe9e2cce8abb90f2671f"
-  integrity sha512-B12dpg8jqoSTNUqr/iXQHov5eeFCeEifKtHesT4KUATWTQYcXawPsJ7cuihBA/+8hEkfixKLu15pMwMXMKVe7Q==
+"@abp/datatables.net-bs4@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.3.tgz#0b0ad9e691dcc2b53934d678c591ea46321d2dea"
+  integrity sha512-z+quV91z1C1wcBM6m2io3+B2l1tqqRzNU1ILSyNvwYIajqZqmiLmvFjXuST3S1xWY6Hj+jiLDV0Ts085uG1GAw==
   dependencies:
-    "@abp/datatables.net" "^1.0.2"
+    "@abp/datatables.net" "^1.0.3"
     datatables.net-bs4 "^1.10.20"
 
-"@abp/datatables.net@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.2.tgz#09d4cd06fab61f1cf540d23266d691110632f836"
-  integrity sha512-opueN1uVt+4crfl0OfhrsNP5hudp3yOO2IDzymyPnjKcvQOnzK6uxgTp0Rr7UiQ2RSHndIzsEy7hw/S15BKpWQ==
+"@abp/datatables.net@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.3.tgz#b887e21d1b5fd84c9a74d18fd473ddc78750cb6d"
+  integrity sha512-iKl6UJh1qG1XTNpnkzEcS68dvGr3G2y1lMdLN4W+VA8gZeVKNUhY15/bSfg7RAE7GrL8PysIKQmBU+c3F4UTqA==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     datatables.net "^1.10.20"
 
-"@abp/font-awesome@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.2.tgz#75e4b10a1a9e20daf180a27e481ad783b464c986"
-  integrity sha512-rB5vlAB9wN5O+oEqZGjZTXaTTwxD/c5x1HjLF+87/Y8cqpEdrjhj0u4qTdVZuAy48DO68Wod10hV1DbriaTQeQ==
+"@abp/font-awesome@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.3.tgz#aee86b2533939f1ebab76f8fa0c0353273f7895a"
+  integrity sha512-bJllzQe+3kt5pwy+DqDF8leq/VTq6OMdndqZe3KMjP6q6CzZecB6Uk1YJqE+LKslp4VpjCbT983uRAR94VgMqw==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     "@fortawesome/fontawesome-free" "^5.11.2"
 
-"@abp/jquery-form@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.2.tgz#0b289789c84ebae51e4ddf1886fa53637991e4c4"
-  integrity sha512-GB1+kAkDZT2vNgcyi9fTMtm7RxQolGaOPLRf2DZv8690MGYxxQuH0ugw3m3rDvwcufOhNVEukvDCZu0F0cvbEg==
+"@abp/jquery-form@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.3.tgz#77b665c5b955bd90783529de030ce1b2dcb638c2"
+  integrity sha512-VHkt5Q4g4/b2zte9FeZJPNTqIFo9MO1/TAbSRNZcRC7w9QfcwpiNH+O2clcDWdieDxPsiAvIEOtpW7NKGnb7uA==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     jquery-form "^4.2.2"
 
-"@abp/jquery-validation-unobtrusive@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.2.tgz#f6c309ea9f693025ddd8510e68b89198ee8b2a7d"
-  integrity sha512-aUssKSMLgaUpNtFCtrZh/9Vlfsy6LMXmin/DJ9rwvbgwpn7C4r4fe3OFoV8qZrGHjy3y2nX/LXH9Jq1WVlGvKg==
+"@abp/jquery-validation-unobtrusive@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.3.tgz#fcae4879130204ee5615b5a88b006e2e71b0aa9e"
+  integrity sha512-bB/os/tyPnGHklCpt57s5dQ+qkx/Nzc8AsgC6TxiSySNM3XKA94Qb22HJp5MUKAZyx7nalAHWkVlv+LrF3Eheg==
   dependencies:
-    "@abp/jquery-validation" "^1.0.2"
+    "@abp/jquery-validation" "^1.0.3"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.2.tgz#68926d3068a540cab012bc47afef724176cd55cb"
-  integrity sha512-ckjm1GcAeFQKZbf41Pfbr/WnjiWIGDbRos31qVrV718XuBhVlKygrS1yFhlsHj9oTjrBH/gAbpyMAdcQBoZsTQ==
+"@abp/jquery-validation@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.3.tgz#aebf78f97dbd48a077f7f9ab6084d74de10c6884"
+  integrity sha512-b3xyK2q1Enf02Y3BvHSNWLXhiVGrPZPA2dcNZIMpNM7ukCvPYPzzdxj0v58EwgZ7Z7bFJdA1s+2nL83nbYVKqA==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     jquery-validation "^1.19.1"
 
-"@abp/jquery@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.2.tgz#5d546ed760798e972eb876aac62b354501a30080"
-  integrity sha512-/0jztB6evW0HIhXwqZ0ny+UIcL25gG1RHw5a6W3FLMeqH9/3KSGMJtUqE9iNf0DWzvicm3E/pQm9m7dw7D0L0g==
+"@abp/jquery@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.3.tgz#fff53c82e3242fcc35ff9c8a0bbb4946405bca2d"
+  integrity sha512-Lg7q5V4kiTExf9wuMDQk0L4hF0/rDjGk2XYDt59ncorZn+yxhwPSsPQ6ewQFiiyicNTWInk7hNlapPFwx0Rw1A==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     jquery "^3.4.1"
 
-"@abp/lodash@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.2.tgz#bc4392c87e7b0ce61ee14e13f69e469f10fc3ef1"
-  integrity sha512-mFho9XqJ3vnIqWDiYzV6Nz4Iyr0/WiXdXK/YiuSl0AH6eZgF7+u+TrLcOLgxEjSUQYIwHvjkDkr7knuOzgJ/Xg==
+"@abp/lodash@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.3.tgz#7547d54013000e491ca655ea56b3094cc9bb6f19"
+  integrity sha512-SxrAjFlon22iVu1hvvfhumtaAX4l4rIXv6DDerCqQDUVhqM76ejp4VTWJMeZcOp7kZY/g4arZ9sFIVJ3EvX5UA==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     lodash "^4.17.15"
 
-"@abp/luxon@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.2.tgz#3b06e8a85b1420b7b59631f01b4bdaf7f40c9b7a"
-  integrity sha512-5TQaTs+feVfdiO5y94z7/alZoXLNjuJutQPVh8AYpyZC43H7fgJ7WH52BxtMMJGm8d3hbzAPNIxTX940TP3qTg==
+"@abp/luxon@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.3.tgz#7dde8b227852b5de8b57ea76d878c1ec9de892ea"
+  integrity sha512-cWPpCvc/xrbyEQLcmPOE3IxD6r48ZPfqp9kfRvKdHWWaWVRje78au+yUW2Izn3wkbnHQxQF0RoSIVnsinfNrzQ==
   dependencies:
     luxon "^1.17.3"
 
-"@abp/malihu-custom-scrollbar-plugin@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.2.tgz#83269122edc21335044fc8cbca99e9e608f224b5"
-  integrity sha512-pI12g+ZVlw8PA5u80mut5XOpQEXuUcRnbACwCnKO2TAhpTSecPpXh89lpnLeMPjyxAVGEOVUUBQ9fzHz0dHDTg==
+"@abp/malihu-custom-scrollbar-plugin@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.3.tgz#3488eb8bb543f1d8a678967d428913e30959c731"
+  integrity sha512-ogXZcXostXW8NubHVZ3fd0DPhiQUIqCpfdeoZ6pTf2rREcYEmUGmXtTakxd86xFe/EE/8izauSUHusn5RhwiRg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.2.tgz#4c467e9dcab3527bf930de22d7ee035acc73bab4"
-  integrity sha512-D9HnPATPZU0HsFur2NL9J0KQB0N0/6/PatdjQ53IphCW3TCAeaeYA1allsVPrCbWFU9e/c5+N26h5XMAHQHSrw==
+"@abp/select2@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.3.tgz#5b1aff33c463d22176fbe2ff390446f510c53256"
+  integrity sha512-Q1mIEQHi54P4rqLOM+qTKFd7CWNudrv4Yh7gZkqVc033lCeJUA06v/AaCV6hNmUaCIYAOnsEDIMmPCGytVfkWg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     select2 "^4.0.11"
 
-"@abp/sweetalert@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.2.tgz#56815807817e9dba238c319dcac70276a034ecf7"
-  integrity sha512-2b6kAwT7vf8ztcni684rpcQbFmeTcKecd+PXnUUwXgbKwrhTO8bQCfHe47/XLLdiBVX9n1V6Ks0Jy60pOs9+5Q==
+"@abp/sweetalert@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.3.tgz#1421f9e57ea4f26b9484b91c61c8bb2380a11bb8"
+  integrity sha512-7NHD71g4kcUpdylERaoeaY6xhcgfy1kS8njEKiHtPucG8e9FpEGzbuM/A+uifqVuM5drdsrqjWutdfJerlKqDg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     sweetalert "^2.1.2"
 
-"@abp/timeago@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.2.tgz#00ab715ab9042fcf8e5835f67041f388b45cc925"
-  integrity sha512-h4FmxlI/kv/wr8vrPgB9+d1RAE4WTQUFEfB5ytUwdSQQg6JmhKdDH4hOKg1KStprUrBm2BczvJ20VjxjLOuSrQ==
+"@abp/timeago@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.3.tgz#f91f0fadf167dbc4cad1311b091ce6664ae02469"
+  integrity sha512-SAJ66l5OacoD79J0GpfK3KdX+5g+CzoasV2tA8RguQGA9R/CZtki0OZFRRgiKReL8XxNcD7XagwPCuYN8pXT9w==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     timeago "^1.6.7"
 
-"@abp/toastr@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.2.tgz#85c2f9bc9948e489ef2a171a0460ae0a9cc8adf9"
-  integrity sha512-CCdDOPVtU5qJo7TAaadMtFg1dVq1wXZvgRRCap1ayjZvFAKOJvNjN+IEgpP27lnb/GF5UYMqsiAX8dAA0tmyvw==
+"@abp/toastr@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.3.tgz#6a44de32d82fbb18fabd6dd3fe6605f65e3802ae"
+  integrity sha512-4kza18C05h5v9azP6JvSlCdg0HqMLtdPJUPYqqzsOLWlMrcTQOeTelr+rHB3L7iYGzo8NCx81PBA1tuCDs3M7g==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     toastr "^2.1.4"
 
 "@fortawesome/fontawesome-free@^5.11.2":
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
index 8721816bcc..c6bcef6b4f 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.2.tgz#4adf25fe08eb3e46e9195e5edf55890dd3b306c6"
-  integrity sha512-0CQiSuuauiEGRnX4GwyzY8Dk//0CUGsiw/m/YMx+4ekRGsg0RfheqY5yzx53KxGGGXIwEPwqtePp4OgGLE21uQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.3.tgz#490ba918cad5052bf580f264b1616ed03e935494"
+  integrity sha512-+ojuIFfNRMh8B45AoQW01cmqwQvsiSU5cSIbyAZdFhQlJZ/T8mPm9sGz7wvn0RUk/S31/RKFDWTnL70l95Qk1g==
   dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.2"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.3"
 
-"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.2.tgz#1d64a4b2455335449cdd320c7b7f2d17dcdb6af8"
-  integrity sha512-0hvTUuXazF4+w8XhctVEwm5itQdgaVbEYIyHibBhW4ItP/NlgSiTxJ4LoSt6NXJZphVuc2K3sY3ZETQgNVH+cQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "^1.0.2"
-    "@abp/bootstrap" "^1.0.2"
-    "@abp/bootstrap-datepicker" "^1.0.2"
-    "@abp/datatables.net-bs4" "^1.0.2"
-    "@abp/font-awesome" "^1.0.2"
-    "@abp/jquery-form" "^1.0.2"
-    "@abp/jquery-validation-unobtrusive" "^1.0.2"
-    "@abp/lodash" "^1.0.2"
-    "@abp/luxon" "^1.0.2"
-    "@abp/malihu-custom-scrollbar-plugin" "^1.0.2"
-    "@abp/select2" "^1.0.2"
-    "@abp/sweetalert" "^1.0.2"
-    "@abp/timeago" "^1.0.2"
-    "@abp/toastr" "^1.0.2"
-
-"@abp/aspnetcore.mvc.ui@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.2.tgz#0c227eb46851adf416f189933984670b8d585b38"
-  integrity sha512-B4g7pqwIAZ0y9NcLpfTmnU/YjGHB80E1tSPLRmOeIQNaOPrIab8BN0HnNekuGIGSgesc9J6VWVuA/+D1vzlyMg==
+"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.3.tgz#dd6e451f4694e191ade48abb2a6431a8ee387fa2"
+  integrity sha512-5fyEDhuDbjvpnetms/ay3nD1Z/Upsrd6ELShwEgP5X9smbtnJdFsjlFAnFJ1Aiu1h0+/w2uxDCQPXsv/G2hvpA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "^1.0.3"
+    "@abp/bootstrap" "^1.0.3"
+    "@abp/bootstrap-datepicker" "^1.0.3"
+    "@abp/datatables.net-bs4" "^1.0.3"
+    "@abp/font-awesome" "^1.0.3"
+    "@abp/jquery-form" "^1.0.3"
+    "@abp/jquery-validation-unobtrusive" "^1.0.3"
+    "@abp/lodash" "^1.0.3"
+    "@abp/luxon" "^1.0.3"
+    "@abp/malihu-custom-scrollbar-plugin" "^1.0.3"
+    "@abp/select2" "^1.0.3"
+    "@abp/sweetalert" "^1.0.3"
+    "@abp/timeago" "^1.0.3"
+    "@abp/toastr" "^1.0.3"
+
+"@abp/aspnetcore.mvc.ui@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.3.tgz#fd0ce62fe783ed1d217415599d602eadb04eff70"
+  integrity sha512-qPTve11VcyXGqSDhsUSeQZ89KeMaiX8QmcyhGJdW5Ebn84Q3S04v7LHRePG11OudB0LjlSqhWX1pBxoZO8woXw==
   dependencies:
     ansi-colors "^3.2.4"
     extend-object "^1.0.0"
@@ -41,135 +41,135 @@
     path "^0.12.7"
     rimraf "^2.6.3"
 
-"@abp/bootstrap-datepicker@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.2.tgz#36e8ee3d006740d161387c0a0f6a58bae44001ed"
-  integrity sha512-focQu8S3AIF2roG5zCB4Jvu6bTyReAB2cBAygIf+hVhQzKLQ1gbW8YVvdsyx1oPRN9ZtMoQ/bP91nu+4kXq5SA==
+"@abp/bootstrap-datepicker@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.3.tgz#d33057b3a27416f07ef9b868450e15bed32f3d32"
+  integrity sha512-ZOwg5I3VGr12xU9XlmJGMrOlwb51Uo+P8FT2c073Vtod2hn0g3n7BAtqgNE8ML2ikEZvazZtspmdk9GlqMzzzQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.2.tgz#be04792c11ca285de03bf8cc60d6c6791dddc886"
-  integrity sha512-4VP2ZOQSIT9nHRSW4r9odruR8hbq5gsyb6p8W4BEHMU07uwZYhIM9rlyqhz1ZtztIar+IP7NGm+xoNP+eT55Fw==
+"@abp/bootstrap@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.3.tgz#444d5eb5bb3b293f94da9af6c239e408e2147c71"
+  integrity sha512-7YOUYYwdfsph5i7qeTX1RS92lcunfEAWKnkhbQjQfcjn7YVgUH/Gopi8/Kbm+A9YBgocidK6cOPoAnyYHYYjbg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     bootstrap "^4.3.1"
 
-"@abp/core@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.2.tgz#87799b82ab11bbe625a710d2f9a7022e7aa6f58e"
-  integrity sha512-jix0I2ocFpi+io74jeOfhfcn6QYgSLLWg8CZzTb7jbs5VbB2ptFERgprKdO2/LtgQRpW6oaSYj1a3l4/e2dPEQ==
+"@abp/core@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.3.tgz#b7fc32a06b7e912c9723e00d957f43d51d87e9e4"
+  integrity sha512-lCfF9N1WdI5pQyx6XML4GfTYIrlkrxiYQhJFWnjSLPCIbFz+CTPKMKb1GUt3mJDKATKjuq6w4C6Auhg2QVPPGQ==
 
-"@abp/datatables.net-bs4@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.2.tgz#12a71c08c5f371349fcafe9e2cce8abb90f2671f"
-  integrity sha512-B12dpg8jqoSTNUqr/iXQHov5eeFCeEifKtHesT4KUATWTQYcXawPsJ7cuihBA/+8hEkfixKLu15pMwMXMKVe7Q==
+"@abp/datatables.net-bs4@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.3.tgz#0b0ad9e691dcc2b53934d678c591ea46321d2dea"
+  integrity sha512-z+quV91z1C1wcBM6m2io3+B2l1tqqRzNU1ILSyNvwYIajqZqmiLmvFjXuST3S1xWY6Hj+jiLDV0Ts085uG1GAw==
   dependencies:
-    "@abp/datatables.net" "^1.0.2"
+    "@abp/datatables.net" "^1.0.3"
     datatables.net-bs4 "^1.10.20"
 
-"@abp/datatables.net@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.2.tgz#09d4cd06fab61f1cf540d23266d691110632f836"
-  integrity sha512-opueN1uVt+4crfl0OfhrsNP5hudp3yOO2IDzymyPnjKcvQOnzK6uxgTp0Rr7UiQ2RSHndIzsEy7hw/S15BKpWQ==
+"@abp/datatables.net@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.3.tgz#b887e21d1b5fd84c9a74d18fd473ddc78750cb6d"
+  integrity sha512-iKl6UJh1qG1XTNpnkzEcS68dvGr3G2y1lMdLN4W+VA8gZeVKNUhY15/bSfg7RAE7GrL8PysIKQmBU+c3F4UTqA==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     datatables.net "^1.10.20"
 
-"@abp/font-awesome@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.2.tgz#75e4b10a1a9e20daf180a27e481ad783b464c986"
-  integrity sha512-rB5vlAB9wN5O+oEqZGjZTXaTTwxD/c5x1HjLF+87/Y8cqpEdrjhj0u4qTdVZuAy48DO68Wod10hV1DbriaTQeQ==
+"@abp/font-awesome@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.3.tgz#aee86b2533939f1ebab76f8fa0c0353273f7895a"
+  integrity sha512-bJllzQe+3kt5pwy+DqDF8leq/VTq6OMdndqZe3KMjP6q6CzZecB6Uk1YJqE+LKslp4VpjCbT983uRAR94VgMqw==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     "@fortawesome/fontawesome-free" "^5.11.2"
 
-"@abp/jquery-form@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.2.tgz#0b289789c84ebae51e4ddf1886fa53637991e4c4"
-  integrity sha512-GB1+kAkDZT2vNgcyi9fTMtm7RxQolGaOPLRf2DZv8690MGYxxQuH0ugw3m3rDvwcufOhNVEukvDCZu0F0cvbEg==
+"@abp/jquery-form@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.3.tgz#77b665c5b955bd90783529de030ce1b2dcb638c2"
+  integrity sha512-VHkt5Q4g4/b2zte9FeZJPNTqIFo9MO1/TAbSRNZcRC7w9QfcwpiNH+O2clcDWdieDxPsiAvIEOtpW7NKGnb7uA==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     jquery-form "^4.2.2"
 
-"@abp/jquery-validation-unobtrusive@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.2.tgz#f6c309ea9f693025ddd8510e68b89198ee8b2a7d"
-  integrity sha512-aUssKSMLgaUpNtFCtrZh/9Vlfsy6LMXmin/DJ9rwvbgwpn7C4r4fe3OFoV8qZrGHjy3y2nX/LXH9Jq1WVlGvKg==
+"@abp/jquery-validation-unobtrusive@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.3.tgz#fcae4879130204ee5615b5a88b006e2e71b0aa9e"
+  integrity sha512-bB/os/tyPnGHklCpt57s5dQ+qkx/Nzc8AsgC6TxiSySNM3XKA94Qb22HJp5MUKAZyx7nalAHWkVlv+LrF3Eheg==
   dependencies:
-    "@abp/jquery-validation" "^1.0.2"
+    "@abp/jquery-validation" "^1.0.3"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.2.tgz#68926d3068a540cab012bc47afef724176cd55cb"
-  integrity sha512-ckjm1GcAeFQKZbf41Pfbr/WnjiWIGDbRos31qVrV718XuBhVlKygrS1yFhlsHj9oTjrBH/gAbpyMAdcQBoZsTQ==
+"@abp/jquery-validation@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.3.tgz#aebf78f97dbd48a077f7f9ab6084d74de10c6884"
+  integrity sha512-b3xyK2q1Enf02Y3BvHSNWLXhiVGrPZPA2dcNZIMpNM7ukCvPYPzzdxj0v58EwgZ7Z7bFJdA1s+2nL83nbYVKqA==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     jquery-validation "^1.19.1"
 
-"@abp/jquery@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.2.tgz#5d546ed760798e972eb876aac62b354501a30080"
-  integrity sha512-/0jztB6evW0HIhXwqZ0ny+UIcL25gG1RHw5a6W3FLMeqH9/3KSGMJtUqE9iNf0DWzvicm3E/pQm9m7dw7D0L0g==
+"@abp/jquery@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.3.tgz#fff53c82e3242fcc35ff9c8a0bbb4946405bca2d"
+  integrity sha512-Lg7q5V4kiTExf9wuMDQk0L4hF0/rDjGk2XYDt59ncorZn+yxhwPSsPQ6ewQFiiyicNTWInk7hNlapPFwx0Rw1A==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     jquery "^3.4.1"
 
-"@abp/lodash@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.2.tgz#bc4392c87e7b0ce61ee14e13f69e469f10fc3ef1"
-  integrity sha512-mFho9XqJ3vnIqWDiYzV6Nz4Iyr0/WiXdXK/YiuSl0AH6eZgF7+u+TrLcOLgxEjSUQYIwHvjkDkr7knuOzgJ/Xg==
+"@abp/lodash@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.3.tgz#7547d54013000e491ca655ea56b3094cc9bb6f19"
+  integrity sha512-SxrAjFlon22iVu1hvvfhumtaAX4l4rIXv6DDerCqQDUVhqM76ejp4VTWJMeZcOp7kZY/g4arZ9sFIVJ3EvX5UA==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     lodash "^4.17.15"
 
-"@abp/luxon@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.2.tgz#3b06e8a85b1420b7b59631f01b4bdaf7f40c9b7a"
-  integrity sha512-5TQaTs+feVfdiO5y94z7/alZoXLNjuJutQPVh8AYpyZC43H7fgJ7WH52BxtMMJGm8d3hbzAPNIxTX940TP3qTg==
+"@abp/luxon@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.3.tgz#7dde8b227852b5de8b57ea76d878c1ec9de892ea"
+  integrity sha512-cWPpCvc/xrbyEQLcmPOE3IxD6r48ZPfqp9kfRvKdHWWaWVRje78au+yUW2Izn3wkbnHQxQF0RoSIVnsinfNrzQ==
   dependencies:
     luxon "^1.17.3"
 
-"@abp/malihu-custom-scrollbar-plugin@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.2.tgz#83269122edc21335044fc8cbca99e9e608f224b5"
-  integrity sha512-pI12g+ZVlw8PA5u80mut5XOpQEXuUcRnbACwCnKO2TAhpTSecPpXh89lpnLeMPjyxAVGEOVUUBQ9fzHz0dHDTg==
+"@abp/malihu-custom-scrollbar-plugin@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.3.tgz#3488eb8bb543f1d8a678967d428913e30959c731"
+  integrity sha512-ogXZcXostXW8NubHVZ3fd0DPhiQUIqCpfdeoZ6pTf2rREcYEmUGmXtTakxd86xFe/EE/8izauSUHusn5RhwiRg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.2.tgz#4c467e9dcab3527bf930de22d7ee035acc73bab4"
-  integrity sha512-D9HnPATPZU0HsFur2NL9J0KQB0N0/6/PatdjQ53IphCW3TCAeaeYA1allsVPrCbWFU9e/c5+N26h5XMAHQHSrw==
+"@abp/select2@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.3.tgz#5b1aff33c463d22176fbe2ff390446f510c53256"
+  integrity sha512-Q1mIEQHi54P4rqLOM+qTKFd7CWNudrv4Yh7gZkqVc033lCeJUA06v/AaCV6hNmUaCIYAOnsEDIMmPCGytVfkWg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     select2 "^4.0.11"
 
-"@abp/sweetalert@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.2.tgz#56815807817e9dba238c319dcac70276a034ecf7"
-  integrity sha512-2b6kAwT7vf8ztcni684rpcQbFmeTcKecd+PXnUUwXgbKwrhTO8bQCfHe47/XLLdiBVX9n1V6Ks0Jy60pOs9+5Q==
+"@abp/sweetalert@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.3.tgz#1421f9e57ea4f26b9484b91c61c8bb2380a11bb8"
+  integrity sha512-7NHD71g4kcUpdylERaoeaY6xhcgfy1kS8njEKiHtPucG8e9FpEGzbuM/A+uifqVuM5drdsrqjWutdfJerlKqDg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     sweetalert "^2.1.2"
 
-"@abp/timeago@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.2.tgz#00ab715ab9042fcf8e5835f67041f388b45cc925"
-  integrity sha512-h4FmxlI/kv/wr8vrPgB9+d1RAE4WTQUFEfB5ytUwdSQQg6JmhKdDH4hOKg1KStprUrBm2BczvJ20VjxjLOuSrQ==
+"@abp/timeago@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.3.tgz#f91f0fadf167dbc4cad1311b091ce6664ae02469"
+  integrity sha512-SAJ66l5OacoD79J0GpfK3KdX+5g+CzoasV2tA8RguQGA9R/CZtki0OZFRRgiKReL8XxNcD7XagwPCuYN8pXT9w==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     timeago "^1.6.7"
 
-"@abp/toastr@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.2.tgz#85c2f9bc9948e489ef2a171a0460ae0a9cc8adf9"
-  integrity sha512-CCdDOPVtU5qJo7TAaadMtFg1dVq1wXZvgRRCap1ayjZvFAKOJvNjN+IEgpP27lnb/GF5UYMqsiAX8dAA0tmyvw==
+"@abp/toastr@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.3.tgz#6a44de32d82fbb18fabd6dd3fe6605f65e3802ae"
+  integrity sha512-4kza18C05h5v9azP6JvSlCdg0HqMLtdPJUPYqqzsOLWlMrcTQOeTelr+rHB3L7iYGzo8NCx81PBA1tuCDs3M7g==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     toastr "^2.1.4"
 
 "@fortawesome/fontawesome-free@^5.11.2":
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
index e2ff6d06ff..50b6dc5d87 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.2.tgz#4adf25fe08eb3e46e9195e5edf55890dd3b306c6"
-  integrity sha512-0CQiSuuauiEGRnX4GwyzY8Dk//0CUGsiw/m/YMx+4ekRGsg0RfheqY5yzx53KxGGGXIwEPwqtePp4OgGLE21uQ==
+"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.3.tgz#490ba918cad5052bf580f264b1616ed03e935494"
+  integrity sha512-+ojuIFfNRMh8B45AoQW01cmqwQvsiSU5cSIbyAZdFhQlJZ/T8mPm9sGz7wvn0RUk/S31/RKFDWTnL70l95Qk1g==
   dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.2"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.3"
 
-"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.2.tgz#1d64a4b2455335449cdd320c7b7f2d17dcdb6af8"
-  integrity sha512-0hvTUuXazF4+w8XhctVEwm5itQdgaVbEYIyHibBhW4ItP/NlgSiTxJ4LoSt6NXJZphVuc2K3sY3ZETQgNVH+cQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "^1.0.2"
-    "@abp/bootstrap" "^1.0.2"
-    "@abp/bootstrap-datepicker" "^1.0.2"
-    "@abp/datatables.net-bs4" "^1.0.2"
-    "@abp/font-awesome" "^1.0.2"
-    "@abp/jquery-form" "^1.0.2"
-    "@abp/jquery-validation-unobtrusive" "^1.0.2"
-    "@abp/lodash" "^1.0.2"
-    "@abp/luxon" "^1.0.2"
-    "@abp/malihu-custom-scrollbar-plugin" "^1.0.2"
-    "@abp/select2" "^1.0.2"
-    "@abp/sweetalert" "^1.0.2"
-    "@abp/timeago" "^1.0.2"
-    "@abp/toastr" "^1.0.2"
-
-"@abp/aspnetcore.mvc.ui@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.2.tgz#0c227eb46851adf416f189933984670b8d585b38"
-  integrity sha512-B4g7pqwIAZ0y9NcLpfTmnU/YjGHB80E1tSPLRmOeIQNaOPrIab8BN0HnNekuGIGSgesc9J6VWVuA/+D1vzlyMg==
+"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.3.tgz#dd6e451f4694e191ade48abb2a6431a8ee387fa2"
+  integrity sha512-5fyEDhuDbjvpnetms/ay3nD1Z/Upsrd6ELShwEgP5X9smbtnJdFsjlFAnFJ1Aiu1h0+/w2uxDCQPXsv/G2hvpA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "^1.0.3"
+    "@abp/bootstrap" "^1.0.3"
+    "@abp/bootstrap-datepicker" "^1.0.3"
+    "@abp/datatables.net-bs4" "^1.0.3"
+    "@abp/font-awesome" "^1.0.3"
+    "@abp/jquery-form" "^1.0.3"
+    "@abp/jquery-validation-unobtrusive" "^1.0.3"
+    "@abp/lodash" "^1.0.3"
+    "@abp/luxon" "^1.0.3"
+    "@abp/malihu-custom-scrollbar-plugin" "^1.0.3"
+    "@abp/select2" "^1.0.3"
+    "@abp/sweetalert" "^1.0.3"
+    "@abp/timeago" "^1.0.3"
+    "@abp/toastr" "^1.0.3"
+
+"@abp/aspnetcore.mvc.ui@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.3.tgz#fd0ce62fe783ed1d217415599d602eadb04eff70"
+  integrity sha512-qPTve11VcyXGqSDhsUSeQZ89KeMaiX8QmcyhGJdW5Ebn84Q3S04v7LHRePG11OudB0LjlSqhWX1pBxoZO8woXw==
   dependencies:
     ansi-colors "^3.2.4"
     extend-object "^1.0.0"
@@ -41,135 +41,135 @@
     path "^0.12.7"
     rimraf "^2.6.3"
 
-"@abp/bootstrap-datepicker@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.2.tgz#36e8ee3d006740d161387c0a0f6a58bae44001ed"
-  integrity sha512-focQu8S3AIF2roG5zCB4Jvu6bTyReAB2cBAygIf+hVhQzKLQ1gbW8YVvdsyx1oPRN9ZtMoQ/bP91nu+4kXq5SA==
+"@abp/bootstrap-datepicker@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.3.tgz#d33057b3a27416f07ef9b868450e15bed32f3d32"
+  integrity sha512-ZOwg5I3VGr12xU9XlmJGMrOlwb51Uo+P8FT2c073Vtod2hn0g3n7BAtqgNE8ML2ikEZvazZtspmdk9GlqMzzzQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.2.tgz#be04792c11ca285de03bf8cc60d6c6791dddc886"
-  integrity sha512-4VP2ZOQSIT9nHRSW4r9odruR8hbq5gsyb6p8W4BEHMU07uwZYhIM9rlyqhz1ZtztIar+IP7NGm+xoNP+eT55Fw==
+"@abp/bootstrap@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.3.tgz#444d5eb5bb3b293f94da9af6c239e408e2147c71"
+  integrity sha512-7YOUYYwdfsph5i7qeTX1RS92lcunfEAWKnkhbQjQfcjn7YVgUH/Gopi8/Kbm+A9YBgocidK6cOPoAnyYHYYjbg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     bootstrap "^4.3.1"
 
-"@abp/core@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.2.tgz#87799b82ab11bbe625a710d2f9a7022e7aa6f58e"
-  integrity sha512-jix0I2ocFpi+io74jeOfhfcn6QYgSLLWg8CZzTb7jbs5VbB2ptFERgprKdO2/LtgQRpW6oaSYj1a3l4/e2dPEQ==
+"@abp/core@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.3.tgz#b7fc32a06b7e912c9723e00d957f43d51d87e9e4"
+  integrity sha512-lCfF9N1WdI5pQyx6XML4GfTYIrlkrxiYQhJFWnjSLPCIbFz+CTPKMKb1GUt3mJDKATKjuq6w4C6Auhg2QVPPGQ==
 
-"@abp/datatables.net-bs4@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.2.tgz#12a71c08c5f371349fcafe9e2cce8abb90f2671f"
-  integrity sha512-B12dpg8jqoSTNUqr/iXQHov5eeFCeEifKtHesT4KUATWTQYcXawPsJ7cuihBA/+8hEkfixKLu15pMwMXMKVe7Q==
+"@abp/datatables.net-bs4@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.3.tgz#0b0ad9e691dcc2b53934d678c591ea46321d2dea"
+  integrity sha512-z+quV91z1C1wcBM6m2io3+B2l1tqqRzNU1ILSyNvwYIajqZqmiLmvFjXuST3S1xWY6Hj+jiLDV0Ts085uG1GAw==
   dependencies:
-    "@abp/datatables.net" "^1.0.2"
+    "@abp/datatables.net" "^1.0.3"
     datatables.net-bs4 "^1.10.20"
 
-"@abp/datatables.net@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.2.tgz#09d4cd06fab61f1cf540d23266d691110632f836"
-  integrity sha512-opueN1uVt+4crfl0OfhrsNP5hudp3yOO2IDzymyPnjKcvQOnzK6uxgTp0Rr7UiQ2RSHndIzsEy7hw/S15BKpWQ==
+"@abp/datatables.net@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.3.tgz#b887e21d1b5fd84c9a74d18fd473ddc78750cb6d"
+  integrity sha512-iKl6UJh1qG1XTNpnkzEcS68dvGr3G2y1lMdLN4W+VA8gZeVKNUhY15/bSfg7RAE7GrL8PysIKQmBU+c3F4UTqA==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     datatables.net "^1.10.20"
 
-"@abp/font-awesome@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.2.tgz#75e4b10a1a9e20daf180a27e481ad783b464c986"
-  integrity sha512-rB5vlAB9wN5O+oEqZGjZTXaTTwxD/c5x1HjLF+87/Y8cqpEdrjhj0u4qTdVZuAy48DO68Wod10hV1DbriaTQeQ==
+"@abp/font-awesome@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.3.tgz#aee86b2533939f1ebab76f8fa0c0353273f7895a"
+  integrity sha512-bJllzQe+3kt5pwy+DqDF8leq/VTq6OMdndqZe3KMjP6q6CzZecB6Uk1YJqE+LKslp4VpjCbT983uRAR94VgMqw==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     "@fortawesome/fontawesome-free" "^5.11.2"
 
-"@abp/jquery-form@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.2.tgz#0b289789c84ebae51e4ddf1886fa53637991e4c4"
-  integrity sha512-GB1+kAkDZT2vNgcyi9fTMtm7RxQolGaOPLRf2DZv8690MGYxxQuH0ugw3m3rDvwcufOhNVEukvDCZu0F0cvbEg==
+"@abp/jquery-form@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.3.tgz#77b665c5b955bd90783529de030ce1b2dcb638c2"
+  integrity sha512-VHkt5Q4g4/b2zte9FeZJPNTqIFo9MO1/TAbSRNZcRC7w9QfcwpiNH+O2clcDWdieDxPsiAvIEOtpW7NKGnb7uA==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     jquery-form "^4.2.2"
 
-"@abp/jquery-validation-unobtrusive@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.2.tgz#f6c309ea9f693025ddd8510e68b89198ee8b2a7d"
-  integrity sha512-aUssKSMLgaUpNtFCtrZh/9Vlfsy6LMXmin/DJ9rwvbgwpn7C4r4fe3OFoV8qZrGHjy3y2nX/LXH9Jq1WVlGvKg==
+"@abp/jquery-validation-unobtrusive@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.3.tgz#fcae4879130204ee5615b5a88b006e2e71b0aa9e"
+  integrity sha512-bB/os/tyPnGHklCpt57s5dQ+qkx/Nzc8AsgC6TxiSySNM3XKA94Qb22HJp5MUKAZyx7nalAHWkVlv+LrF3Eheg==
   dependencies:
-    "@abp/jquery-validation" "^1.0.2"
+    "@abp/jquery-validation" "^1.0.3"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.2.tgz#68926d3068a540cab012bc47afef724176cd55cb"
-  integrity sha512-ckjm1GcAeFQKZbf41Pfbr/WnjiWIGDbRos31qVrV718XuBhVlKygrS1yFhlsHj9oTjrBH/gAbpyMAdcQBoZsTQ==
+"@abp/jquery-validation@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.3.tgz#aebf78f97dbd48a077f7f9ab6084d74de10c6884"
+  integrity sha512-b3xyK2q1Enf02Y3BvHSNWLXhiVGrPZPA2dcNZIMpNM7ukCvPYPzzdxj0v58EwgZ7Z7bFJdA1s+2nL83nbYVKqA==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     jquery-validation "^1.19.1"
 
-"@abp/jquery@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.2.tgz#5d546ed760798e972eb876aac62b354501a30080"
-  integrity sha512-/0jztB6evW0HIhXwqZ0ny+UIcL25gG1RHw5a6W3FLMeqH9/3KSGMJtUqE9iNf0DWzvicm3E/pQm9m7dw7D0L0g==
+"@abp/jquery@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.3.tgz#fff53c82e3242fcc35ff9c8a0bbb4946405bca2d"
+  integrity sha512-Lg7q5V4kiTExf9wuMDQk0L4hF0/rDjGk2XYDt59ncorZn+yxhwPSsPQ6ewQFiiyicNTWInk7hNlapPFwx0Rw1A==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     jquery "^3.4.1"
 
-"@abp/lodash@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.2.tgz#bc4392c87e7b0ce61ee14e13f69e469f10fc3ef1"
-  integrity sha512-mFho9XqJ3vnIqWDiYzV6Nz4Iyr0/WiXdXK/YiuSl0AH6eZgF7+u+TrLcOLgxEjSUQYIwHvjkDkr7knuOzgJ/Xg==
+"@abp/lodash@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.3.tgz#7547d54013000e491ca655ea56b3094cc9bb6f19"
+  integrity sha512-SxrAjFlon22iVu1hvvfhumtaAX4l4rIXv6DDerCqQDUVhqM76ejp4VTWJMeZcOp7kZY/g4arZ9sFIVJ3EvX5UA==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     lodash "^4.17.15"
 
-"@abp/luxon@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.2.tgz#3b06e8a85b1420b7b59631f01b4bdaf7f40c9b7a"
-  integrity sha512-5TQaTs+feVfdiO5y94z7/alZoXLNjuJutQPVh8AYpyZC43H7fgJ7WH52BxtMMJGm8d3hbzAPNIxTX940TP3qTg==
+"@abp/luxon@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.3.tgz#7dde8b227852b5de8b57ea76d878c1ec9de892ea"
+  integrity sha512-cWPpCvc/xrbyEQLcmPOE3IxD6r48ZPfqp9kfRvKdHWWaWVRje78au+yUW2Izn3wkbnHQxQF0RoSIVnsinfNrzQ==
   dependencies:
     luxon "^1.17.3"
 
-"@abp/malihu-custom-scrollbar-plugin@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.2.tgz#83269122edc21335044fc8cbca99e9e608f224b5"
-  integrity sha512-pI12g+ZVlw8PA5u80mut5XOpQEXuUcRnbACwCnKO2TAhpTSecPpXh89lpnLeMPjyxAVGEOVUUBQ9fzHz0dHDTg==
+"@abp/malihu-custom-scrollbar-plugin@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.3.tgz#3488eb8bb543f1d8a678967d428913e30959c731"
+  integrity sha512-ogXZcXostXW8NubHVZ3fd0DPhiQUIqCpfdeoZ6pTf2rREcYEmUGmXtTakxd86xFe/EE/8izauSUHusn5RhwiRg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.2.tgz#4c467e9dcab3527bf930de22d7ee035acc73bab4"
-  integrity sha512-D9HnPATPZU0HsFur2NL9J0KQB0N0/6/PatdjQ53IphCW3TCAeaeYA1allsVPrCbWFU9e/c5+N26h5XMAHQHSrw==
+"@abp/select2@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.3.tgz#5b1aff33c463d22176fbe2ff390446f510c53256"
+  integrity sha512-Q1mIEQHi54P4rqLOM+qTKFd7CWNudrv4Yh7gZkqVc033lCeJUA06v/AaCV6hNmUaCIYAOnsEDIMmPCGytVfkWg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     select2 "^4.0.11"
 
-"@abp/sweetalert@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.2.tgz#56815807817e9dba238c319dcac70276a034ecf7"
-  integrity sha512-2b6kAwT7vf8ztcni684rpcQbFmeTcKecd+PXnUUwXgbKwrhTO8bQCfHe47/XLLdiBVX9n1V6Ks0Jy60pOs9+5Q==
+"@abp/sweetalert@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.3.tgz#1421f9e57ea4f26b9484b91c61c8bb2380a11bb8"
+  integrity sha512-7NHD71g4kcUpdylERaoeaY6xhcgfy1kS8njEKiHtPucG8e9FpEGzbuM/A+uifqVuM5drdsrqjWutdfJerlKqDg==
   dependencies:
-    "@abp/core" "^1.0.2"
+    "@abp/core" "^1.0.3"
     sweetalert "^2.1.2"
 
-"@abp/timeago@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.2.tgz#00ab715ab9042fcf8e5835f67041f388b45cc925"
-  integrity sha512-h4FmxlI/kv/wr8vrPgB9+d1RAE4WTQUFEfB5ytUwdSQQg6JmhKdDH4hOKg1KStprUrBm2BczvJ20VjxjLOuSrQ==
+"@abp/timeago@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.3.tgz#f91f0fadf167dbc4cad1311b091ce6664ae02469"
+  integrity sha512-SAJ66l5OacoD79J0GpfK3KdX+5g+CzoasV2tA8RguQGA9R/CZtki0OZFRRgiKReL8XxNcD7XagwPCuYN8pXT9w==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     timeago "^1.6.7"
 
-"@abp/toastr@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.2.tgz#85c2f9bc9948e489ef2a171a0460ae0a9cc8adf9"
-  integrity sha512-CCdDOPVtU5qJo7TAaadMtFg1dVq1wXZvgRRCap1ayjZvFAKOJvNjN+IEgpP27lnb/GF5UYMqsiAX8dAA0tmyvw==
+"@abp/toastr@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.3.tgz#6a44de32d82fbb18fabd6dd3fe6605f65e3802ae"
+  integrity sha512-4kza18C05h5v9azP6JvSlCdg0HqMLtdPJUPYqqzsOLWlMrcTQOeTelr+rHB3L7iYGzo8NCx81PBA1tuCDs3M7g==
   dependencies:
-    "@abp/jquery" "^1.0.2"
+    "@abp/jquery" "^1.0.3"
     toastr "^2.1.4"
 
 "@fortawesome/fontawesome-free@^5.11.2":

From 15e51aea7e6668739a71e968cd228a71f77677ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 27 Nov 2019 15:41:50 +0300
Subject: [PATCH 60/75] Recreate the initial migration

---
 ....cs => 20191127123650_Initial.Designer.cs} | 346 +++++++++++++-----
 ...5_Initial.cs => 20191127123650_Initial.cs} |   3 +-
 .../UnifiedDbContextModelSnapshot.cs          | 344 ++++++++++++-----
 3 files changed, 492 insertions(+), 201 deletions(-)
 rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/{20190527144415_Initial.Designer.cs => 20191127123650_Initial.Designer.cs} (59%)
 rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/{20190527144415_Initial.cs => 20191127123650_Initial.cs} (99%)

diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.Designer.cs
similarity index 59%
rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.Designer.cs
rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.Designer.cs
index 124d07b6ea..4a9904eeec 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.Designer.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.Designer.cs
@@ -10,91 +10,113 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore;
 namespace MyCompanyName.MyProjectName.Migrations
 {
     [DbContext(typeof(UnifiedDbContext))]
-    [Migration("20190527144415_Initial")]
+    [Migration("20191127123650_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("ProductVersion", "3.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ApplicationName")
                         .HasColumnName("ApplicationName")
+                        .HasColumnType("nvarchar(96)")
                         .HasMaxLength(96);
 
                     b.Property<string>("BrowserInfo")
                         .HasColumnName("BrowserInfo")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("ClientId")
                         .HasColumnName("ClientId")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ClientIpAddress")
                         .HasColumnName("ClientIpAddress")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ClientName")
                         .HasColumnName("ClientName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("Comments")
                         .HasColumnName("Comments")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
-                    b.Property<string>("ConcurrencyStamp");
+                    b.Property<string>("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("CorrelationId")
                         .HasColumnName("CorrelationId")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Exceptions")
                         .HasColumnName("Exceptions")
+                        .HasColumnType("nvarchar(4000)")
                         .HasMaxLength(4000);
 
                     b.Property<int>("ExecutionDuration")
-                        .HasColumnName("ExecutionDuration");
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
 
-                    b.Property<DateTime>("ExecutionTime");
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("HttpMethod")
                         .HasColumnName("HttpMethod")
+                        .HasColumnType("nvarchar(16)")
                         .HasMaxLength(16);
 
                     b.Property<int?>("HttpStatusCode")
-                        .HasColumnName("HttpStatusCode");
+                        .HasColumnName("HttpStatusCode")
+                        .HasColumnType("int");
 
                     b.Property<Guid?>("ImpersonatorTenantId")
-                        .HasColumnName("ImpersonatorTenantId");
+                        .HasColumnName("ImpersonatorTenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("ImpersonatorUserId")
-                        .HasColumnName("ImpersonatorUserId");
+                        .HasColumnName("ImpersonatorUserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("TenantName");
+                    b.Property<string>("TenantName")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("Url")
                         .HasColumnName("Url")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<Guid?>("UserId")
-                        .HasColumnName("UserId");
+                        .HasColumnName("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("UserName")
                         .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.HasKey("Id");
@@ -109,33 +131,42 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid>("AuditLogId")
-                        .HasColumnName("AuditLogId");
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<int>("ExecutionDuration")
-                        .HasColumnName("ExecutionDuration");
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
 
                     b.Property<DateTime>("ExecutionTime")
-                        .HasColumnName("ExecutionTime");
+                        .HasColumnName("ExecutionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("MethodName")
                         .HasColumnName("MethodName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("Parameters")
                         .HasColumnName("Parameters")
+                        .HasColumnType("nvarchar(2000)")
                         .HasMaxLength(2000);
 
                     b.Property<string>("ServiceName")
                         .HasColumnName("ServiceName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -149,34 +180,43 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid>("AuditLogId")
-                        .HasColumnName("AuditLogId");
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<DateTime>("ChangeTime")
-                        .HasColumnName("ChangeTime");
+                        .HasColumnName("ChangeTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<byte>("ChangeType")
-                        .HasColumnName("ChangeType");
+                        .HasColumnName("ChangeType")
+                        .HasColumnType("tinyint");
 
                     b.Property<string>("EntityId")
                         .IsRequired()
                         .HasColumnName("EntityId")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<Guid?>("EntityTenantId");
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("EntityTypeFullName")
                         .IsRequired()
                         .HasColumnName("EntityTypeFullName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -190,29 +230,36 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("EntityChangeId");
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("NewValue")
                         .HasColumnName("NewValue")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("OriginalValue")
                         .HasColumnName("OriginalValue")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("PropertyName")
                         .IsRequired()
                         .HasColumnName("PropertyName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("PropertyTypeFullName")
                         .IsRequired()
                         .HasColumnName("PropertyTypeFullName")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -224,35 +271,45 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .IsRequired()
                         .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Description")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
-                    b.Property<bool>("IsStatic");
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("bit");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Regex")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("RegexDescription")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<bool>("Required");
+                    b.Property<bool>("Required")
+                        .HasColumnType("bit");
 
-                    b.Property<int>("ValueType");
+                    b.Property<int>("ValueType")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -262,35 +319,44 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .IsRequired()
                         .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDefault")
-                        .HasColumnName("IsDefault");
+                        .HasColumnName("IsDefault")
+                        .HasColumnType("bit");
 
                     b.Property<bool>("IsPublic")
-                        .HasColumnName("IsPublic");
+                        .HasColumnName("IsPublic")
+                        .HasColumnType("bit");
 
                     b.Property<bool>("IsStatic")
-                        .HasColumnName("IsStatic");
+                        .HasColumnName("IsStatic")
+                        .HasColumnType("bit");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -302,18 +368,22 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ClaimType")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
-                    b.Property<Guid>("RoleId");
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -325,105 +395,131 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<int>("AccessFailedCount")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("AccessFailedCount")
+                        .HasColumnType("int")
                         .HasDefaultValue(0);
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("Email")
                         .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<bool>("EmailConfirmed")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<bool>("LockoutEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("LockoutEnabled")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
-                    b.Property<DateTimeOffset?>("LockoutEnd");
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
 
                     b.Property<string>("Name")
                         .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("NormalizedEmail")
                         .HasColumnName("NormalizedEmail")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedUserName")
                         .IsRequired()
                         .HasColumnName("NormalizedUserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("PasswordHash")
                         .HasColumnName("PasswordHash")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("PhoneNumber")
                         .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
                         .HasMaxLength(16);
 
                     b.Property<bool>("PhoneNumberConfirmed")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("SecurityStamp")
                         .IsRequired()
                         .HasColumnName("SecurityStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Surname")
                         .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<bool>("TwoFactorEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("TwoFactorEnabled")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("UserName")
                         .IsRequired()
                         .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.HasKey("Id");
@@ -442,18 +538,22 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ClaimType")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -464,19 +564,24 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
                         .IsRequired()
+                        .HasColumnType("nvarchar(196)")
                         .HasMaxLength(196);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("UserId", "LoginProvider");
 
@@ -487,11 +592,14 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("RoleId");
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("UserId", "RoleId");
 
@@ -502,17 +610,22 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Name")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("Value");
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
@@ -522,21 +635,26 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -548,20 +666,25 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderName")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Value")
                         .IsRequired()
+                        .HasColumnType("nvarchar(2048)")
                         .HasMaxLength(2048);
 
                     b.HasKey("Id");
@@ -574,59 +697,72 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name")
-                        .IsUnique();
+                    b.HasIndex("Name");
 
                     b.ToTable("AbpTenants");
                 });
 
             modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
                 {
-                    b.Property<Guid>("TenantId");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Value")
                         .IsRequired()
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
                     b.HasKey("TenantId", "Name");
@@ -636,79 +772,89 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
                 {
-                    b.HasOne("Volo.Abp.AuditLogging.AuditLog")
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
                         .WithMany("Actions")
                         .HasForeignKey("AuditLogId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
-                    b.HasOne("Volo.Abp.AuditLogging.AuditLog")
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
                         .WithMany("EntityChanges")
                         .HasForeignKey("AuditLogId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
-                    b.HasOne("Volo.Abp.AuditLogging.EntityChange")
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
                         .WithMany("PropertyChanges")
                         .HasForeignKey("EntityChangeId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
                         .WithMany("Claims")
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Claims")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Logins")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
                         .WithMany()
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Roles")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Tokens")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
                 {
-                    b.HasOne("Volo.Abp.TenantManagement.Tenant")
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
                         .WithMany("ConnectionStrings")
                         .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 #pragma warning restore 612, 618
         }
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.cs
similarity index 99%
rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.cs
rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.cs
index a26ba15068..8e851efc0a 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.cs
@@ -424,8 +424,7 @@ namespace MyCompanyName.MyProjectName.Migrations
             migrationBuilder.CreateIndex(
                 name: "IX_AbpTenants_Name",
                 table: "AbpTenants",
-                column: "Name",
-                unique: true);
+                column: "Name");
 
             migrationBuilder.CreateIndex(
                 name: "IX_AbpUserClaims_UserId",
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
index a17183eb3b..dfdc590b6f 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
@@ -15,84 +15,106 @@ namespace MyCompanyName.MyProjectName.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("ProductVersion", "3.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ApplicationName")
                         .HasColumnName("ApplicationName")
+                        .HasColumnType("nvarchar(96)")
                         .HasMaxLength(96);
 
                     b.Property<string>("BrowserInfo")
                         .HasColumnName("BrowserInfo")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("ClientId")
                         .HasColumnName("ClientId")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ClientIpAddress")
                         .HasColumnName("ClientIpAddress")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ClientName")
                         .HasColumnName("ClientName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("Comments")
                         .HasColumnName("Comments")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
-                    b.Property<string>("ConcurrencyStamp");
+                    b.Property<string>("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("CorrelationId")
                         .HasColumnName("CorrelationId")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Exceptions")
                         .HasColumnName("Exceptions")
+                        .HasColumnType("nvarchar(4000)")
                         .HasMaxLength(4000);
 
                     b.Property<int>("ExecutionDuration")
-                        .HasColumnName("ExecutionDuration");
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
 
-                    b.Property<DateTime>("ExecutionTime");
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("HttpMethod")
                         .HasColumnName("HttpMethod")
+                        .HasColumnType("nvarchar(16)")
                         .HasMaxLength(16);
 
                     b.Property<int?>("HttpStatusCode")
-                        .HasColumnName("HttpStatusCode");
+                        .HasColumnName("HttpStatusCode")
+                        .HasColumnType("int");
 
                     b.Property<Guid?>("ImpersonatorTenantId")
-                        .HasColumnName("ImpersonatorTenantId");
+                        .HasColumnName("ImpersonatorTenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("ImpersonatorUserId")
-                        .HasColumnName("ImpersonatorUserId");
+                        .HasColumnName("ImpersonatorUserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("TenantName");
+                    b.Property<string>("TenantName")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("Url")
                         .HasColumnName("Url")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<Guid?>("UserId")
-                        .HasColumnName("UserId");
+                        .HasColumnName("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("UserName")
                         .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.HasKey("Id");
@@ -107,33 +129,42 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid>("AuditLogId")
-                        .HasColumnName("AuditLogId");
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<int>("ExecutionDuration")
-                        .HasColumnName("ExecutionDuration");
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
 
                     b.Property<DateTime>("ExecutionTime")
-                        .HasColumnName("ExecutionTime");
+                        .HasColumnName("ExecutionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("MethodName")
                         .HasColumnName("MethodName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("Parameters")
                         .HasColumnName("Parameters")
+                        .HasColumnType("nvarchar(2000)")
                         .HasMaxLength(2000);
 
                     b.Property<string>("ServiceName")
                         .HasColumnName("ServiceName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -147,34 +178,43 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid>("AuditLogId")
-                        .HasColumnName("AuditLogId");
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<DateTime>("ChangeTime")
-                        .HasColumnName("ChangeTime");
+                        .HasColumnName("ChangeTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<byte>("ChangeType")
-                        .HasColumnName("ChangeType");
+                        .HasColumnName("ChangeType")
+                        .HasColumnType("tinyint");
 
                     b.Property<string>("EntityId")
                         .IsRequired()
                         .HasColumnName("EntityId")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<Guid?>("EntityTenantId");
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("EntityTypeFullName")
                         .IsRequired()
                         .HasColumnName("EntityTypeFullName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -188,29 +228,36 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("EntityChangeId");
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("NewValue")
                         .HasColumnName("NewValue")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("OriginalValue")
                         .HasColumnName("OriginalValue")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("PropertyName")
                         .IsRequired()
                         .HasColumnName("PropertyName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("PropertyTypeFullName")
                         .IsRequired()
                         .HasColumnName("PropertyTypeFullName")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -222,35 +269,45 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .IsRequired()
                         .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Description")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
-                    b.Property<bool>("IsStatic");
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("bit");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Regex")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("RegexDescription")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<bool>("Required");
+                    b.Property<bool>("Required")
+                        .HasColumnType("bit");
 
-                    b.Property<int>("ValueType");
+                    b.Property<int>("ValueType")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -260,35 +317,44 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .IsRequired()
                         .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDefault")
-                        .HasColumnName("IsDefault");
+                        .HasColumnName("IsDefault")
+                        .HasColumnType("bit");
 
                     b.Property<bool>("IsPublic")
-                        .HasColumnName("IsPublic");
+                        .HasColumnName("IsPublic")
+                        .HasColumnType("bit");
 
                     b.Property<bool>("IsStatic")
-                        .HasColumnName("IsStatic");
+                        .HasColumnName("IsStatic")
+                        .HasColumnType("bit");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -300,18 +366,22 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ClaimType")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
-                    b.Property<Guid>("RoleId");
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -323,105 +393,131 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<int>("AccessFailedCount")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("AccessFailedCount")
+                        .HasColumnType("int")
                         .HasDefaultValue(0);
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("Email")
                         .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<bool>("EmailConfirmed")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<bool>("LockoutEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("LockoutEnabled")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
-                    b.Property<DateTimeOffset?>("LockoutEnd");
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
 
                     b.Property<string>("Name")
                         .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("NormalizedEmail")
                         .HasColumnName("NormalizedEmail")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedUserName")
                         .IsRequired()
                         .HasColumnName("NormalizedUserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("PasswordHash")
                         .HasColumnName("PasswordHash")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("PhoneNumber")
                         .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
                         .HasMaxLength(16);
 
                     b.Property<bool>("PhoneNumberConfirmed")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("SecurityStamp")
                         .IsRequired()
                         .HasColumnName("SecurityStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Surname")
                         .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<bool>("TwoFactorEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("TwoFactorEnabled")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("UserName")
                         .IsRequired()
                         .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.HasKey("Id");
@@ -440,18 +536,22 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ClaimType")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -462,19 +562,24 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
                         .IsRequired()
+                        .HasColumnType("nvarchar(196)")
                         .HasMaxLength(196);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("UserId", "LoginProvider");
 
@@ -485,11 +590,14 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("RoleId");
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("UserId", "RoleId");
 
@@ -500,17 +608,22 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Name")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("Value");
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
@@ -520,21 +633,26 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -546,20 +664,25 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderName")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Value")
                         .IsRequired()
+                        .HasColumnType("nvarchar(2048)")
                         .HasMaxLength(2048);
 
                     b.HasKey("Id");
@@ -572,59 +695,72 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name")
-                        .IsUnique();
+                    b.HasIndex("Name");
 
                     b.ToTable("AbpTenants");
                 });
 
             modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
                 {
-                    b.Property<Guid>("TenantId");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Value")
                         .IsRequired()
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
                     b.HasKey("TenantId", "Name");
@@ -634,79 +770,89 @@ namespace MyCompanyName.MyProjectName.Migrations
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
                 {
-                    b.HasOne("Volo.Abp.AuditLogging.AuditLog")
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
                         .WithMany("Actions")
                         .HasForeignKey("AuditLogId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
-                    b.HasOne("Volo.Abp.AuditLogging.AuditLog")
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
                         .WithMany("EntityChanges")
                         .HasForeignKey("AuditLogId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
-                    b.HasOne("Volo.Abp.AuditLogging.EntityChange")
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
                         .WithMany("PropertyChanges")
                         .HasForeignKey("EntityChangeId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
                         .WithMany("Claims")
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Claims")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Logins")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
                         .WithMany()
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Roles")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Tokens")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
                 {
-                    b.HasOne("Volo.Abp.TenantManagement.Tenant")
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
                         .WithMany("ConnectionStrings")
                         .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 #pragma warning restore 612, 618
         }

From c90366ab05ef98f7b04308e951d3869fa1a59848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 27 Nov 2019 15:55:05 +0300
Subject: [PATCH 61/75] Should completely hide the tenant switch area if
 multi-tenancy is not enabled

---
 .../Themes/Basic/Layouts/Account.cshtml            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
index 7b43c6d969..13d438441d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
@@ -53,11 +53,14 @@
     <div class="@containerClass">
         <abp-row>
             <abp-column size-md="_5" class="mx-auto">
+                @if (MultiTenancyOptions.Value.IsEnabled &&
+                    (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true))
+                { 
                 <div class="card shadow-sm rounded mb-3">
                     <div class="card-body px-5">
                         <div class="row">
                             <div class="col">
-                                <span style="font-size: .8em;" class="text-uppercase text-muted">@MultiTenancyStringLocalizer["Tenant"]</span><br />
+                                <span style="font-size: .8em;" class="text-uppercase text-muted">@MultiTenancyStringLocalizer["Tenant"]</span><br/>
                                 <h6 class="m-0 d-inline-block">
                                     @if (CurrentTenant.Id == null)
                                     {
@@ -72,15 +75,12 @@
                                 </h6>
                             </div>
                             <div class="col-auto">
-                                @if (MultiTenancyOptions.Value.IsEnabled &&
-                           (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true))
-                                { 
-                                    <a id="AbpTenantSwitchLink" href="javascript:;" class="btn btn-sm mt-3 btn-outline-primary">@MultiTenancyStringLocalizer["Switch"]</a> 
-                                }
+                                <a id="AbpTenantSwitchLink" href="javascript:;" class="btn btn-sm mt-3 btn-outline-primary">@MultiTenancyStringLocalizer["Switch"]</a>
                             </div>
                         </div>
-                    </div> 
+                    </div>
                 </div>
+                }
                 @(await Component.InvokeAsync<PageAlertsViewComponent>())
                 @RenderBody()
             </abp-column>

From 21fe6656f54189e2420044dfc5e64151bf22b261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 27 Nov 2019 15:55:36 +0300
Subject: [PATCH 62/75] Recreate the migration.

---
 ....Designer.cs => 20191127124541_Initial.Designer.cs} |  5 ++---
 ...1018080944_Initial.cs => 20191127124541_Initial.cs} |  3 +--
 ...entityServerHostMigrationsDbContextModelSnapshot.cs |  3 +--
 .../MyCompanyName.MyProjectName.IdentityServer.csproj  |  2 +-
 .../MyProjectNameIdentityServerModule.cs               | 10 ++++++++--
 5 files changed, 13 insertions(+), 10 deletions(-)
 rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/{20191018080944_Initial.Designer.cs => 20191127124541_Initial.Designer.cs} (99%)
 rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/{20191018080944_Initial.cs => 20191127124541_Initial.cs} (99%)

diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.Designer.cs
similarity index 99%
rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs
rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.Designer.cs
index 3869a52615..0733f562cd 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.Designer.cs
@@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore;
 namespace MyCompanyName.MyProjectName.Migrations
 {
     [DbContext(typeof(IdentityServerHostMigrationsDbContext))]
-    [Migration("20191018080944_Initial")]
+    [Migration("20191127124541_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -1367,8 +1367,7 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name")
-                        .IsUnique();
+                    b.HasIndex("Name");
 
                     b.ToTable("AbpTenants");
                 });
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.cs
similarity index 99%
rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs
rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.cs
index cba4297cc9..217c00a646 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.cs
@@ -820,8 +820,7 @@ namespace MyCompanyName.MyProjectName.Migrations
             migrationBuilder.CreateIndex(
                 name: "IX_AbpTenants_Name",
                 table: "AbpTenants",
-                column: "Name",
-                unique: true);
+                column: "Name");
 
             migrationBuilder.CreateIndex(
                 name: "IX_AbpUserClaims_UserId",
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs
index e4036868a3..7e25b0e36a 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs
@@ -1365,8 +1365,7 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name")
-                        .IsUnique();
+                    b.HasIndex("Name");
 
                     b.ToTable("AbpTenants");
                 });
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
index ff138edc82..31287c43cd 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.JwtBearer\Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore.SqlServer\Volo.Abp.EntityFrameworkCore.SqlServer.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.IdentityServer\Volo.Abp.Account.Web.IdentityServer.csproj" />
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
index 7179db5d08..541c7b8c07 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
@@ -10,8 +10,8 @@ using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
-using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.Auditing;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
@@ -26,6 +26,7 @@ using Volo.Abp.Identity.EntityFrameworkCore;
 using Volo.Abp.IdentityServer.EntityFrameworkCore;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.PermissionManagement.EntityFrameworkCore;
 using Volo.Abp.PermissionManagement.HttpApi;
@@ -40,7 +41,7 @@ namespace MyCompanyName.MyProjectName
 {
     [DependsOn(
         typeof(AbpAccountWebIdentityServerModule),
-        typeof(AbpAspNetCoreMultiTenancyModule),
+        typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
         typeof(AbpAspNetCoreMvcModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule),
         typeof(AbpAuditLoggingEntityFrameworkCoreModule),
@@ -115,6 +116,11 @@ namespace MyCompanyName.MyProjectName
                 options.KeyPrefix = "MyProjectName:";
             });
 
+            Configure<AbpMultiTenancyOptions>(options =>
+            {
+                options.IsEnabled = MultiTenancyConsts.IsEnabled;
+            });
+
             context.Services.AddStackExchangeRedisCache(options =>
             {
                 options.Configuration = configuration["Redis:Configuration"];

From 8a18186341277c90f8ed72993838cb47550ad6d1 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 27 Nov 2019 16:19:57 +0300
Subject: [PATCH 63/75] update command solution directory option

---
 .../Volo/Abp/Cli/Commands/UpdateCommand.cs    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
index 0f31af2eb0..a1775bb987 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
@@ -44,31 +44,37 @@ namespace Volo.Abp.Cli.Commands
             var updateNpm = commandLineArgs.Options.ContainsKey(Options.Packages.Npm);
             var updateNuget = commandLineArgs.Options.ContainsKey(Options.Packages.NuGet);
 
+            var directory = commandLineArgs.Options.GetOrNull(Options.SolutionPath.Short, Options.SolutionPath.Long);
+            if (directory == null)
+            {
+                directory = Directory.GetCurrentDirectory();
+            }
+
             var both = (updateNuget && updateNpm) || (!updateNuget && !updateNpm); 
 
             if (updateNuget || both)
             {
-                await UpdateNugetPackages(commandLineArgs);
+                await UpdateNugetPackages(commandLineArgs, directory);
             }
 
             if (updateNpm || both)
             {
-                UpdateNpmPackages();
+                UpdateNpmPackages(directory);
             }
 
         }
 
-        private void UpdateNpmPackages()
+        private void UpdateNpmPackages(string directory)
         {
-            _npmPackagesUpdater.Update(Directory.GetCurrentDirectory());
+            _npmPackagesUpdater.Update(directory);
         }
 
-        private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs)
+        private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string directory)
         {
             var includePreviews =
                 commandLineArgs.Options.GetOrNull(Options.IncludePreviews.Short, Options.IncludePreviews.Long) != null;
 
-            var solution = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln").FirstOrDefault();
+            var solution = Directory.GetFiles(directory, "*.sln").FirstOrDefault();
 
             if (solution != null)
             {
@@ -131,6 +137,12 @@ namespace Volo.Abp.Cli.Commands
 
         public static class Options
         {
+            public static class SolutionPath
+            {
+                public const string Short = "sp";
+                public const string Long = "solution-path";
+            }
+            
             public static class IncludePreviews
             {
                 public const string Short = "p";

From 4c1e4a323d24493e4e90f9410662d2c01e7cabc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 27 Nov 2019 16:21:28 +0300
Subject: [PATCH 64/75] Enable cors

---
 .../angular/src/environments/environment.ts   |  4 +--
 ...panyName.MyProjectName.HttpApi.Host.csproj |  2 +-
 .../MyProjectNameHttpApiHostModule.cs         | 30 +++++++++++++++++--
 .../appsettings.json                          |  3 ++
 .../MyProjectNameIdentityServerModule.cs      | 29 ++++++++++++++++--
 .../appsettings.json                          |  4 +++
 .../MyProjectNameWebHostModule.cs             |  2 +-
 .../appsettings.json                          |  4 ++-
 8 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/templates/module/angular/src/environments/environment.ts b/templates/module/angular/src/environments/environment.ts
index ca462ff043..70beceec1a 100644
--- a/templates/module/angular/src/environments/environment.ts
+++ b/templates/module/angular/src/environments/environment.ts
@@ -6,7 +6,7 @@ export const environment = {
     logoUrl: '',
   },
   oAuthConfig: {
-    issuer: 'https://localhost:44305',
+    issuer: 'https://localhost:44301',
     clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'MyProjectName',
@@ -16,7 +16,7 @@ export const environment = {
   },
   apis: {
     default: {
-      url: 'https://localhost:44305',
+      url: 'https://localhost:44300',
     },
   },
   localization: {
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
index 26fa1648c0..919353fe37 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.0.0" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore.SqlServer\Volo.Abp.EntityFrameworkCore.SqlServer.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.EntityFrameworkCore\Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
index 74edbc03a3..b0fcc5f9b6 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
@@ -1,5 +1,8 @@
-using System.IO;
+using System;
+using System.IO;
+using System.Linq;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -10,6 +13,7 @@ using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.MultiTenancy;
+using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
 using Volo.Abp.Caching;
@@ -28,7 +32,7 @@ namespace MyCompanyName.MyProjectName
         typeof(MyProjectNameApplicationModule),
         typeof(MyProjectNameEntityFrameworkCoreModule),
         typeof(MyProjectNameHttpApiModule),
-        typeof(AbpAspNetCoreMultiTenancyModule),
+        typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
         typeof(AbpAutofacModule),
         typeof(AbpEntityFrameworkCoreSqlServerModule),
         typeof(AbpAuditLoggingEntityFrameworkCoreModule),
@@ -37,6 +41,8 @@ namespace MyCompanyName.MyProjectName
         )]
     public class MyProjectNameHttpApiHostModule : AbpModule
     {
+        private const string DefaultCorsPolicyName = "Default";
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var hostingEnvironment = context.Services.GetHostingEnvironment();
@@ -105,6 +111,25 @@ namespace MyCompanyName.MyProjectName
                     .AddDataProtection()
                     .PersistKeysToStackExchangeRedis(redis, "MyProjectName-Protection-Keys");
             }
+
+            context.Services.AddCors(options =>
+            {
+                options.AddPolicy(DefaultCorsPolicyName, builder =>
+                {
+                    builder
+                        .WithOrigins(
+                            configuration["App:CorsOrigins"]
+                                .Split(",", StringSplitOptions.RemoveEmptyEntries)
+                                .Select(o => o.RemovePostFix("/"))
+                                .ToArray()
+                        )
+                        .WithAbpExposedHeaders()
+                        .SetIsOriginAllowedToAllowWildcardSubdomains()
+                        .AllowAnyHeader()
+                        .AllowAnyMethod()
+                        .AllowCredentials();
+                });
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -119,6 +144,7 @@ namespace MyCompanyName.MyProjectName
             app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseRouting();
+            app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
             app.UseAuthorization();
             if (MultiTenancyConsts.IsEnabled)
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
index 6a2d586b0e..6dceb9c4b9 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
@@ -1,4 +1,7 @@
 {
+  "App": {
+    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
+  },
   "ConnectionStrings": {
     "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true",
     "MyProjectName": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Module;Trusted_Connection=True;MultipleActiveResultSets=true"
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
index 541c7b8c07..76d930d7ea 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
@@ -65,6 +68,8 @@ namespace MyCompanyName.MyProjectName
         )]
     public class MyProjectNameIdentityServerModule : AbpModule
     {
+        private const string DefaultCorsPolicyName = "Default";
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var hostingEnvironment = context.Services.GetHostingEnvironment();
@@ -100,7 +105,7 @@ namespace MyCompanyName.MyProjectName
 
             Configure<AppUrlOptions>(options =>
             {
-                options.Applications["MVC"].RootUrl = configuration["AppSelfUrl"];
+                options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
             });
 
             context.Services.AddAuthentication()
@@ -133,6 +138,25 @@ namespace MyCompanyName.MyProjectName
                     .AddDataProtection()
                     .PersistKeysToStackExchangeRedis(redis, "MyProjectName-Protection-Keys");
             }
+
+            context.Services.AddCors(options =>
+            {
+                options.AddPolicy(DefaultCorsPolicyName, builder =>
+                {
+                    builder
+                        .WithOrigins(
+                            configuration["App:CorsOrigins"]
+                                .Split(",", StringSplitOptions.RemoveEmptyEntries)
+                                .Select(o => o.RemovePostFix("/"))
+                                .ToArray()
+                        )
+                        .WithAbpExposedHeaders()
+                        .SetIsOriginAllowedToAllowWildcardSubdomains()
+                        .AllowAnyHeader()
+                        .AllowAnyMethod()
+                        .AllowCredentials();
+                });
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -147,6 +171,7 @@ namespace MyCompanyName.MyProjectName
             app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseRouting();
+            app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
             app.UseJwtTokenMiddleware();
             if (MultiTenancyConsts.IsEnabled)
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
index ea636d00ad..0386db1e6a 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
@@ -1,4 +1,8 @@
 {
+  "App": {
+    "SelfUrl": "https://localhost:44301/",
+    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
+  },
   "AppSelfUrl": "https://localhost:44301/",
   "ConnectionStrings": {
     "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true"
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
index 6438758c3e..6eb3dc9ea3 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
@@ -98,7 +98,7 @@ namespace MyCompanyName.MyProjectName
         {
             Configure<AppUrlOptions>(options =>
             {
-                options.Applications["MVC"].RootUrl = configuration["AppSelfUrl"];
+                options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
             });
         }
 
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json
index 96a98545b1..22405a15b6 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json
@@ -1,5 +1,7 @@
 {
-  "AppSelfUrl": "https://localhost:44302/",
+  "App": {
+    "SelfUrl": "https://localhost:44302/"
+  },
   "RemoteServices": {
     "Default": {
       "BaseUrl": "https://localhost:44301/"

From 83a87460e2af2988aeda1d38e6cc1509d0486c19 Mon Sep 17 00:00:00 2001
From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
Date: Wed, 27 Nov 2019 16:23:44 +0300
Subject: [PATCH 65/75] Update labeler.yml

---
 .github/workflows/labeler.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 9f4887a3e0..e70e966d4a 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,6 +1,10 @@
 name: "Pull Request Labeler"
 on:
   pull_request:
+    paths: 
+      - npm/ng-packs/**/*
+      - templates/app/angular/**/*
+      - templates/module/angular/**/*
     branches:
       - master
       - dev

From ad7f0b2e3eb879f6b569de46b7c2e1b093de9268 Mon Sep 17 00:00:00 2001
From: thediaval <thediavall@gmail.com>
Date: Wed, 27 Nov 2019 16:40:09 +0300
Subject: [PATCH 66/75] test(theme-shared): add sort-order-icon component test

---
 .../sort-order-icon.component.ts              | 49 ++++++++++++++-----
 .../tests/sort-order-icon.component.spec.ts   | 46 +++++++++++++++++
 2 files changed, 84 insertions(+), 11 deletions(-)
 create mode 100644 npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts
index d42603d3a2..0daa31c597 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts
@@ -5,29 +5,53 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
   templateUrl: './sort-order-icon.component.html',
 })
 export class SortOrderIconComponent {
-  private _order: string;
-  private _selectedKey: string;
+  private _order: 'asc' | 'desc' | '';
+  private _selectedSortKey: string;
 
+  /**
+   * @deprecated use selectedSortKey instead.
+   */
   @Input()
   set selectedKey(value: string) {
-    this._selectedKey = value;
+    this.selectedSortKey = value;
     this.selectedKeyChange.emit(value);
   }
   get selectedKey(): string {
-    return this._selectedKey;
+    return this._selectedSortKey;
+  }
+
+  @Input()
+  set selectedSortKey(value: string) {
+    this._selectedSortKey = value;
+    this.selectedSortKeyChange.emit(value);
+  }
+  get selectedSortKey(): string {
+    return this._selectedSortKey;
   }
 
   @Output() readonly selectedKeyChange = new EventEmitter<string>();
+  @Output() readonly selectedSortKeyChange = new EventEmitter<string>();
+
+  /**
+   * @deprecated use sortKey instead.
+   */
+  @Input()
+  get key(): string {
+    return this.sortKey;
+  }
+  set key(value: string) {
+    this.sortKey = value;
+  }
 
   @Input()
-  key: string;
+  sortKey: string;
 
   @Input()
-  set order(value: string) {
+  set order(value: 'asc' | 'desc' | '') {
     this._order = value;
     this.orderChange.emit(value);
   }
-  get order(): string {
+  get order(): 'asc' | 'desc' | '' {
     return this._order;
   }
 
@@ -37,16 +61,18 @@ export class SortOrderIconComponent {
   iconClass: string;
 
   get icon(): string {
-    if (!this.selectedKey) return 'fa-sort';
-    if (this.selectedKey === this.key) return `fa-sort-${this.order}`;
+    if (!this.selectedSortKey) return 'fa-sort';
+    if (this.selectedSortKey === this.sortKey) return `fa-sort-${this.order}`;
     else return '';
   }
 
   sort(key: string) {
-    this.selectedKey = key;
+    this.selectedKey = key; // TODO: To be removed
+    this.selectedSortKey = key;
     switch (this.order) {
       case '':
         this.order = 'asc';
+        this.orderChange.emit('asc');
         break;
       case 'asc':
         this.order = 'desc';
@@ -54,7 +80,8 @@ export class SortOrderIconComponent {
         break;
       case 'desc':
         this.order = '';
-        this.selectedKey = '';
+        this.selectedKey = ''; // TODO: To be removed
+        this.orderChange.emit('');
         break;
     }
   }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts
new file mode 100644
index 0000000000..ae14fc175b
--- /dev/null
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts
@@ -0,0 +1,46 @@
+import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest';
+import { SortOrderIconComponent } from '../components/sort-order-icon/sort-order-icon.component';
+
+describe('SortOrderIconComponent', () => {
+  let spectator: SpectatorHost<SortOrderIconComponent>;
+  let component: SortOrderIconComponent;
+  const createHost = createHostFactory(SortOrderIconComponent);
+
+  beforeEach(() => {
+    spectator = createHost(
+      '<abp-sort-order-icon key="testKey" [(selectedSortKey)]="selectedSortKey" [(order)]="order"></abp-sort-order-icon>',
+      {
+        hostProps: {
+          selectedSortKey: '',
+          order: '',
+        },
+      },
+    );
+    component = spectator.component;
+  });
+
+  test('should have correct icon class when selectedSortKey and sortKey are the same', () => {
+    const newKey = 'testKey';
+    component.sort(newKey);
+    expect(component.selectedSortKey).toBe(newKey);
+    expect(component.order).toBe('asc');
+    expect(component.icon).toBe('fa-sort-asc');
+  });
+
+  test("shouldn't have any icon class when sortKey and selectedSortKey are different", () => {
+    const newKey = 'otherKey';
+    component.sort(newKey);
+    expect(component.selectedSortKey).toBe(newKey);
+    expect(component.order).toBe('asc');
+    expect(component.icon).toBe('');
+  });
+
+  test('should change order correctly when sort function called', () => {
+    component.sort('testKey');
+    expect(component.order).toBe('asc');
+    component.sort('testKey');
+    expect(component.order).toBe('desc');
+    component.sort('testKey');
+    expect(component.order).toBe('');
+  });
+});

From 76b755957598b4a21e1f270538c6137ae1c537ae Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 16:44:05 +0300
Subject: [PATCH 67/75] feat(core): add condition check to getGrantedPolicy

---
 .../core/src/lib/states/config.state.ts       | 99 +++++++++++++++----
 1 file changed, 81 insertions(+), 18 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
index e18693ccb7..d984a8d9b3 100644
--- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts
+++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
@@ -1,8 +1,18 @@
-import { Action, createSelector, Selector, State, StateContext, Store } from '@ngxs/store';
+import {
+  Action,
+  createSelector,
+  Selector,
+  State,
+  StateContext,
+  Store,
+} from '@ngxs/store';
 import { of } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
 import snq from 'snq';
-import { GetAppConfiguration, PatchRouteByName } from '../actions/config.actions';
+import {
+  GetAppConfiguration,
+  PatchRouteByName,
+} from '../actions/config.actions';
 import { SetLanguage } from '../actions/session.actions';
 import { ABP } from '../models/common';
 import { Config } from '../models/config';
@@ -73,9 +83,12 @@ export class ConfigState {
   }
 
   static getApiUrl(key?: string) {
-    const selector = createSelector([ConfigState], (state: Config.State): string => {
-      return state.environment.apis[key || 'default'].url;
-    });
+    const selector = createSelector(
+      [ConfigState],
+      (state: Config.State): string => {
+        return state.environment.apis[key || 'default'].url;
+      },
+    );
 
     return selector;
   }
@@ -90,10 +103,19 @@ export class ConfigState {
   static getSettings(keyword?: string) {
     const selector = createSelector([ConfigState], (state: Config.State) => {
       if (keyword) {
-        const keys = snq(() => Object.keys(state.setting.values).filter(key => key.indexOf(keyword) > -1), []);
+        const keys = snq(
+          () =>
+            Object.keys(state.setting.values).filter(
+              key => key.indexOf(keyword) > -1,
+            ),
+          [],
+        );
 
         if (keys.length) {
-          return keys.reduce((acc, key) => ({ ...acc, [key]: state.setting.values[key] }), {});
+          return keys.reduce(
+            (acc, key) => ({ ...acc, [key]: state.setting.values[key] }),
+            {},
+          );
         }
       }
 
@@ -103,15 +125,40 @@ export class ConfigState {
   }
 
   static getGrantedPolicy(key: string) {
-    const selector = createSelector([ConfigState], (state: Config.State): boolean => {
-      if (!key) return true;
-      return snq(() => state.auth.grantedPolicies[key], false);
-    });
+    const selector = createSelector(
+      [ConfigState],
+      (state: Config.State): boolean => {
+        if (!key) return true;
+        const getPolicy = k => snq(() => state.auth.grantedPolicies[k], false);
+
+        const orRegexp = /\|\|/g;
+        const andRegexp = /&&/g;
+
+        if (orRegexp.test(key)) {
+          const keys = key.split('||').filter(k => !!k);
+
+          if (keys.length !== 2) return false;
+
+          return getPolicy(keys[0].trim()) || getPolicy(keys[1].trim());
+        } else if (andRegexp.test(key)) {
+          const keys = key.split('&&').filter(k => !!k);
+
+          if (keys.length !== 2) return false;
+
+          return getPolicy(keys[0].trim()) && getPolicy(keys[1].trim());
+        }
+
+        return getPolicy(key);
+      },
+    );
 
     return selector;
   }
 
-  static getLocalization(key: string | Config.LocalizationWithDefault, ...interpolateParams: string[]) {
+  static getLocalization(
+    key: string | Config.LocalizationWithDefault,
+    ...interpolateParams: string[]
+  ) {
     let defaultValue: string;
 
     if (typeof key !== 'string') {
@@ -164,7 +211,10 @@ export class ConfigState {
     return selector;
   }
 
-  constructor(private appConfigurationService: ApplicationConfigurationService, private store: Store) {}
+  constructor(
+    private appConfigurationService: ApplicationConfigurationService,
+    private store: Store,
+  ) {}
 
   @Action(GetAppConfiguration)
   addData({ patchState, dispatch }: StateContext<Config.State>) {
@@ -175,19 +225,25 @@ export class ConfigState {
         }),
       ),
       switchMap(configuration => {
-        let defaultLang: string = configuration.setting.values['Abp.Localization.DefaultLanguage'];
+        let defaultLang: string =
+          configuration.setting.values['Abp.Localization.DefaultLanguage'];
 
         if (defaultLang.includes(';')) {
           defaultLang = defaultLang.split(';')[0];
         }
 
-        return this.store.selectSnapshot(SessionState.getLanguage) ? of(null) : dispatch(new SetLanguage(defaultLang));
+        return this.store.selectSnapshot(SessionState.getLanguage)
+          ? of(null)
+          : dispatch(new SetLanguage(defaultLang));
       }),
     );
   }
 
   @Action(PatchRouteByName)
-  patchRoute({ patchState, getState }: StateContext<Config.State>, { name, newValue }: PatchRouteByName) {
+  patchRoute(
+    { patchState, getState }: StateContext<Config.State>,
+    { name, newValue }: PatchRouteByName,
+  ) {
     let routes: ABP.FullRoute[] = getState().routes;
 
     const index = routes.findIndex(route => route.name === name);
@@ -208,7 +264,9 @@ function patchRouteDeep(
 ): ABP.FullRoute[] {
   routes = routes.map(route => {
     if (route.name === name) {
-      newValue.url = `${parentUrl}/${(!newValue.path && newValue.path === '' ? route.path : newValue.path) || ''}`;
+      newValue.url = `${parentUrl}/${(!newValue.path && newValue.path === ''
+        ? route.path
+        : newValue.path) || ''}`;
 
       if (newValue.children && newValue.children.length) {
         newValue.children = newValue.children.map(child => ({
@@ -219,7 +277,12 @@ function patchRouteDeep(
 
       return { ...route, ...newValue };
     } else if (route.children && route.children.length) {
-      route.children = patchRouteDeep(route.children, name, newValue, (parentUrl || '/') + route.path);
+      route.children = patchRouteDeep(
+        route.children,
+        name,
+        newValue,
+        (parentUrl || '/') + route.path,
+      );
     }
 
     return route;

From 4764750a8c4c38c670d05858e88407b91c5dbe60 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 16:44:37 +0300
Subject: [PATCH 68/75] fix(core): sort pipe null data problem

---
 .../packages/core/src/lib/pipes/sort.pipe.ts  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts
index ea23da1efc..984279f1a4 100644
--- a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts
+++ b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts
@@ -5,7 +5,11 @@ export type SortOrder = 'asc' | 'desc';
   name: 'abpSort',
 })
 export class SortPipe implements PipeTransform {
-  transform(value: any[], sortOrder: SortOrder | string = 'asc', sortKey?: string): any {
+  transform(
+    value: any[],
+    sortOrder: SortOrder | string = 'asc',
+    sortKey?: string,
+  ): any {
     sortOrder = sortOrder && (sortOrder.toLowerCase() as any);
 
     if (!value || (sortOrder !== 'asc' && sortOrder !== 'desc')) return value;
@@ -17,7 +21,9 @@ export class SortPipe implements PipeTransform {
       numberArray = value.filter(item => typeof item === 'number').sort();
       stringArray = value.filter(item => typeof item === 'string').sort();
     } else {
-      numberArray = value.filter(item => typeof item[sortKey] === 'number').sort((a, b) => a[sortKey] - b[sortKey]);
+      numberArray = value
+        .filter(item => typeof item[sortKey] === 'number')
+        .sort((a, b) => a[sortKey] - b[sortKey]);
       stringArray = value
         .filter(item => typeof item[sortKey] === 'string')
         .sort((a, b) => {
@@ -26,7 +32,15 @@ export class SortPipe implements PipeTransform {
           else return 0;
         });
     }
-    const sorted = numberArray.concat(stringArray);
+    const sorted = [
+      ...numberArray,
+      ...stringArray,
+      ...value.filter(
+        item =>
+          typeof item[sortKey] !== 'number' &&
+          typeof item[sortKey] !== 'string',
+      ),
+    ];
     return sortOrder === 'asc' ? sorted : sorted.reverse();
   }
 }

From 2f534545bac1d45d8f5e5fd99fee982765db6a4d Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 27 Nov 2019 17:00:08 +0300
Subject: [PATCH 69/75] fix(core): sort pipe key error

---
 .../packages/core/src/lib/pipes/sort.pipe.ts  |   4 +-
 .../core/src/lib/tests/config.state.spec.ts   | 138 ++++++++++++++----
 .../core/src/lib/tests/sort.pipe.spec.ts      |  24 ++-
 3 files changed, 130 insertions(+), 36 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts
index 984279f1a4..4d634f33c7 100644
--- a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts
+++ b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts
@@ -37,8 +37,8 @@ export class SortPipe implements PipeTransform {
       ...stringArray,
       ...value.filter(
         item =>
-          typeof item[sortKey] !== 'number' &&
-          typeof item[sortKey] !== 'string',
+          typeof (sortKey ? item[sortKey] : item) !== 'number' &&
+          typeof (sortKey ? item[sortKey] : item) !== 'string',
       ),
     ];
     return sortOrder === 'asc' ? sorted : sorted.reverse();
diff --git a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts
index a7bae167b1..1fd2e45b35 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts
@@ -1,8 +1,15 @@
-import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest';
+import {
+  createServiceFactory,
+  SpectatorService,
+  SpyObject,
+} from '@ngneat/spectator/jest';
 import { Store } from '@ngxs/store';
 import { ReplaySubject, timer, Subject, of } from 'rxjs';
 import { Config } from '../models/config';
-import { ApplicationConfigurationService, ConfigStateService } from '../services';
+import {
+  ApplicationConfigurationService,
+  ConfigStateService,
+} from '../services';
 import { ConfigState } from '../states';
 import { SetLanguage, PatchRouteByName } from '../actions';
 
@@ -91,6 +98,7 @@ export const CONFIG_STATE_DATA = {
     },
     grantedPolicies: {
       'Abp.Identity': false,
+      'Abp.Account': true,
     },
   },
   setting: {
@@ -126,7 +134,10 @@ describe('ConfigState', () => {
     store = spectator.get(Store);
     service = spectator.service;
     appConfigService = spectator.get(ApplicationConfigurationService);
-    state = new ConfigState(spectator.get(ApplicationConfigurationService), store);
+    state = new ConfigState(
+      spectator.get(ApplicationConfigurationService),
+      store,
+    );
   });
 
   describe('#getAll', () => {
@@ -137,24 +148,34 @@ describe('ConfigState', () => {
 
   describe('#getApplicationInfo', () => {
     it('should return application property', () => {
-      expect(ConfigState.getApplicationInfo(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.application);
+      expect(ConfigState.getApplicationInfo(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.environment.application,
+      );
     });
   });
 
   describe('#getOne', () => {
     it('should return one property', () => {
-      expect(ConfigState.getOne('environment')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment);
+      expect(ConfigState.getOne('environment')(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.environment,
+      );
     });
   });
 
   describe('#getDeep', () => {
     it('should return deeper', () => {
-      expect(ConfigState.getDeep('environment.localization.defaultResourceName')(CONFIG_STATE_DATA)).toEqual(
-        CONFIG_STATE_DATA.environment.localization.defaultResourceName,
-      );
-      expect(ConfigState.getDeep(['environment', 'localization', 'defaultResourceName'])(CONFIG_STATE_DATA)).toEqual(
-        CONFIG_STATE_DATA.environment.localization.defaultResourceName,
-      );
+      expect(
+        ConfigState.getDeep('environment.localization.defaultResourceName')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toEqual(CONFIG_STATE_DATA.environment.localization.defaultResourceName);
+      expect(
+        ConfigState.getDeep([
+          'environment',
+          'localization',
+          'defaultResourceName',
+        ])(CONFIG_STATE_DATA),
+      ).toEqual(CONFIG_STATE_DATA.environment.localization.defaultResourceName);
 
       expect(ConfigState.getDeep('test')(null)).toBeFalsy();
     });
@@ -162,21 +183,33 @@ describe('ConfigState', () => {
 
   describe('#getRoute', () => {
     it('should return route', () => {
-      expect(ConfigState.getRoute(null, '::Menu:Home')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.flattedRoutes[0]);
-      expect(ConfigState.getRoute('identity')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.flattedRoutes[1]);
+      expect(
+        ConfigState.getRoute(null, '::Menu:Home')(CONFIG_STATE_DATA),
+      ).toEqual(CONFIG_STATE_DATA.flattedRoutes[0]);
+      expect(ConfigState.getRoute('identity')(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.flattedRoutes[1],
+      );
     });
   });
 
   describe('#getApiUrl', () => {
     it('should return api url', () => {
-      expect(ConfigState.getApiUrl('other')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.apis.other.url);
-      expect(ConfigState.getApiUrl()(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.apis.default.url);
+      expect(ConfigState.getApiUrl('other')(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.environment.apis.other.url,
+      );
+      expect(ConfigState.getApiUrl()(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.environment.apis.default.url,
+      );
     });
   });
 
   describe('#getSetting', () => {
     it('should return a setting', () => {
-      expect(ConfigState.getSetting('Abp.Localization.DefaultLanguage')(CONFIG_STATE_DATA)).toEqual(
+      expect(
+        ConfigState.getSetting('Abp.Localization.DefaultLanguage')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toEqual(
         CONFIG_STATE_DATA.setting.values['Abp.Localization.DefaultLanguage'],
       );
     });
@@ -184,41 +217,82 @@ describe('ConfigState', () => {
 
   describe('#getSettings', () => {
     it('should return settings', () => {
-      expect(ConfigState.getSettings('Localization')(CONFIG_STATE_DATA)).toEqual({
+      expect(
+        ConfigState.getSettings('Localization')(CONFIG_STATE_DATA),
+      ).toEqual({
         'Abp.Localization.DefaultLanguage': 'en',
       });
 
-      expect(ConfigState.getSettings('AllSettings')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.setting.values);
+      expect(ConfigState.getSettings('AllSettings')(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.setting.values,
+      );
     });
   });
 
   describe('#getGrantedPolicy', () => {
     it('should return a granted policy', () => {
-      expect(ConfigState.getGrantedPolicy('Abp.Identity')(CONFIG_STATE_DATA)).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Identity')(CONFIG_STATE_DATA),
+      ).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Identity || Abp.Account')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toBe(true);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Account && Abp.Identity')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Account &&')(CONFIG_STATE_DATA),
+      ).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('|| Abp.Account')(CONFIG_STATE_DATA),
+      ).toBe(false);
       expect(ConfigState.getGrantedPolicy('')(CONFIG_STATE_DATA)).toBe(true);
     });
   });
 
   describe('#getLocalization', () => {
     it('should return a localization', () => {
-      expect(ConfigState.getLocalization('AbpIdentity::Identity')(CONFIG_STATE_DATA)).toBe('identity');
-
-      expect(ConfigState.getLocalization('AbpIdentity::NoIdentity')(CONFIG_STATE_DATA)).toBe('AbpIdentity::NoIdentity');
-
-      expect(ConfigState.getLocalization({ key: '', defaultValue: 'default' })(CONFIG_STATE_DATA)).toBe('default');
-
-      expect(ConfigState.getLocalization("::'{0}' and '{1}' do not match.", 'first', 'second')(CONFIG_STATE_DATA)).toBe(
-        'first and second do not match.',
-      );
+      expect(
+        ConfigState.getLocalization('AbpIdentity::Identity')(CONFIG_STATE_DATA),
+      ).toBe('identity');
+
+      expect(
+        ConfigState.getLocalization('AbpIdentity::NoIdentity')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toBe('AbpIdentity::NoIdentity');
+
+      expect(
+        ConfigState.getLocalization({ key: '', defaultValue: 'default' })(
+          CONFIG_STATE_DATA,
+        ),
+      ).toBe('default');
+
+      expect(
+        ConfigState.getLocalization(
+          "::'{0}' and '{1}' do not match.",
+          'first',
+          'second',
+        )(CONFIG_STATE_DATA),
+      ).toBe('first and second do not match.');
 
       try {
         ConfigState.getLocalization('::Test')({
           ...CONFIG_STATE_DATA,
-          environment: { ...CONFIG_STATE_DATA.environment, localization: {} as any },
+          environment: {
+            ...CONFIG_STATE_DATA.environment,
+            localization: {} as any,
+          },
         });
         expect(false).toBeTruthy(); // fail
       } catch (error) {
-        expect((error as Error).message).toContain('Please check your environment');
+        expect((error as Error).message).toContain(
+          'Please check your environment',
+        );
       }
     });
   });
@@ -273,7 +347,9 @@ describe('ConfigState', () => {
         name: 'Home',
         path: 'home',
         url: '/home',
-        children: [{ path: 'dashboard', name: 'Dashboard', url: '/home/dashboard' }],
+        children: [
+          { path: 'dashboard', name: 'Dashboard', url: '/home/dashboard' },
+        ],
       });
     });
 
diff --git a/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts
index 8428515118..b69d139091 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts
@@ -17,10 +17,28 @@ describe('SortPipe', () => {
   });
 
   test('should sort object array in given order with given key', () => {
-    const array = [{ key: 5 }, { key: 'b' }, { key: 1 }, { key: 'a' }];
+    const array = [
+      { key: 5 },
+      { key: 'b' },
+      { key: 1 },
+      { key: 'a' },
+      { key: null },
+    ];
 
-    expect(pipe.transform(array, 'asc', 'key')).toEqual([{ key: 1 }, { key: 5 }, { key: 'a' }, { key: 'b' }]);
-    expect(pipe.transform(array, 'desc', 'key')).toEqual([{ key: 'b' }, { key: 'a' }, { key: 5 }, { key: 1 }]);
+    expect(pipe.transform(array, 'asc', 'key')).toEqual([
+      { key: 1 },
+      { key: 5 },
+      { key: 'a' },
+      { key: 'b' },
+      { key: null },
+    ]);
+    expect(pipe.transform(array, 'desc', 'key')).toEqual([
+      { key: null },
+      { key: 'b' },
+      { key: 'a' },
+      { key: 5 },
+      { key: 1 },
+    ]);
   });
 
   test('should require an array as value', () => {

From 4a03983d8b971abd3a4b31f4d86dd3bd6fecdae6 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 28 Nov 2019 11:00:16 +0800
Subject: [PATCH 70/75] Upgrade MailKit to 2.4.1.

Resolve #2270
---
 framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj
index 118e60d31c..d96ab22fbe 100644
--- a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj
+++ b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="2.3.2" />
+    <PackageReference Include="MailKit" Version="2.4.1" />
   </ItemGroup>
 
   <ItemGroup>

From 3c924899ca6e5b797bd6536420f75efb61981787 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Thu, 28 Nov 2019 10:43:46 +0300
Subject: [PATCH 71/75] fix(account): add header parameter to
 fetchTokenUsingPasswordFlow method

---
 .../components/register/register.component.ts | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts b/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
index e01287e1cb..fad7ae5fc7 100644
--- a/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
@@ -1,4 +1,4 @@
-import { ConfigState, GetAppConfiguration, ABP } from '@abp/ng.core';
+import { ConfigState, GetAppConfiguration, ABP, SessionState } from '@abp/ng.core';
 import { ToasterService } from '@abp/ng.theme.shared';
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
@@ -11,6 +11,7 @@ import snq from 'snq';
 import { RegisterRequest } from '../../models';
 import { AccountService } from '../../services/account.service';
 import { PasswordRules, validatePassword } from '@ngx-validate/core';
+import { HttpHeaders } from '@angular/common/http';
 const { maxLength, minLength, required, email } = Validators;
 
 @Component({
@@ -29,7 +30,9 @@ export class RegisterComponent implements OnInit {
     private store: Store,
     private toasterService: ToasterService,
   ) {
-    this.oauthService.configure(this.store.selectSnapshot(ConfigState.getOne('environment')).oAuthConfig);
+    this.oauthService.configure(
+      this.store.selectSnapshot(ConfigState.getOne('environment')).oAuthConfig,
+    );
     this.oauthService.loadDiscoveryDocument();
   }
 
@@ -62,7 +65,10 @@ export class RegisterComponent implements OnInit {
 
     this.form = this.fb.group({
       username: ['', [required, maxLength(255)]],
-      password: ['', [required, validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(32)]],
+      password: [
+        '',
+        [required, validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(32)],
+      ],
       email: ['', [required, email]],
     });
   }
@@ -79,10 +85,22 @@ export class RegisterComponent implements OnInit {
       appName: 'Angular',
     } as RegisterRequest;
 
+    const tenant = this.store.selectSnapshot(SessionState.getTenant);
+
     this.accountService
       .register(newUser)
       .pipe(
-        switchMap(() => from(this.oauthService.fetchTokenUsingPasswordFlow(newUser.userName, newUser.password))),
+        switchMap(() =>
+          from(
+            this.oauthService.fetchTokenUsingPasswordFlow(
+              newUser.userName,
+              newUser.password,
+              new HttpHeaders({
+                ...(tenant && tenant.id && { __tenant: tenant.id }),
+              }),
+            ),
+          ),
+        ),
         switchMap(() => this.store.dispatch(new GetAppConfiguration())),
         tap(() => this.store.dispatch(new Navigate(['/']))),
         take(1),

From 6de524887a67caa90c9a59bca2bdbfdf5b1cd76a Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Thu, 28 Nov 2019 10:44:01 +0300
Subject: [PATCH 72/75] chore: update prettierrc

---
 npm/ng-packs/.prettierrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/npm/ng-packs/.prettierrc b/npm/ng-packs/.prettierrc
index b5b5724081..5e2863a11f 100644
--- a/npm/ng-packs/.prettierrc
+++ b/npm/ng-packs/.prettierrc
@@ -1,6 +1,5 @@
 {
-  "printWidth": 120,
+  "printWidth": 100,
   "singleQuote": true,
   "trailingComma": "all"
 }
-

From d16bef05b22ad8ac2c02676dae273852fd86b6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 28 Nov 2019 18:39:01 +0300
Subject: [PATCH 73/75] Resolved #1933: Ignore owned types while configuring
 the base properties

---
 .../Abp/EntityFrameworkCore/AbpDbContext.cs   |  5 ++++
 .../TestMigrationsDbContext.cs                | 11 +++++++
 .../EntityFrameworkCore/TestAppDbContext.cs   | 11 +++++++
 .../Volo/Abp/TestApp/Domain/City.cs           | 10 +++++++
 .../Volo/Abp/TestApp/Domain/District.cs       | 30 +++++++++++++++++++
 .../Volo/Abp/TestApp/TestDataBuilder.cs       |  7 ++++-
 6 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/District.cs

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 01c7292be9..18758d98e3 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -347,6 +347,11 @@ namespace Volo.Abp.EntityFrameworkCore
         protected virtual void ConfigureBaseProperties<TEntity>(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType)
             where TEntity : class
         {
+            if (mutableEntityType.IsOwned())
+            {
+                return;
+            }
+
             ConfigureConcurrencyStampProperty<TEntity>(modelBuilder, mutableEntityType);
             ConfigureExtraProperties<TEntity>(modelBuilder, mutableEntityType);
             ConfigureAuditProperties<TEntity>(modelBuilder, mutableEntityType);
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs
index 0f9def32f0..da66392a18 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs
@@ -25,12 +25,23 @@ namespace Volo.Abp.EntityFrameworkCore
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            modelBuilder.Owned<District>();
+
             base.OnModelCreating(modelBuilder);
 
             modelBuilder.Entity<Phone>(b =>
             {
                 b.HasKey(p => new { p.PersonId, p.Number });
             });
+
+            modelBuilder.Entity<City>(b =>
+            {
+                b.OwnsMany(c => c.Districts, d =>
+                {
+                    d.WithOwner().HasForeignKey(x => x.CityId);
+                    d.HasKey(x => new { x.CityId, x.Name });
+                });
+            });
         }
     }
 }
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
index 5e243b9a03..289364411d 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
@@ -25,6 +25,8 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            modelBuilder.Owned<District>();
+
             base.OnModelCreating(modelBuilder);
 
             modelBuilder.Entity<Phone>(b =>
@@ -38,6 +40,15 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
                     p.HasNoKey();
                     p.ToView("View_PersonView");
                 });
+
+            modelBuilder.Entity<City>(b =>
+            {
+                b.OwnsMany(c => c.Districts, d =>
+                {
+                    d.WithOwner().HasForeignKey(x => x.CityId);
+                    d.HasKey(x => new {x.CityId, x.Name});
+                });
+            });
         }
     }
 }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs
index 76361463d7..cc5a194088 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.TestApp.Domain
@@ -7,6 +9,8 @@ namespace Volo.Abp.TestApp.Domain
     {
         public string Name { get; set; }
 
+        public ICollection<District> Districts { get; set; }
+
         private City()
         {
             
@@ -16,6 +20,12 @@ namespace Volo.Abp.TestApp.Domain
             : base(id)
         {
             Name = name;
+            Districts = new List<District>();
+        }
+
+        public int GetPopulation()
+        {
+            return Districts.Select(d => d.Population).Sum();
         }
     }
 }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/District.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/District.cs
new file mode 100644
index 0000000000..13f0f9d5c7
--- /dev/null
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/District.cs
@@ -0,0 +1,30 @@
+using System;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Volo.Abp.TestApp.Domain
+{
+    public class District : CreationAuditedEntity
+    {
+        public Guid CityId { get; private set; }
+
+        public string Name { get; private set; }
+
+        public int Population { get; set; }
+
+        private District()
+        {
+            
+        }
+
+        public District(Guid cityId, string name, int population = 0)
+        {
+            CityId = cityId;
+            Name = name;
+        }
+
+        public override object[] GetKeys()
+        {
+            return new Object[] {CityId, Name};
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
index 1f955b3e82..8900d8cfdf 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
@@ -38,10 +38,15 @@ namespace Volo.Abp.TestApp
 
         private void AddCities()
         {
+            var istanbul = new City(IstanbulCityId, "Istanbul");
+            istanbul.Districts.Add(new District(istanbul.Id, "Bakirkoy", 1283999));
+            istanbul.Districts.Add(new District(istanbul.Id, "Mecidiyek�y", 2222321));
+            istanbul.Districts.Add(new District(istanbul.Id, "Uskudar", 726172));
+
             _cityRepository.Insert(new City(Guid.NewGuid(), "Tokyo"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Madrid"));
             _cityRepository.Insert(new City(LondonCityId, "London") {ExtraProperties = { { "Population", 10_470_000 } } });
-            _cityRepository.Insert(new City(IstanbulCityId, "Istanbul"));
+            _cityRepository.Insert(istanbul);
             _cityRepository.Insert(new City(Guid.NewGuid(), "Paris"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Washington"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Sao Paulo"));

From 29158004edede877e313700ee6c979c0860b16fe Mon Sep 17 00:00:00 2001
From: maliming <liming.ma@volosoft.com>
Date: Fri, 29 Nov 2019 14:01:18 +0800
Subject: [PATCH 74/75] Update Multi-Tenancy.md

---
 docs/en/Multi-Tenancy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/Multi-Tenancy.md b/docs/en/Multi-Tenancy.md
index c69e2cb299..00f51d430d 100644
--- a/docs/en/Multi-Tenancy.md
+++ b/docs/en/Multi-Tenancy.md
@@ -312,10 +312,10 @@ http://nginx.org/en/docs/http/ngx_http_core_module.html#ignore_invalid_headers
 http://nginx.org/en/docs/http/ngx_http_core_module.html#underscores_in_headers
 
 
-"__tenant" parameter name can be changed using AspNetCoreMultiTenancyOptions. Example:
+"__tenant" parameter name can be changed using AbpAspNetCoreMultiTenancyOptions. Example:
 
 ````C#
-services.Configure<AspNetCoreMultiTenancyOptions>(options =>
+services.Configure<AbpAspNetCoreMultiTenancyOptions>(options =>
 {
     options.TenantKey = "MyTenantKey";
 });

From 7f87bb684ed602cfac8b0d2fcbc10a590b2d5e71 Mon Sep 17 00:00:00 2001
From: maliming <liming.ma@volosoft.com>
Date: Fri, 29 Nov 2019 14:01:34 +0800
Subject: [PATCH 75/75] Update Multi-Tenancy.md

---
 docs/zh-Hans/Multi-Tenancy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh-Hans/Multi-Tenancy.md b/docs/zh-Hans/Multi-Tenancy.md
index f42fd73454..5f00c2c12c 100644
--- a/docs/zh-Hans/Multi-Tenancy.md
+++ b/docs/zh-Hans/Multi-Tenancy.md
@@ -312,10 +312,10 @@ Volo.Abp.AspNetCore.MultiTenancy 添加了下面这些租户解析器,从当前W
 http://nginx.org/en/docs/http/ngx_http_core_module.html#ignore_invalid_headers
 http://nginx.org/en/docs/http/ngx_http_core_module.html#underscores_in_headers
 
-可以使用AspNetCoreMultiTenancyOptions修改默认的参数名"__tenant".例如:
+可以使用AbpAspNetCoreMultiTenancyOptions修改默认的参数名"__tenant".例如:
 
 ````C#
-services.Configure<AspNetCoreMultiTenancyOptions>(options =>
+services.Configure<AbpAspNetCoreMultiTenancyOptions>(options =>
 {
     options.TenantKey = "MyTenantKey";
 });