Merge pull request #7 from abpframework/dev

merge

modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

@@ -233,6 +233,13 @@ namespace Volo.Docs.Pages.Documents.Project
                     }
                 }
             }
+            else
+            {
+                LatestVersionInfo = new VersionInfoViewModel(
+                    $"{DocsAppConsts.Latest}",
+                    DocsAppConsts.Latest,
+                    true);
+            }
 
             VersionSelectItems = versions.Select(v => new SelectListItem
             {

npm/ng-packs/angular.json

@@ -75,11 +75,9 @@
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "packages/theme-basic/src/test.ts",
+            "coverage": true
-            "tsConfig": "packages/theme-basic/tsconfig.spec.json",
-            "karmaConfig": "packages/theme-basic/karma.conf.js"
           }
         },
         "lint": {
@@ -135,11 +133,9 @@
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "packages/permission-management/src/test.ts",
+            "coverage": true
-            "tsConfig": "packages/permission-management/tsconfig.spec.json",
-            "karmaConfig": "packages/permission-management/karma.conf.js"
           }
         },
         "lint": {
@@ -168,11 +164,9 @@
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "packages/identity/src/test.ts",
+            "coverage": true
-            "tsConfig": "packages/identity/tsconfig.spec.json",
-            "karmaConfig": "packages/identity/karma.conf.js"
           }
         },
         "lint": {
@@ -198,11 +192,9 @@
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "packages/feature-management/src/test.ts",
+            "coverage": true
-            "tsConfig": "packages/feature-management/tsconfig.spec.json",
-            "karmaConfig": "packages/feature-management/karma.conf.js"
           }
         },
         "lint": {
@@ -231,11 +223,9 @@
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "packages/tenant-management/src/test.ts",
+            "coverage": true
-            "tsConfig": "packages/tenant-management/tsconfig.spec.json",
-            "karmaConfig": "packages/tenant-management/karma.conf.js"
           }
         },
         "lint": {

npm/ng-packs/package.json

@@ -50,12 +50,12 @@
     "codelyzer": "^5.1.2",
     "cz-conventional-changelog": "3.0.2",
     "font-awesome": "^4.7.0",
-    "husky": "^3.0.7",
+    "husky": "^3.0.9",
     "jest": "^24.9.0",
     "jest-preset-angular": "^7.1.1",
     "just-clone": "3.1.0",
     "just-compare": "^1.3.0",
-    "lint-staged": "^9.4.0",
+    "lint-staged": "^9.4.2",
     "ng-packagr": "^5.5.0",
     "ngx-perfect-scrollbar": "^8.0.0",
     "ngxs-reset-plugin": "^1.2.0",

npm/ng-packs/packages/core/src/lib/tests/ng-model.component.spec.ts

@@ -0,0 +1,77 @@
+import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { createHostFactory, SpectatorHost } from '@ngneat/spectator';
+import { AbstractNgModelComponent } from '../abstracts';
+
+@Component({
+  selector: 'abp-test',
+  template: '',
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TestComponent),
+      multi: true,
+    },
+  ],
+})
+export class TestComponent extends AbstractNgModelComponent implements OnInit {
+  @Input() override: boolean;
+
+  ngOnInit() {
+    setTimeout(() => {
+      if (this.override) {
+        this.value = 'test';
+      }
+    }, 0);
+  }
+}
+
+describe('AbstractNgModelComponent', () => {
+  const createHost = createHostFactory({
+    component: TestComponent,
+    declarations: [AbstractNgModelComponent],
+    imports: [FormsModule],
+  });
+
+  it('should pass the value with ngModel', done => {
+    const spectator = createHost('<abp-test [(ngModel)]="val"></abp-test>', {
+      hostProps: {
+        val: '1',
+      },
+    });
+
+    setTimeout(() => {
+      expect(spectator.component.value).toBe('1');
+      done();
+    }, 0);
+  });
+
+  it('should set the value with ngModel', done => {
+    const spectator = createHost('<abp-test [(ngModel)]="val" [override]="override"></abp-test>', {
+      hostProps: {
+        val: '2',
+        override: true,
+      },
+    });
+
+    setTimeout(() => {
+      expect(spectator.hostComponent['val']).toBe('test');
+      done();
+    }, 0);
+  });
+
+  it('should not change value when disable is true', done => {
+    const spectator = createHost('<abp-test [(ngModel)]="val" [disabled]="true"></abp-test>', {
+      hostProps: {
+        val: '2',
+      },
+    });
+
+    spectator.component['val'] = '3';
+
+    setTimeout(() => {
+      expect(spectator.hostComponent['val']).toBe('2');
+      done();
+    }, 0);
+  });
+});

npm/ng-packs/packages/feature-management/jest.config.js

@@ -0,0 +1,7 @@
+const jestConfig = require('../../jest.config');
+
+module.exports = {
+  ...jestConfig,
+  name: 'feature-management',
+  'ts-jest': { allowSyntheticDefaultImports: true },
+};

npm/ng-packs/packages/feature-management/tsconfig.spec.json

@@ -1,9 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
+    "emitDecoratorMetadata": true,
-    "types": ["node", "jest"]
+    "esModuleInterop": true,
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
   },
-  "files": [],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }

npm/ng-packs/packages/identity/jest.config.js

@@ -0,0 +1,7 @@
+const jestConfig = require('../../jest.config');
+
+module.exports = {
+  ...jestConfig,
+  name: 'identity',
+  'ts-jest': { allowSyntheticDefaultImports: true },
+};

npm/ng-packs/packages/identity/tsconfig.spec.json

@@ -1,9 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
+    "emitDecoratorMetadata": true,
-    "types": ["node", "jest"]
+    "esModuleInterop": true,
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
   },
-  "files": [],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }

npm/ng-packs/packages/permission-management/jest.config.js

@@ -0,0 +1,7 @@
+const jestConfig = require('../../jest.config');
+
+module.exports = {
+  ...jestConfig,
+  name: 'permission-management',
+  'ts-jest': { allowSyntheticDefaultImports: true },
+};

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

@@ -7,7 +7,7 @@ import {
   Output,
   Renderer2,
   SimpleChanges,
-  TrackByFunction
+  TrackByFunction,
 } from '@angular/core';
 import { Select, Store } from '@ngxs/store';
 import { from, Observable } from 'rxjs';
@@ -22,7 +22,7 @@ type PermissionWithMargin = PermissionManagement.Permission & {
 
 @Component({
   selector: 'abp-permission-management',
-  templateUrl: './permission-management.component.html'
+  templateUrl: './permission-management.component.html',
 })
 export class PermissionManagementComponent implements OnInit, OnChanges {
   @Input()
@@ -54,7 +54,7 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
   @Select(PermissionManagementState.getPermissionGroups)
   groups$: Observable<PermissionManagement.Group[]>;
 
-  @Select(PermissionManagementState.getEntitiyDisplayName)
+  @Select(PermissionManagementState.getEntityDisplayName)
   entityName$: Observable<string>;
 
   selectedGroup: PermissionManagement.Group;
@@ -72,7 +72,7 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
   get selectedGroupPermissions$(): Observable<PermissionWithMargin[]> {
     return this.groups$.pipe(
       map(groups =>
-        this.selectedGroup ? groups.find(group => group.name === this.selectedGroup.name).permissions : []
+        this.selectedGroup ? groups.find(group => group.name === this.selectedGroup.name).permissions : [],
       ),
       map<PermissionManagement.Permission[], PermissionWithMargin[]>(permissions =>
         permissions.map(
@@ -80,10 +80,10 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
             (({
               ...permission,
               margin: findMargin(permissions, permission),
-              isGranted: this.permissions.find(per => per.name === permission.name).isGranted
+              isGranted: this.permissions.find(per => per.name === permission.name).isGranted,
-            } as any) as PermissionWithMargin)
+            } as any) as PermissionWithMargin),
-        )
+        ),
-      )
+      ),
     );
   }
 
@@ -165,7 +165,7 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
         this.permissions = [
           ...this.permissions.slice(0, index),
           { ...this.permissions[index], isGranted: !this.selectThisTab },
-          ...this.permissions.slice(index + 1)
+          ...this.permissions.slice(index + 1),
         ];
       });
     });
@@ -176,7 +176,7 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
   onClickSelectAll() {
     this.permissions = this.permissions.map(permission => ({
       ...permission,
-      isGranted: !this.selectAllTab
+      isGranted: !this.selectAllTab,
     }));
 
     this.selectThisTab = !this.selectAllTab;
@@ -190,12 +190,12 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
   submit() {
     this.modalBusy = true;
     const unchangedPermissions = getPermissions(
-      this.store.selectSnapshot(PermissionManagementState.getPermissionGroups)
+      this.store.selectSnapshot(PermissionManagementState.getPermissionGroups),
     );
 
     const changedPermissions: PermissionManagement.MinimumPermission[] = this.permissions
       .filter(per =>
-        unchangedPermissions.find(unchanged => unchanged.name === per.name).isGranted === per.isGranted ? false : true
+        unchangedPermissions.find(unchanged => unchanged.name === per.name).isGranted === per.isGranted ? false : true,
       )
       .map(({ name, isGranted }) => ({ name, isGranted }));
 
@@ -205,8 +205,8 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
           new UpdatePermissions({
             providerKey: this.providerKey,
             providerName: this.providerName,
-            permissions: changedPermissions
+            permissions: changedPermissions,
-          })
+          }),
         )
         .subscribe(() => {
           this.modalBusy = false;
@@ -227,8 +227,8 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
       .dispatch(
         new GetPermissions({
           providerKey: this.providerKey,
-          providerName: this.providerName
+          providerName: this.providerName,
-        })
+        }),
       )
       .pipe(pluck('PermissionManagementState', 'permissionRes'))
       .subscribe((permissionRes: PermissionManagement.Response) => {

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

@@ -12,6 +12,6 @@ export class PermissionManagementStateService {
     return this.store.selectSnapshot(PermissionManagementState.getPermissionGroups);
   }
   getEntityDisplayName() {
-    return this.store.selectSnapshot(PermissionManagementState.getPermissionGroups);
+    return this.store.selectSnapshot(PermissionManagementState.getEntityDisplayName);
   }
 }

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

@@ -15,7 +15,7 @@ export class PermissionManagementState {
   }
 
   @Selector()
-  static getEntitiyDisplayName({ permissionRes }: PermissionManagement.State): string {
+  static getEntityDisplayName({ permissionRes }: PermissionManagement.State): string {
     return permissionRes.entityDisplayName;
   }
 

npm/ng-packs/packages/permission-management/tsconfig.spec.json

@@ -1,9 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
+    "emitDecoratorMetadata": true,
-    "types": ["node", "jest"]
+    "esModuleInterop": true,
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
   },
-  "files": [],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }

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

@@ -12,6 +12,7 @@ export class SettingManagementConfigService {
       name: 'AbpSettingManagement::Settings',
       path: 'setting-management',
       parentName: 'AbpUiNavigation::Menu:Administration',
+      requiredPolicy: 'AbpAccount.SettingManagement',
       layout: eLayoutType.application,
       order: 6,
       iconClass: 'fa fa-cog',

npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts

@@ -7,7 +7,9 @@ const routes: Routes = [
   {
     path: '',
     component: DynamicLayoutComponent,
-    children: [{ path: '', component: SettingManagementComponent }],
+    children: [
+      { path: '', component: SettingManagementComponent, data: { requiredPolicy: 'AbpAccount.SettingManagement' } },
+    ],
   },
 ];
 

npm/ng-packs/packages/tenant-management/jest.config.js

@@ -0,0 +1,7 @@
+const jestConfig = require('../../jest.config');
+
+module.exports = {
+  ...jestConfig,
+  name: 'tenant-management',
+  'ts-jest': { allowSyntheticDefaultImports: true },
+};

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

@@ -8,7 +8,7 @@ import { TenantManagementState } from '../states/tenant-management.state';
 export class TenantManagementStateService {
   constructor(private store: Store) {}
 
-  getTenants() {
+  get() {
     return this.store.selectSnapshot(TenantManagementState.get);
   }
 

npm/ng-packs/packages/tenant-management/tsconfig.spec.json

@@ -1,9 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
+    "emitDecoratorMetadata": true,
-    "types": ["node", "jest"]
+    "esModuleInterop": true,
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
   },
-  "files": [],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }

npm/ng-packs/packages/theme-basic/jest.config.js

@@ -0,0 +1,7 @@
+const jestConfig = require('../../jest.config');
+
+module.exports = {
+  ...jestConfig,
+  name: 'theme-basic',
+  'ts-jest': { allowSyntheticDefaultImports: true },
+};

npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html

@@ -15,10 +15,10 @@
     >
       <span class="navbar-toggler-icon"></span>
     </button>
-    <div class="navbar-collapse" id="main-navbar-collapse">
+    <div class="navbar-collapse" [class.overflow-hidden]="smallScreen" id="main-navbar-collapse">
       <ng-container *ngTemplateOutlet="!smallScreen ? navigations : null"></ng-container>
 
-      <div *ngIf="smallScreen" class="overflow-hidden" [@collapseWithMargin]="isCollapsed ? 'collapsed' : 'expanded'">
+      <div *ngIf="smallScreen" [@collapseWithMargin]="isCollapsed ? 'collapsed' : 'expanded'">
         <ng-container *ngTemplateOutlet="navigations"></ng-container>
       </div>
 

npm/ng-packs/packages/theme-basic/tsconfig.spec.json

@@ -1,9 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
+    "emitDecoratorMetadata": true,
-    "types": ["node", "jest"]
+    "esModuleInterop": true,
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
   },
-  "files": [],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }

samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs

@@ -16,7 +16,7 @@ namespace Acme.BookStore
 {
     [DependsOn(
         typeof(AbpAuditLoggingDomainSharedModule),
-        typeof(BackgroundJobsDomainSharedModule),
+        typeof(AbpBackgroundJobsDomainSharedModule),
         typeof(AbpFeatureManagementDomainSharedModule),
         typeof(AbpIdentityDomainSharedModule),
         typeof(AbpIdentityServerDomainSharedModule),

samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs

@@ -16,7 +16,7 @@ namespace Acme.BookStore
     [DependsOn(
         typeof(BookStoreDomainSharedModule),
         typeof(AbpAuditLoggingDomainModule),
-        typeof(BackgroundJobsDomainModule),
+        typeof(AbpBackgroundJobsDomainModule),
         typeof(AbpFeatureManagementDomainModule),
         typeof(AbpIdentityDomainModule),
         typeof(AbpPermissionManagementDomainIdentityModule),

samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs

@@ -54,7 +54,7 @@ namespace Acme.BookStore
             ConfigureSwaggerServices(context);
         }
 
-        private void ConfigureUrls(IConfigurationRoot configuration)
+        private void ConfigureUrls(IConfiguration configuration)
         {
             Configure<AppUrlOptions>(options =>
             {
@@ -86,7 +86,7 @@ namespace Acme.BookStore
             });
         }
 
-        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
+        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddAuthentication()
                 .AddIdentityServerAuthentication(options =>
@@ -123,7 +123,7 @@ namespace Acme.BookStore
             });
         }
 
-        private void ConfigureCors(ServiceConfigurationContext context, IConfigurationRoot configuration)
+        private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddCors(options =>
             {

samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.MongoDB/MongoDb/BookStoreMongoDbModule.cs

@@ -17,7 +17,7 @@ namespace Acme.BookStore.MongoDB
         typeof(AbpSettingManagementMongoDbModule),
         typeof(AbpIdentityMongoDbModule),
         typeof(AbpIdentityServerMongoDbModule),
-        typeof(BackgroundJobsMongoDbModule),
+        typeof(AbpBackgroundJobsMongoDbModule),
         typeof(AbpAuditLoggingMongoDbModule),
         typeof(AbpTenantManagementMongoDbModule),
         typeof(AbpFeatureManagementMongoDbModule)

samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs

@@ -17,7 +17,7 @@ namespace Acme.BookStore
 {
     [DependsOn(
         typeof(AbpAuditLoggingDomainSharedModule),
-        typeof(BackgroundJobsDomainSharedModule),
+        typeof(AbpBackgroundJobsDomainSharedModule),
         typeof(AbpFeatureManagementDomainSharedModule),
         typeof(AbpIdentityDomainSharedModule),
         typeof(AbpIdentityServerDomainSharedModule),

samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs

@@ -17,7 +17,7 @@ namespace Acme.BookStore
     [DependsOn(
         typeof(BookStoreDomainSharedModule),
         typeof(AbpAuditLoggingDomainModule),
-        typeof(BackgroundJobsDomainModule),
+        typeof(AbpBackgroundJobsDomainModule),
         typeof(AbpFeatureManagementDomainModule),
         typeof(AbpIdentityDomainModule),
         typeof(AbpPermissionManagementDomainIdentityModule),

samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs

@@ -19,7 +19,7 @@ namespace Acme.BookStore.EntityFrameworkCore
             return new BookStoreMigrationsDbContext(builder.Options);
         }
 
-        private static IConfigurationRoot BuildConfiguration()
+        private static IConfiguration BuildConfiguration()
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())

samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs

@@ -21,7 +21,7 @@ namespace Acme.BookStore.EntityFrameworkCore
         typeof(AbpPermissionManagementEntityFrameworkCoreModule),
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
         typeof(AbpEntityFrameworkCoreSqlServerModule),
-        typeof(BackgroundJobsEntityFrameworkCoreModule),
+        typeof(AbpBackgroundJobsEntityFrameworkCoreModule),
         typeof(AbpAuditLoggingEntityFrameworkCoreModule),
         typeof(AbpTenantManagementEntityFrameworkCoreModule),
         typeof(AbpFeatureManagementEntityFrameworkCoreModule),

samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs

@@ -82,7 +82,7 @@ namespace Acme.BookStore.Web
             ConfigureSwaggerServices(context.Services);
         }
 
-        private void ConfigureUrls(IConfigurationRoot configuration)
+        private void ConfigureUrls(IConfiguration configuration)
         {
             Configure<AppUrlOptions>(options =>
             {
@@ -90,7 +90,7 @@ namespace Acme.BookStore.Web
             });
         }
 
-        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
+        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddAuthentication()
                 .AddIdentityServerAuthentication(options =>

samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs

@@ -89,7 +89,7 @@ namespace Acme.BookStore.BookManagement
                     options.ApiName = "BookManagement";
                 });
 
-            Configure<AbpCacheOptions>(options =>
+            Configure<AbpDistributedCacheOptions>(options =>
             {
                 options.KeyPrefix = "BookManagement:";
             });

samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/EntityFrameworkCore/MyProjectHttpApiHostMigrationsDbContextFactory.cs

@@ -17,7 +17,7 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore
             return new MyProjectHttpApiHostMigrationsDbContext(builder.Options);
         }
 
-        private static IConfigurationRoot BuildConfiguration()
+        private static IConfiguration BuildConfiguration()
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())

samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs

@@ -108,7 +108,7 @@ namespace Acme.BookStore.BookManagement
                     options.ApiName = configuration["AuthServer:ApiName"];
                 });
 
-            Configure<AbpCacheOptions>(options =>
+            Configure<AbpDistributedCacheOptions>(options =>
             {
                 options.KeyPrefix = "BookManagement:";
             });

samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/EntityFrameworkCore/IdentityServerHostMigrationsDbContextFactory.cs

@@ -17,7 +17,7 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore
             return new IdentityServerHostMigrationsDbContext(builder.Options);
         }
 
-        private static IConfigurationRoot BuildConfiguration()
+        private static IConfiguration BuildConfiguration()
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())

samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs

@@ -85,15 +85,15 @@ namespace Acme.BookStore.BookManagement
             ConfigureRedis(context, configuration, hostingEnvironment);
         }
         
-        private void ConfigureCache(IConfigurationRoot configuration)
+        private void ConfigureCache(IConfiguration configuration)
         {
-            Configure<AbpCacheOptions>(options =>
+            Configure<AbpDistributedCacheOptions>(options =>
             {
                 options.KeyPrefix = "BookManagement:";
             });
         }
 
-        private void ConfigureUrls(IConfigurationRoot configuration)
+        private void ConfigureUrls(IConfiguration configuration)
         {
             Configure<AppUrlOptions>(options =>
             {
@@ -109,7 +109,7 @@ namespace Acme.BookStore.BookManagement
             });
         }
 
-        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
+        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddAuthentication(options =>
                 {
@@ -177,7 +177,7 @@ namespace Acme.BookStore.BookManagement
 
         private void ConfigureRedis(
             ServiceConfigurationContext context,
-            IConfigurationRoot configuration,
+            IConfiguration configuration,
             IWebHostEnvironment hostingEnvironment)
         {
             context.Services.AddStackExchangeRedisCache(options =>

samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs

@@ -17,7 +17,7 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore
             return new UnifiedDbContext(builder.Options);
         }
 
-        private static IConfigurationRoot BuildConfiguration()
+        private static IConfiguration BuildConfiguration()
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())

samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs

@@ -16,7 +16,7 @@ namespace Acme.BookStore
 {
     [DependsOn(
         typeof(AbpAuditLoggingDomainSharedModule),
-        typeof(BackgroundJobsDomainSharedModule),
+        typeof(AbpBackgroundJobsDomainSharedModule),
         typeof(AbpFeatureManagementDomainSharedModule),
         typeof(AbpIdentityDomainSharedModule),
         typeof(AbpIdentityServerDomainSharedModule),

samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs

@@ -16,7 +16,7 @@ namespace Acme.BookStore
     [DependsOn(
         typeof(BookStoreDomainSharedModule),
         typeof(AbpAuditLoggingDomainModule),
-        typeof(BackgroundJobsDomainModule),
+        typeof(AbpBackgroundJobsDomainModule),
         typeof(AbpFeatureManagementDomainModule),
         typeof(AbpIdentityDomainModule),
         typeof(AbpPermissionManagementDomainIdentityModule),

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

@@ -20,7 +20,7 @@ namespace Acme.BookStore.EntityFrameworkCore
         typeof(AbpPermissionManagementEntityFrameworkCoreModule),
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
         typeof(AbpEntityFrameworkCoreSqlServerModule),
-        typeof(BackgroundJobsEntityFrameworkCoreModule),
+        typeof(AbpBackgroundJobsEntityFrameworkCoreModule),
         typeof(AbpAuditLoggingEntityFrameworkCoreModule),
         typeof(AbpTenantManagementEntityFrameworkCoreModule),
         typeof(AbpFeatureManagementEntityFrameworkCoreModule)

samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs

@@ -73,7 +73,7 @@ namespace Acme.BookStore.Web
             ConfigureSwaggerServices(context.Services);
         }
 
-        private void ConfigureUrls(IConfigurationRoot configuration)
+        private void ConfigureUrls(IConfiguration configuration)
         {
             Configure<AppUrlOptions>(options =>
             {
@@ -81,7 +81,7 @@ namespace Acme.BookStore.Web
             });
         }
 
-        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
+        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddAuthentication()
                 .AddIdentityServerAuthentication(options =>

samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs

@@ -16,7 +16,7 @@ namespace DashboardDemo
 {
     [DependsOn(
         typeof(AbpAuditLoggingDomainSharedModule),
-        typeof(BackgroundJobsDomainSharedModule),
+        typeof(AbpBackgroundJobsDomainSharedModule),
         typeof(AbpFeatureManagementDomainSharedModule),
         typeof(AbpIdentityDomainSharedModule),
         typeof(AbpIdentityServerDomainSharedModule),

samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs

@@ -16,7 +16,7 @@ namespace DashboardDemo
     [DependsOn(
         typeof(DashboardDemoDomainSharedModule),
         typeof(AbpAuditLoggingDomainModule),
-        typeof(BackgroundJobsDomainModule),
+        typeof(AbpBackgroundJobsDomainModule),
         typeof(AbpFeatureManagementDomainModule),
         typeof(AbpIdentityDomainModule),
         typeof(AbpPermissionManagementDomainIdentityModule),

samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs

@@ -19,7 +19,7 @@ namespace DashboardDemo.EntityFrameworkCore
             return new DashboardDemoMigrationsDbContext(builder.Options);
         }
 
-        private static IConfigurationRoot BuildConfiguration()
+        private static IConfiguration BuildConfiguration()
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())

samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs

@@ -20,7 +20,7 @@ namespace DashboardDemo.EntityFrameworkCore
         typeof(AbpPermissionManagementEntityFrameworkCoreModule),
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
         typeof(AbpEntityFrameworkCoreSqlServerModule),
-        typeof(BackgroundJobsEntityFrameworkCoreModule),
+        typeof(AbpBackgroundJobsEntityFrameworkCoreModule),
         typeof(AbpAuditLoggingEntityFrameworkCoreModule),
         typeof(AbpTenantManagementEntityFrameworkCoreModule),
         typeof(AbpFeatureManagementEntityFrameworkCoreModule)

samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs

@@ -79,7 +79,7 @@ namespace DashboardDemo.Web
             ConfigureSwaggerServices(context.Services);
         }
 
-        private void ConfigureUrls(IConfigurationRoot configuration)
+        private void ConfigureUrls(IConfiguration configuration)
         {
             Configure<AppUrlOptions>(options =>
             {
@@ -87,7 +87,7 @@ namespace DashboardDemo.Web
             });
         }
 
-        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
+        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddAuthentication()
                 .AddIdentityServerAuthentication(options =>