Merge branch 'dev' of https://github.com/volosoft/abp into dev

docs/en/Tutorials/AspNetCore-Mvc/Part-I.md

@@ -12,6 +12,8 @@ This is the first part of the ASP.NET Core MVC tutorial series. See all parts:
 
 You can access to the **source code** of the application from [the GitHub repository](https://github.com/abpframework/abp/tree/master/samples/BookStore).
 
+> You can also watch [this video course](https://amazingsolutions.teachable.com/p/lets-build-the-bookstore-application) prepared by an ABP community member, based on this tutorial.
+
 ### Creating the Project
 
 Create a new project named `Acme.BookStore`, create the database and run the application by following the [Getting Started document](../../Getting-Started-AspNetCore-MVC-Template.md).
@@ -98,7 +100,7 @@ Open `BookStoreDbContextModelCreatingExtensions.cs` file in the `Acme.BookStore.
 builder.Entity<Book>(b =>
 {
     b.ToTable(BookStoreConsts.DbTablePrefix + "Books", BookStoreConsts.DbSchema);
-    b.ConfigureAuditedAggregateRoot(); //auto configure for the base class props
+    b.ConfigureByConvention(); //auto configure for the base class props
     b.Property(x => x.Name).IsRequired().HasMaxLength(128);
 });
 ````

docs/en/Tutorials/AspNetCore-Mvc/Part-II.md

@@ -10,6 +10,8 @@ This is the second part of the ASP.NET Core MVC tutorial series. See all parts:
 
 You can access to the **source code** of the application from [the GitHub repository](https://github.com/volosoft/abp/tree/master/samples/BookStore).
 
+> You can also watch [this video course](https://amazingsolutions.teachable.com/p/lets-build-the-bookstore-application) prepared by an ABP community member, based on this tutorial.
+
 ### Creating a New Book
 
 In this section, you will learn how to create a new modal dialog form to create a new book. The result dialog will be like that:

docs/en/Tutorials/AspNetCore-Mvc/Part-III.md

@@ -10,6 +10,8 @@ This is the third part of the ASP.NET Core MVC tutorial series. See all parts:
 
 You can access to the **source code** of the application from [the GitHub repository](https://github.com/volosoft/abp/tree/master/samples/BookStore).
 
+> You can also watch [this video course](https://amazingsolutions.teachable.com/p/lets-build-the-bookstore-application) prepared by an ABP community member, based on this tutorial.
+
 ### Test Projects in the Solution
 
 There are multiple test projects in the solution:

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs

@@ -65,7 +65,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host"));
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
-                    steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep());
+                    steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44303"));
                 }
 
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
@@ -87,6 +87,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
                     steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+                    steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
                 }
             }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs

@@ -5,12 +5,25 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
 {
     public class AppTemplateChangeConsoleTestClientPortSettingsStep : ProjectBuildPipelineStep
     {
+        public string RemoteServicePort { get; }
+        public string IdentityServerPort { get; }
+
+        /// <param name="remoteServicePort"></param>
+        /// <param name="identityServerPort">Assumed same as the <paramref name="remoteServicePort"/> if leaved as null.</param>
+        public AppTemplateChangeConsoleTestClientPortSettingsStep(
+            string remoteServicePort, 
+            string identityServerPort = null)
+        {
+            RemoteServicePort = remoteServicePort;
+            IdentityServerPort = identityServerPort ?? remoteServicePort;
+        }
+
         public override void Execute(ProjectBuildContext context)
         {
             context
                 .GetFile("/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json")
-                .ReplaceText("44395", "44361")
-                .ReplaceText("44348", "44361");
+                .ReplaceText("44300", RemoteServicePort)
+                .ReplaceText("44301", IdentityServerPort);
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs

@@ -76,6 +76,29 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json"
             );
 
+            //MyCompanyName.MyProjectName.HttpApi.HostWithIds
+
+            ChangeProjectReference(
+                context,
+                "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj",
+                "EntityFrameworkCore.DbMigrations",
+                "MongoDB"
+            );
+
+            ChangeModuleDependency(
+                context,
+                "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs",
+                "MyCompanyName.MyProjectName.EntityFrameworkCore",
+                "MyCompanyName.MyProjectName.MongoDB",
+                "MyProjectNameEntityFrameworkCoreDbMigrationsModule",
+                "MyProjectNameMongoDbModule"
+            );
+
+            ChangeConnectionStringToMongoDb(
+                context,
+                "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json"
+            );
+
             //MyCompanyName.MyProjectName.DbMigrator
 
             ChangeProjectReference(

npm/lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.0",
+  "version": "0.8.1",
   "packages": [
     "ng-packs/dist/*",
     "packs/*"

npm/ng-packs/packages/identity/src/lib/actions/identity.actions.ts

@@ -3,6 +3,7 @@ import { ABP } from '@abp/ng.core';
 
 export class IdentityGetRoles {
   static readonly type = '[Identity] Get Roles';
+  constructor(public payload?: ABP.PageQueryParams) {}
 }
 
 export class IdentityGetRoleById {

npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html

@@ -17,11 +17,20 @@
         ><input
           type="search"
           class="form-control form-control-sm"
-          placeholder="Search"
-          (input)="dt.filterGlobal($event.target.value, 'contains')"
+          [placeholder]="'AbpUi::PagerSearch' | abpLocalization"
+          (input)="search$.next($event.target.value)"
       /></label>
     </div>
-    <p-table #dt [value]="roles$ | async" [globalFilterFields]="['name']" [paginator]="true" [rows]="10">
+    <p-table
+      [value]="data$ | async"
+      [lazy]="true"
+      [lazyLoadOnInit]="false"
+      [paginator]="true"
+      [rows]="10"
+      [totalRecords]="totalCount$ | async"
+      [loading]="loading"
+      (onLazyLoad)="onPageChange($event)"
+    >
       <ng-template pTemplate="header">
         <tr>
           <th>{{ 'AbpIdentity::Actions' | abpLocalization }}</th>

npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts

@@ -1,6 +1,6 @@
-import { Component, TemplateRef, ViewChild } from '@angular/core';
+import { Component, TemplateRef, ViewChild, OnInit } from '@angular/core';
 import { Select, Store } from '@ngxs/store';
-import { Observable } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { IdentityState } from '../../states/identity.state';
 import { Identity } from '../../models/identity';
@@ -9,17 +9,22 @@ import {
   IdentityAddRole,
   IdentityDeleteRole,
   IdentityGetRoleById,
+  IdentityGetRoles,
 } from '../../actions/identity.actions';
-import { pluck } from 'rxjs/operators';
+import { pluck, debounceTime, finalize } from 'rxjs/operators';
 import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
+import { ABP } from '@abp/ng.core';
 
 @Component({
   selector: 'abp-roles',
   templateUrl: './roles.component.html',
 })
-export class RolesComponent {
+export class RolesComponent implements OnInit {
   @Select(IdentityState.getRoles)
-  roles$: Observable<Identity.RoleItem[]>;
+  data$: Observable<Identity.RoleItem[]>;
+
+  @Select(IdentityState.getRolesTotalCount)
+  totalCount$: Observable<number>;
 
   form: FormGroup;
 
@@ -31,11 +36,26 @@ export class RolesComponent {
 
   providerKey: string;
 
+  pageQuery: ABP.PageQueryParams = {
+    sorting: 'name',
+  };
+
+  loading: boolean = false;
+
+  search$ = new Subject<string>();
+
   @ViewChild('modalContent', { static: false })
   modalContent: TemplateRef<any>;
 
   constructor(private confirmationService: ConfirmationService, private fb: FormBuilder, private store: Store) {}
 
+  ngOnInit() {
+    this.search$.pipe(debounceTime(300)).subscribe(value => {
+      this.pageQuery.filter = value;
+      this.get();
+    });
+  }
+
   createForm() {
     this.form = this.fb.group({
       name: [this.selected.name || '', [Validators.required, Validators.maxLength(256)]],
@@ -89,4 +109,19 @@ export class RolesComponent {
         }
       });
   }
+
+  onPageChange(data) {
+    this.pageQuery.skipCount = data.first;
+    this.pageQuery.maxResultCount = data.rows;
+
+    this.get();
+  }
+
+  get() {
+    this.loading = true;
+    this.store
+      .dispatch(new IdentityGetRoles(this.pageQuery))
+      .pipe(finalize(() => (this.loading = false)))
+      .subscribe();
+  }
 }

npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@@ -23,7 +23,7 @@
         ><input
           type="search"
           class="form-control form-control-sm"
-          placeholder="Search"
+          [placeholder]="'AbpUi::PagerSearch' | abpLocalization"
           (input)="search$.next($event.target.value)"
       /></label>
     </div>

npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@@ -4,7 +4,7 @@ import { Component, OnInit, TemplateRef, TrackByFunction, ViewChild } from '@ang
 import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Select, Store } from '@ngxs/store';
 import { combineLatest, Observable, Subject } from 'rxjs';
-import { debounceTime, filter, map, pluck, take } from 'rxjs/operators';
+import { debounceTime, filter, map, pluck, take, finalize } from 'rxjs/operators';
 import snq from 'snq';
 import {
   IdentityAddUser,
@@ -163,6 +163,9 @@ export class UsersComponent implements OnInit {
 
   get() {
     this.loading = true;
-    this.store.dispatch(new IdentityGetUsers(this.pageQuery)).subscribe(() => (this.loading = false));
+    this.store
+      .dispatch(new IdentityGetUsers(this.pageQuery))
+      .pipe(finalize(() => (this.loading = false)))
+      .subscribe();
   }
 }

npm/ng-packs/packages/identity/src/lib/services/identity.service.ts

@@ -9,10 +9,11 @@ import { Identity } from '../models/identity';
 export class IdentityService {
   constructor(private rest: RestService) {}
 
-  getRoles(): Observable<Identity.RoleResponse> {
+  getRoles(params = {} as ABP.PageQueryParams): Observable<Identity.RoleResponse> {
     const request: Rest.Request<null> = {
       method: 'GET',
       url: '/api/identity/roles',
+      params,
     };
 
     return this.rest.request<null, Identity.RoleResponse>(request);

npm/ng-packs/packages/identity/src/lib/states/identity.state.ts

@@ -44,8 +44,8 @@ export class IdentityState {
   constructor(private identityService: IdentityService) {}
 
   @Action(IdentityGetRoles)
-  getRoles({ patchState }: StateContext<Identity.State>) {
-    return this.identityService.getRoles().pipe(
+  getRoles({ patchState }: StateContext<Identity.State>, { payload }: IdentityGetRoles) {
+    return this.identityService.getRoles(payload).pipe(
       tap(roles =>
         patchState({
           roles,

npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts

@@ -1,7 +1,9 @@
 import { TenantManagement } from '../models/tenant-management';
+import { ABP } from '@abp/ng.core';
 
 export class TenantManagementGet {
   static readonly type = '[TenantManagement] Get';
+  constructor(public payload?: ABP.PageQueryParams) {}
 }
 
 export class TenantManagementGetById {

npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html

@@ -26,11 +26,20 @@
         ><input
           type="search"
           class="form-control form-control-sm"
-          placeholder="Search"
-          (input)="dt.filterGlobal($event.target.value, 'contains')"
+          [placeholder]="'AbpUi::PagerSearch' | abpLocalization"
+          (input)="search$.next($event.target.value)"
       /></label>
     </div>
-    <p-table #dt [value]="datas$ | async" [globalFilterFields]="['name']" [paginator]="true" [rows]="10">
+    <p-table
+      [value]="data$ | async"
+      [lazy]="true"
+      [lazyLoadOnInit]="false"
+      [paginator]="true"
+      [rows]="10"
+      [totalRecords]="totalCount$ | async"
+      [loading]="loading"
+      (onLazyLoad)="onPageChange($event)"
+    >
       <ng-template pTemplate="header">
         <tr>
           <th>{{ 'AbpTenantManagement::Actions' | abpLocalization }}</th>
@@ -112,7 +121,7 @@
     <div class="mt-2">
       <div class="form-group">
         <label for="name">{{ 'AbpTenantManagement::TenantName' | abpLocalization }}</label>
-        <input type="text" id="name" class="form-control" formControlName="name" autofocus/>
+        <input type="text" id="name" class="form-control" formControlName="name" autofocus />
       </div>
     </div>
   </form>
@@ -123,7 +132,13 @@
     <div class="mt-2">
       <div class="form-group">
         <div class="form-check">
-          <input id="useSharedDatabase" type="checkbox" class="form-check-input" formControlName="useSharedDatabase" autofocus/>
+          <input
+            id="useSharedDatabase"
+            type="checkbox"
+            class="form-check-input"
+            formControlName="useSharedDatabase"
+            autofocus
+          />
           <label for="useSharedDatabase" class="font-check-label">{{
             'AbpTenantManagement::DisplayName:UseSharedDatabase' | abpLocalization
           }}</label>

npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts

@@ -1,13 +1,14 @@
 import { ABP } from '@abp/ng.core';
 import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
-import { Component, TemplateRef, ViewChild } from '@angular/core';
+import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Select, Store } from '@ngxs/store';
-import { Observable } from 'rxjs';
-import { pluck, switchMap, take } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { debounceTime, finalize, pluck, switchMap, take } from 'rxjs/operators';
 import {
   TenantManagementAdd,
   TenantManagementDelete,
+  TenantManagementGet,
   TenantManagementGetById,
   TenantManagementUpdate,
 } from '../../actions/tenant-management.actions';
@@ -24,9 +25,12 @@ type SelectedModalContent = {
   selector: 'abp-tenants',
   templateUrl: './tenants.component.html',
 })
-export class TenantsComponent {
+export class TenantsComponent implements OnInit {
   @Select(TenantManagementState.get)
-  datas$: Observable<ABP.BasicItem[]>;
+  data$: Observable<ABP.BasicItem[]>;
+
+  @Select(TenantManagementState.getTenantsTotalCount)
+  totalCount$: Observable<number>;
 
   selected: ABP.BasicItem;
 
@@ -42,6 +46,14 @@ export class TenantsComponent {
 
   _useSharedDatabase: boolean;
 
+  pageQuery: ABP.PageQueryParams = {
+    sorting: 'name',
+  };
+
+  loading: boolean = false;
+
+  search$ = new Subject<string>();
+
   get useSharedDatabase(): boolean {
     return this.defaultConnectionStringForm.get('useSharedDatabase').value;
   }
@@ -66,6 +78,13 @@ export class TenantsComponent {
     private store: Store,
   ) {}
 
+  ngOnInit() {
+    this.search$.pipe(debounceTime(300)).subscribe(value => {
+      this.pageQuery.filter = value;
+      this.get();
+    });
+  }
+
   private createTenantForm() {
     this.tenantForm = this.fb.group({
       name: [this.selected.name || '', [Validators.required, Validators.maxLength(256)]],
@@ -178,4 +197,19 @@ export class TenantsComponent {
         }
       });
   }
+
+  onPageChange(data) {
+    this.pageQuery.skipCount = data.first;
+    this.pageQuery.maxResultCount = data.rows;
+
+    this.get();
+  }
+
+  get() {
+    this.loading = true;
+    this.store
+      .dispatch(new TenantManagementGet(this.pageQuery))
+      .pipe(finalize(() => (this.loading = false)))
+      .subscribe();
+  }
 }

npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts

@@ -9,10 +9,11 @@ import { TenantManagement } from '../models/tenant-management';
 export class TenantManagementService {
   constructor(private rest: RestService) {}
 
-  get(): Observable<TenantManagement.Response> {
+  get(params = {} as ABP.PageQueryParams): Observable<TenantManagement.Response> {
     const request: Rest.Request<null> = {
       method: 'GET',
       url: '/api/multi-tenancy/tenants',
+      params,
     };
 
     return this.rest.request<null, TenantManagement.Response>(request);

npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts

@@ -21,11 +21,16 @@ export class TenantManagementState {
     return result.items || [];
   }
 
+  @Selector()
+  static getTenantsTotalCount({ result }: TenantManagement.State): number {
+    return result.totalCount;
+  }
+
   constructor(private tenantManagementService: TenantManagementService) {}
 
   @Action(TenantManagementGet)
-  get({ patchState }: StateContext<TenantManagement.State>) {
-    return this.tenantManagementService.get().pipe(
+  get({ patchState }: StateContext<TenantManagement.State>, { payload }: TenantManagementGet) {
+    return this.tenantManagementService.get(payload).pipe(
       tap(result =>
         patchState({
           result,

npm/packs/chart.js/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.0",
+  "version": "0.8.1",
   "name": "@abp/chart.js",
   "publishConfig": {
     "access": "public"

samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContextModelCreatingExtensions.cs

@@ -17,11 +17,7 @@ namespace Acme.BookStore.EntityFrameworkCore
             builder.Entity<Book>(b =>
             {
                 b.ToTable(BookStoreConsts.DbTablePrefix + "Books", BookStoreConsts.DbSchema);
-
-                b.ConfigureAudited();
-                b.ConfigureExtraProperties();
-                b.ConfigureConcurrencyStamp();
-
+                b.ConfigureByConvention();
                 b.Property(x => x.Name).IsRequired().HasMaxLength(128);
             });
         }

templates/app/angular/src/environments/environment.hmr.ts

@@ -3,7 +3,7 @@ export const environment = {
   hmr: true,
   oAuthConfig: {
     issuer: 'https://localhost:44305',
-    clientId: 'MyProjectName_ConsoleTestApp',
+    clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'MyProjectName',
     showDebugInformation: true,

templates/app/angular/src/environments/environment.prod.ts

@@ -3,7 +3,7 @@ export const environment = {
   hmr: false,
   oAuthConfig: {
     issuer: 'https://localhost:44305',
-    clientId: 'MyProjectName_ConsoleTestApp',
+    clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'MyProjectName',
     showDebugInformation: true,

templates/app/angular/src/environments/environment.ts

@@ -3,7 +3,7 @@ export const environment = {
   hmr: false,
   oAuthConfig: {
     issuer: 'https://localhost:44305',
-    clientId: 'MyProjectName_ConsoleTestApp',
+    clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'MyProjectName',
     showDebugInformation: true,

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json

@@ -9,8 +9,8 @@
         "ClientSecret": "1q2w3e*",
         "RootUrl": "https://localhost:44302"
       },
-      "MyProjectName_ConsoleTestApp": {
-        "ClientId": "MyProjectName_ConsoleTestApp",
+      "MyProjectName_App": {
+        "ClientId": "MyProjectName_App",
         "ClientSecret": "1q2w3e*"
       }
     }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs

@@ -126,14 +126,14 @@ namespace MyCompanyName.MyProjectName.IdentityServer
             }
 
             //Console Test Client
-            var consoleClientId = configurationSection["MyProjectName_ConsoleTestApp:ClientId"];
+            var consoleClientId = configurationSection["MyProjectName_App:ClientId"];
             if (!consoleClientId.IsNullOrWhiteSpace())
             {
                 await CreateClientAsync(
                     consoleClientId,
                     commonScopes,
                     new[] { "password", "client_credentials" },
-                    (configurationSection["MyProjectName_ConsoleTestApp:ClientSecret"] ?? "1q2w3e*").Sha256()
+                    (configurationSection["MyProjectName_App:ClientSecret"] ?? "1q2w3e*").Sha256()
                 );
             }
         }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs

@@ -40,10 +40,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore
             builder.Entity<AppUser>(b =>
             {
                 b.ToTable("AbpUsers"); //Sharing the same table "AbpUsers" with the IdentityUser
-
-                b.ConfigureFullAudited();
-                b.ConfigureExtraProperties();
-                b.ConfigureConcurrencyStamp();
+                b.ConfigureByConvention();
                 b.ConfigureAbpUser();
 
                 //Moved customization to a method so we can share it with the MyProjectNameMigrationsDbContext class

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json

@@ -6,9 +6,6 @@
   "ConnectionStrings": {
     "Default": "Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
-  "Redis": {
-    "Configuration": "127.0.0.1"
-  },
   "AuthServer": {
     "Authority": "https://localhost:44305"
   }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json

@@ -10,8 +10,8 @@
   },
   "IdentityServer": {
     "Clients": {
-      "MyProjectName_ConsoleTestApp": {
-        "ClientId": "MyProjectName_ConsoleTestApp"
+      "MyProjectName_App": {
+        "ClientId": "MyProjectName_App"
       }
     }
   }

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json

@@ -7,7 +7,7 @@
   "IdentityClients": {
     "Default": {
       "GrantType": "password",
-      "ClientId": "MyProjectName_ConsoleTestApp",
+      "ClientId": "MyProjectName_App",
       "ClientSecret": "1q2w3e*",
       "UserName": "admin",
       "UserPassword": "1q2w3E*",

templates/common.DotSettings

@@ -1 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" />

templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj → templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj

@@ -16,12 +16,12 @@
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="2.2.5" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.5" />
-    <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.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" />
-    <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
+    <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.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" />
+    <ProjectReference Include="..\..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,13 +38,4 @@
     <None Remove="Logs\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Pages\**\*.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Pages\**\*.css">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj

@@ -0,0 +1,58 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
+    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="2.2.5" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
+    <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.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" />
+    <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identityserver\src\Volo.Abp.IdentityServer.EntityFrameworkCore\Volo.Abp.IdentityServer.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.EntityFrameworkCore\Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.HttpApi\Volo.Abp.PermissionManagement.HttpApi.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.HttpApi\Volo.Abp.Identity.HttpApi.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.EntityFrameworkCore\Volo.Abp.TenantManagement.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Application\Volo.Abp.TenantManagement.Application.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.HttpApi\Volo.Abp.TenantManagement.HttpApi.csproj" />
+    <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Host.Shared\MyCompanyName.MyProjectName.Host.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Logs\**" />
+    <Content Remove="Logs\**" />
+    <EmbeddedResource Remove="Logs\**" />
+    <None Remove="Logs\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Pages\**\*.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Pages\**\*.css">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>