Merge remote-tracking branch 'abpframework/dev' into Translate

.github/workflows/main.yml

@@ -14,15 +14,17 @@ jobs:
   build-test:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-dotnet@master
-        with:
-          dotnet-version: "3.1.100"
+    - uses: actions/checkout@v2
+    - uses: actions/setup-dotnet@master
+      with:
+        dotnet-version: 3.1.100
 
-      - name: Build All
-        run: .\build\build-all.ps1
-        shell: pwsh
+    - name: Build All
+      run: .\build-all.ps1
+      working-directory: .\build
+      shell: powershell
 
-      - name: Test All
-        run: .\build\test-all.ps1
-        shell: pwsh
+    - name: Test All
+      run: .\test-all.ps1
+      working-directory: .\build
+      shell: powershell

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@@ -75,7 +75,8 @@
     "AddDeveloper": "Add developer",
     "Create": "Create",
     "UserNotFound": "User not found",
-    "{0}WillBeRemovedFromMembers": "{0} Will be removed from members",
+    "{0}WillBeRemovedFromDevelopers": "{0} Will be removed from developers, do you confirm?",
+    "{0}WillBeRemovedFromOwners": "{0} Will be removed from owners, do you confirm?",
     "Computers": "Computers",
     "UniqueComputerId": "Unique computer id",
     "LastSeenDate": "Last seen date",

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.6.0</Version>
+    <Version>2.7.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>

docs/en/How-To/Customize-SignIn-Manager.md

@@ -42,14 +42,14 @@ public override async Task<Microsoft.AspNetCore.Identity.ExternalLoginInfo> GetE
 {
     var auth = await Context.AuthenticateAsync(Microsoft.AspNetCore.Identity.IdentityConstants.ExternalScheme);
     var items = auth?.Properties?.Items;
-    if (auth?.Principal == null || items == null || !items.ContainsKey("LoginProviderKey"))
+    if (auth?.Principal == null || items == null || !items.ContainsKey(LoginProviderKey))
     {
         return null;
     }
 
     if (expectedXsrf != null)
     {
-        if (!items.ContainsKey("XsrfKey"))
+        if (!items.ContainsKey(XsrfKey))
         {
             return null;
         }

docs/en/Tutorials/Part-1.md

@@ -982,11 +982,13 @@ import { GetBooks } from '../actions/books.actions';
 import { Books } from '../models/books';
 import { BooksService } from '../../books/shared/books.service';
 import { tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
 
 @State<Books.State>({
   name: 'BooksState',
   defaults: { books: {} } as Books.State,
 })
+@Injectable()
 export class BooksState {
   @Selector()
   static getBooks(state: Books.State) {

docs/en/Tutorials/Part-2.md

@@ -574,11 +574,13 @@ import { GetBooks, CreateUpdateBook } from '../actions/books.actions'; //<== add
 import { Books } from '../models/books';
 import { BooksService } from '../../books/shared/books.service';
 import { tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
 
 @State<Books.State>({
   name: 'BooksState',
   defaults: { books: {} } as Books.State,
 })
+@Injectable()
 export class BooksState {
   @Selector()
   static getBooks(state: Books.State) {
@@ -1330,11 +1332,13 @@ import { GetBooks, CreateUpdateBook, DeleteBook } from '../actions/books.actions
 import { Books } from '../models/books';
 import { BooksService } from '../../books/shared/books.service';
 import { tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
 
 @State<Books.State>({
   name: 'BooksState',
   defaults: { books: {} } as Books.State,
 })
+@Injectable()
 export class BooksState {
   @Selector()
   static getBooks(state: Books.State) {

docs/en/UI/AspNetCore/Tag-Helpers/Index.md

@@ -12,18 +12,18 @@ ABP Framework also adds some **useful features** to the standard bootstrap compo
 
 Here, the list of components those are wrapped by the ABP Framework:
 
+* [Alerts](Alerts.md)
 * [Buttons](Buttons.md)
 * [Cards](Cards.md)
-* [Alerts](Alerts.md)
-* [Tabs](Tabs.md)
-* [Grids](Grids.md)
-* [Modals](Modals.md)
 * [Collapse](Collapse.md)
 * [Dropdowns](Dropdowns.md)
+* [Grids](Grids.md)
 * [List Groups](List-Groups.md)
+* [Modals](Modals.md)
 * [Paginator](Paginator.md)
 * [Popovers](Popovers.md)
 * [Progress Bars](Progress-Bars.md)
+* [Tabs](Tabs.md)
 * [Tooltips](Tooltips.md)
 * ...
 

docs/pt-BR/Tutorials/Angular/Part-I.md

@@ -537,11 +537,13 @@ import { GetBooks } from '../actions/books.actions';
 import { Books } from '../models/books';
 import { BooksService } from '../../books/shared/books.service';
 import { tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
 
 @State<Books.State>({
   name: 'BooksState',
   defaults: { books: {} } as Books.State,
 })
+@Injectable()
 export class BooksState {
   @Selector()
   static getBooks(state: Books.State) {

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/utils/abp-utils.umd.js

@@ -0,0 +1,600 @@
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('just-compare')) :
+    typeof define === 'function' && define.amd ? define('@abp/utils', ['exports', 'just-compare'], factory) :
+    (global = global || self, factory((global.abp = global.abp || {}, global.abp.utils = global.abp.utils || {}, global.abp.utils.common = {}), global.compare));
+}(this, (function (exports, compare) { 'use strict';
+
+    compare = compare && Object.prototype.hasOwnProperty.call(compare, 'default') ? compare['default'] : compare;
+
+    /*! *****************************************************************************
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain a copy of the
+    License at http://www.apache.org/licenses/LICENSE-2.0
+
+    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+    MERCHANTABLITY OR NON-INFRINGEMENT.
+
+    See the Apache Version 2.0 License for specific language governing permissions
+    and limitations under the License.
+    ***************************************************************************** */
+    /* global Reflect, Promise */
+
+    var extendStatics = function(d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+
+    function __extends(d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    }
+
+    var __assign = function() {
+        __assign = Object.assign || function __assign(t) {
+            for (var s, i = 1, n = arguments.length; i < n; i++) {
+                s = arguments[i];
+                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+            }
+            return t;
+        };
+        return __assign.apply(this, arguments);
+    };
+
+    function __rest(s, e) {
+        var t = {};
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+            t[p] = s[p];
+        if (s != null && typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+                if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                    t[p[i]] = s[p[i]];
+            }
+        return t;
+    }
+
+    function __decorate(decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    }
+
+    function __param(paramIndex, decorator) {
+        return function (target, key) { decorator(target, key, paramIndex); }
+    }
+
+    function __metadata(metadataKey, metadataValue) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+    }
+
+    function __awaiter(thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    }
+
+    function __generator(thisArg, body) {
+        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+        function verb(n) { return function (v) { return step([n, v]); }; }
+        function step(op) {
+            if (f) throw new TypeError("Generator is already executing.");
+            while (_) try {
+                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+                if (y = 0, t) op = [op[0] & 2, t.value];
+                switch (op[0]) {
+                    case 0: case 1: t = op; break;
+                    case 4: _.label++; return { value: op[1], done: false };
+                    case 5: _.label++; y = op[1]; op = [0]; continue;
+                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                    default:
+                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                        if (t[2]) _.ops.pop();
+                        _.trys.pop(); continue;
+                }
+                op = body.call(thisArg, _);
+            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+        }
+    }
+
+    function __exportStar(m, exports) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+
+    function __values(o) {
+        var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+        if (m) return m.call(o);
+        if (o && typeof o.length === "number") return {
+            next: function () {
+                if (o && i >= o.length) o = void 0;
+                return { value: o && o[i++], done: !o };
+            }
+        };
+        throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+    }
+
+    function __read(o, n) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator];
+        if (!m) return o;
+        var i = m.call(o), r, ar = [], e;
+        try {
+            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+        }
+        catch (error) { e = { error: error }; }
+        finally {
+            try {
+                if (r && !r.done && (m = i["return"])) m.call(i);
+            }
+            finally { if (e) throw e.error; }
+        }
+        return ar;
+    }
+
+    function __spread() {
+        for (var ar = [], i = 0; i < arguments.length; i++)
+            ar = ar.concat(__read(arguments[i]));
+        return ar;
+    }
+
+    function __spreadArrays() {
+        for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+        for (var r = Array(s), k = 0, i = 0; i < il; i++)
+            for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+                r[k] = a[j];
+        return r;
+    };
+
+    function __await(v) {
+        return this instanceof __await ? (this.v = v, this) : new __await(v);
+    }
+
+    function __asyncGenerator(thisArg, _arguments, generator) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var g = generator.apply(thisArg, _arguments || []), i, q = [];
+        return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+        function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+        function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+        function fulfill(value) { resume("next", value); }
+        function reject(value) { resume("throw", value); }
+        function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+    }
+
+    function __asyncDelegator(o) {
+        var i, p;
+        return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+    }
+
+    function __asyncValues(o) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var m = o[Symbol.asyncIterator], i;
+        return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+        function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+        function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+    }
+
+    function __makeTemplateObject(cooked, raw) {
+        if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+        return cooked;
+    };
+
+    function __importStar(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+        result.default = mod;
+        return result;
+    }
+
+    function __importDefault(mod) {
+        return (mod && mod.__esModule) ? mod : { default: mod };
+    }
+
+    function __classPrivateFieldGet(receiver, privateMap) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to get private field on non-instance");
+        }
+        return privateMap.get(receiver);
+    }
+
+    function __classPrivateFieldSet(receiver, privateMap, value) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to set private field on non-instance");
+        }
+        privateMap.set(receiver, value);
+        return value;
+    }
+
+    /* tslint:disable:no-non-null-assertion */
+    var ListNode = /** @class */ (function () {
+        function ListNode(value) {
+            this.value = value;
+        }
+        return ListNode;
+    }());
+    var LinkedList = /** @class */ (function () {
+        function LinkedList() {
+            this.size = 0;
+        }
+        Object.defineProperty(LinkedList.prototype, "head", {
+            get: function () {
+                return this.first;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(LinkedList.prototype, "tail", {
+            get: function () {
+                return this.last;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(LinkedList.prototype, "length", {
+            get: function () {
+                return this.size;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        LinkedList.prototype.attach = function (value, previousNode, nextNode) {
+            if (!previousNode)
+                return this.addHead(value);
+            if (!nextNode)
+                return this.addTail(value);
+            var node = new ListNode(value);
+            node.previous = previousNode;
+            previousNode.next = node;
+            node.next = nextNode;
+            nextNode.previous = node;
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.attachMany = function (values, previousNode, nextNode) {
+            if (!values.length)
+                return [];
+            if (!previousNode)
+                return this.addManyHead(values);
+            if (!nextNode)
+                return this.addManyTail(values);
+            var list = new LinkedList();
+            list.addManyTail(values);
+            list.first.previous = previousNode;
+            previousNode.next = list.first;
+            list.last.next = nextNode;
+            nextNode.previous = list.last;
+            this.size += values.length;
+            return list.toNodeArray();
+        };
+        LinkedList.prototype.detach = function (node) {
+            if (!node.previous)
+                return this.dropHead();
+            if (!node.next)
+                return this.dropTail();
+            node.previous.next = node.next;
+            node.next.previous = node.previous;
+            this.size--;
+            return node;
+        };
+        LinkedList.prototype.add = function (value) {
+            var _this = this;
+            return {
+                after: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addAfter).call.apply(_a, __spread([_this, value], params));
+                },
+                before: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addBefore).call.apply(_a, __spread([_this, value], params));
+                },
+                byIndex: function (position) { return _this.addByIndex(value, position); },
+                head: function () { return _this.addHead(value); },
+                tail: function () { return _this.addTail(value); },
+            };
+        };
+        LinkedList.prototype.addMany = function (values) {
+            var _this = this;
+            return {
+                after: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addManyAfter).call.apply(_a, __spread([_this, values], params));
+                },
+                before: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addManyBefore).call.apply(_a, __spread([_this, values], params));
+                },
+                byIndex: function (position) { return _this.addManyByIndex(values, position); },
+                head: function () { return _this.addManyHead(values); },
+                tail: function () { return _this.addManyTail(values); },
+            };
+        };
+        LinkedList.prototype.addAfter = function (value, previousValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var previous = this.find(function (node) { return compareFn(node.value, previousValue); });
+            return previous ? this.attach(value, previous, previous.next) : this.addTail(value);
+        };
+        LinkedList.prototype.addBefore = function (value, nextValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var next = this.find(function (node) { return compareFn(node.value, nextValue); });
+            return next ? this.attach(value, next.previous, next) : this.addHead(value);
+        };
+        LinkedList.prototype.addByIndex = function (value, position) {
+            if (position < 0)
+                position += this.size;
+            else if (position >= this.size)
+                return this.addTail(value);
+            if (position <= 0)
+                return this.addHead(value);
+            var next = this.get(position);
+            return this.attach(value, next.previous, next);
+        };
+        LinkedList.prototype.addHead = function (value) {
+            var node = new ListNode(value);
+            node.next = this.first;
+            if (this.first)
+                this.first.previous = node;
+            else
+                this.last = node;
+            this.first = node;
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.addTail = function (value) {
+            var node = new ListNode(value);
+            if (this.first) {
+                node.previous = this.last;
+                this.last.next = node;
+                this.last = node;
+            }
+            else {
+                this.first = node;
+                this.last = node;
+            }
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.addManyAfter = function (values, previousValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var previous = this.find(function (node) { return compareFn(node.value, previousValue); });
+            return previous ? this.attachMany(values, previous, previous.next) : this.addManyTail(values);
+        };
+        LinkedList.prototype.addManyBefore = function (values, nextValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var next = this.find(function (node) { return compareFn(node.value, nextValue); });
+            return next ? this.attachMany(values, next.previous, next) : this.addManyHead(values);
+        };
+        LinkedList.prototype.addManyByIndex = function (values, position) {
+            if (position < 0)
+                position += this.size;
+            if (position <= 0)
+                return this.addManyHead(values);
+            if (position >= this.size)
+                return this.addManyTail(values);
+            var next = this.get(position);
+            return this.attachMany(values, next.previous, next);
+        };
+        LinkedList.prototype.addManyHead = function (values) {
+            var _this = this;
+            return values.reduceRight(function (nodes, value) {
+                nodes.unshift(_this.addHead(value));
+                return nodes;
+            }, []);
+        };
+        LinkedList.prototype.addManyTail = function (values) {
+            var _this = this;
+            return values.map(function (value) { return _this.addTail(value); });
+        };
+        LinkedList.prototype.drop = function () {
+            var _this = this;
+            return {
+                byIndex: function (position) { return _this.dropByIndex(position); },
+                byValue: function () {
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return _this.dropByValue.apply(_this, params);
+                },
+                byValueAll: function () {
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return _this.dropByValueAll.apply(_this, params);
+                },
+                head: function () { return _this.dropHead(); },
+                tail: function () { return _this.dropTail(); },
+            };
+        };
+        LinkedList.prototype.dropMany = function (count) {
+            var _this = this;
+            return {
+                byIndex: function (position) { return _this.dropManyByIndex(count, position); },
+                head: function () { return _this.dropManyHead(count); },
+                tail: function () { return _this.dropManyTail(count); },
+            };
+        };
+        LinkedList.prototype.dropByIndex = function (position) {
+            if (position < 0)
+                position += this.size;
+            var current = this.get(position);
+            return current ? this.detach(current) : undefined;
+        };
+        LinkedList.prototype.dropByValue = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var position = this.findIndex(function (node) { return compareFn(node.value, value); });
+            return position < 0 ? undefined : this.dropByIndex(position);
+        };
+        LinkedList.prototype.dropByValueAll = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var dropped = [];
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (compareFn(current.value, value)) {
+                    dropped.push(this.dropByIndex(position - dropped.length));
+                }
+            }
+            return dropped;
+        };
+        LinkedList.prototype.dropHead = function () {
+            var head = this.first;
+            if (head) {
+                this.first = head.next;
+                if (this.first)
+                    this.first.previous = undefined;
+                else
+                    this.last = undefined;
+                this.size--;
+                return head;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.dropTail = function () {
+            var tail = this.last;
+            if (tail) {
+                this.last = tail.previous;
+                if (this.last)
+                    this.last.next = undefined;
+                else
+                    this.first = undefined;
+                this.size--;
+                return tail;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.dropManyByIndex = function (count, position) {
+            if (count <= 0)
+                return [];
+            if (position < 0)
+                position = Math.max(position + this.size, 0);
+            else if (position >= this.size)
+                return [];
+            count = Math.min(count, this.size - position);
+            var dropped = [];
+            while (count--) {
+                var current = this.get(position);
+                dropped.push(this.detach(current));
+            }
+            return dropped;
+        };
+        LinkedList.prototype.dropManyHead = function (count) {
+            if (count <= 0)
+                return [];
+            count = Math.min(count, this.size);
+            var dropped = [];
+            while (count--)
+                dropped.unshift(this.dropHead());
+            return dropped;
+        };
+        LinkedList.prototype.dropManyTail = function (count) {
+            if (count <= 0)
+                return [];
+            count = Math.min(count, this.size);
+            var dropped = [];
+            while (count--)
+                dropped.push(this.dropTail());
+            return dropped;
+        };
+        LinkedList.prototype.find = function (predicate) {
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (predicate(current, position, this))
+                    return current;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.findIndex = function (predicate) {
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (predicate(current, position, this))
+                    return position;
+            }
+            return -1;
+        };
+        LinkedList.prototype.forEach = function (callback) {
+            for (var node = this.first, position = 0; node; position++, node = node.next) {
+                callback(node, position, this);
+            }
+        };
+        LinkedList.prototype.get = function (position) {
+            return this.find(function (_, index) { return position === index; });
+        };
+        LinkedList.prototype.indexOf = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            return this.findIndex(function (node) { return compareFn(node.value, value); });
+        };
+        LinkedList.prototype.toArray = function () {
+            var array = new Array(this.size);
+            this.forEach(function (node, index) { return (array[index] = node.value); });
+            return array;
+        };
+        LinkedList.prototype.toNodeArray = function () {
+            var array = new Array(this.size);
+            this.forEach(function (node, index) { return (array[index] = node); });
+            return array;
+        };
+        LinkedList.prototype.toString = function (mapperFn) {
+            if (mapperFn === void 0) { mapperFn = JSON.stringify; }
+            return this.toArray()
+                .map(function (value) { return mapperFn(value); })
+                .join(' <-> ');
+        };
+        // Cannot use Generator type because of ng-packagr
+        LinkedList.prototype[Symbol.iterator] = function () {
+            var node, position;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        node = this.first, position = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!node) return [3 /*break*/, 4];
+                        return [4 /*yield*/, node.value];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        position++, node = node.next;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        };
+        return LinkedList;
+    }());
+
+    exports.LinkedList = LinkedList;
+    exports.ListNode = ListNode;
+
+    Object.defineProperty(exports, '__esModule', { value: true });
+
+})));
+//# sourceMappingURL=abp-utils.umd.js.map

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs

@@ -1,13 +1,13 @@
-using System.IO;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using System.IO;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Menus;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo;
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/BasicThemeDemoMenuContributor.cs

@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Volo.Abp.UI.Navigation;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo
-{
-    public class BasicThemeDemoMenuContributor : IMenuContributor
-    {
-        public Task ConfigureMenuAsync(MenuConfigurationContext context)
-        {
-            if(context.Menu.Name == StandardMenus.Main)
-            {
-                AddMainMenuItems(context);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        private void AddMainMenuItems(MenuConfigurationContext context)
-        {
-            var menuItem = new ApplicationMenuItem("BasicThemeDemo.Components", "Components");
-
-            var items = new List<ApplicationMenuItem>()
-            {
-                new ApplicationMenuItem("BasicThemeDemo.Components.Alerts", "Alerts", url: "/Components/Alerts"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Badges", "Badges", url: "/Components/Badges"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Borders", "Borders", url: "/Components/Borders"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Breadcrumbs", "Breadcrumbs", url: "/Components/Breadcrumbs"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Buttons", "Buttons", url: "/Components/Buttons"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.ButtonGroups", "ButtonGroups", url: "/Components/ButtonGroups"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Cards", "Cards", url: "/Components/Cards"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Carousel", "Carousel", url: "/Components/Carousel"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Collapse", "Collapse", url: "/Components/Collapse"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Dropdowns", "Dropdowns", url: "/Components/Dropdowns"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.DynamicForms", "DynamicForms", url: "/Components/DynamicForms"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.FormElements", "FormElements", url: "/Components/FormElements"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Grids", "Grids", url: "/Components/Grids"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.ListGroups", "List Groups", url: "/Components/ListGroups"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Modals", "Modals", url: "/Components/Modals"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Navs", "Navs", url: "/Components/Navs"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Navbars", "Navbars", url: "/Components/Navbars"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Paginator", "Paginator", url: "/Components/Paginator"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Popovers", "Popovers", url: "/Components/Popovers"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.ProgressBars", "Progress Bars", url: "/Components/ProgressBars"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Tables", "Tables", url: "/Components/Tables"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Tabs", "Tabs", url: "/Components/Tabs"),
-                new ApplicationMenuItem("BasicThemeDemo.Components.Tooltips", "Tooltips", url: "/Components/Tooltips")
-            };
-            
-            items.OrderBy(x => x.Name)
-                 .ToList()
-                 .ForEach(x => menuItem.AddItem(x));
-
-            context.Menu.AddItem(menuItem);
-        }
-    }
-}

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Menus/BasicThemeDemoMenuContributor.cs

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Menus
+{
+    public class BasicThemeDemoMenuContributor : IMenuContributor
+    {
+        public Task ConfigureMenuAsync(MenuConfigurationContext context)
+        {
+            if(context.Menu.Name == StandardMenus.Main)
+            {
+                AddMainMenuItems(context);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private void AddMainMenuItems(MenuConfigurationContext context)
+        {
+            var menuItem = new ApplicationMenuItem(BasicThemeDemoMenus.Components.Root, "Components");
+
+            var items = new List<ApplicationMenuItem>()
+            {
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Alerts, "Alerts", url: "/Components/Alerts"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Badges, "Badges", url: "/Components/Badges"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Borders, "Borders", url: "/Components/Borders"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Breadcrumbs, "Breadcrumbs", url: "/Components/Breadcrumbs"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Buttons, "Buttons", url: "/Components/Buttons"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.ButtonGroups, "Button Groups", url: "/Components/ButtonGroups"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Cards, "Cards", url: "/Components/Cards"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Carousel, "Carousel", url: "/Components/Carousel"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Collapse, "Collapse", url: "/Components/Collapse"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Dropdowns, "Dropdowns", url: "/Components/Dropdowns"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.DynamicForms, "Dynamic Forms", url: "/Components/DynamicForms"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.FormElements, "Form Elements", url: "/Components/FormElements"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Grids, "Grids", url: "/Components/Grids"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.ListGroups, "List Groups", url: "/Components/ListGroups"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Modals, "Modals", url: "/Components/Modals"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Navs, "Navs", url: "/Components/Navs"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Navbars, "Navbars", url: "/Components/Navbars"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Paginator, "Paginator", url: "/Components/Paginator"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Popovers, "Popovers", url: "/Components/Popovers"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.ProgressBars, "Progress Bars", url: "/Components/ProgressBars"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Tables, "Tables", url: "/Components/Tables"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Tabs, "Tabs", url: "/Components/Tabs"),
+                new ApplicationMenuItem(BasicThemeDemoMenus.Components.Tooltips, "Tooltips", url: "/Components/Tooltips")
+            };
+            
+            items.OrderBy(x => x.Name)
+                 .ToList()
+                 .ForEach(x => menuItem.AddItem(x));
+
+            context.Menu.AddItem(menuItem);
+        }
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Menus/BasicThemeDemoMenus.cs

@@ -0,0 +1,36 @@
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Menus
+{
+    public class BasicThemeDemoMenus
+    {
+        private const string Prefix = "BasicThemeDemo";
+        public const string Home = Prefix + ".Home";
+
+        public static class Components
+        {
+            public const string Root = Prefix + ".Components";
+            public const string Alerts = Root + ".Alerts";
+            public const string Badges = Root + ".Badges";
+            public const string Borders = Root + ".Borders";
+            public const string Breadcrumbs = Root + ".Breadcrumbs";
+            public const string ButtonGroups = Root + ".ButtonGroups";
+            public const string Buttons = Root + ".Buttons";
+            public const string Cards = Root + ".Cards";
+            public const string Carousel = Root + ".Carousel";
+            public const string Collapse = Root + ".Collapse";
+            public const string Dropdowns = Root + ".Dropdowns";
+            public const string DynamicForms = Root + ".DynamicForms";
+            public const string FormElements = Root + ".FormElements";
+            public const string Grids = Root + ".Grids";
+            public const string ListGroups = Root + ".ListGroups";
+            public const string Modals = Root + ".Modals";
+            public const string Navbars = Root + ".Navbars";
+            public const string Navs = Root + ".Navs";
+            public const string Paginator = Root + ".Paginator";
+            public const string Popovers = Root + ".Popovers";
+            public const string ProgressBars = Root + ".ProgressBars";
+            public const string Tables = Root + ".Tables";
+            public const string Tabs = Root + ".Tabs";
+            public const string Tooltips = Root + ".Tooltips";
+        }
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Alerts/Index.cshtml

@@ -1,7 +1,14 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.AlertsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Alerts.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Alerts";
+}
 <h2>Alerts</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/alerts/" target="_blank"> Bootstrap Alert</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Alerts" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(AlertsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Badges/Index.cshtml

@@ -1,7 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.BadgesDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Badges.IndexModel
 <h2>Badges</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/badge/" target="_blank"> Bootstrap Badge</a>.</p>
-
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Badges";
+}
 @await Component.InvokeAsync(typeof(BadgesDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Borders/Index.cshtml

@@ -1,15 +1,20 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.BordersDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Borders.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Borders";
+}
 <h2>Borders</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/border/" target="_blank"> Bootstrap Border</a>.</p>
 <style>
-span {
-    display: inline-block;
-    width: 5rem;
-    height: 5rem;
-    margin: .25rem;
-    background-color: #f5f5f5;
-}
+    span {
+        display: inline-block;
+        width: 5rem;
+        height: 5rem;
+        margin: .25rem;
+        background-color: #f5f5f5;
+    }
 </style>
 @await Component.InvokeAsync(typeof(BordersDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Breadcrumbs/Index.cshtml

@@ -1,6 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.BreadcrumbsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Breadcrumbs.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Breadcrumbs";
+}
 <h2>Breadcrumbs</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/breadcrumbs/" target="_blank"> Bootstrap Breadcrumb</a>.</p>
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/ButtonGroups/Index.cshtml

@@ -1,6 +1,12 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ButtonGroupsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.ButtonGroups.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Button Groups";
+}
+
 <h2>Button Groups</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/button-group/" target="_blank"> Bootstrap Button group</a>.</p>
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Buttons/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ButtonsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Buttons.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Buttons";
+}
 <h1>Buttons</h1>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/buttons/" target="_blank"> Bootstrap Buttons</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Buttons" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(ButtonsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Cards/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.CardsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Cards.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Cards";
+}
 <h2>Cards</h2>
 <p>Based on <a href="http://getbootstrap.com/docs/4.1/components/card/" target="_blank"> Bootstrap card</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Cards" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(CardsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Carousel/Index.cshtml

@@ -1,6 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.CarouselDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Carousel.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Carousel";
+}
 <h2>Carousel</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.0/components/carousel/" target="_blank"> Bootstrap carousel</a>.</p>
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Collapse/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.CollapseDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Collapse.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Collapse";
+}
 <h2>Collapse</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/collapse/" target="_blank"> Bootstrap Collapse</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Collapse" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(CollapseDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Dropdowns/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.DropdownsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Dropdowns.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "DrowDowns";
+}
 <h2>Cards</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/dropdowns/" target="_blank"> Bootstrap button</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Dropdowns" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(DropdownsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/DynamicForms/Index.cshtml

@@ -1,6 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.DynamicFormsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.DynamicForms.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "DynamicForms";
+}
 <h2>Dynamic Forms</h2>
 
 @await Component.InvokeAsync(typeof(DynamicFormsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/FormElements/Index.cshtml

@@ -1,6 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.FormElementsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.FormElements.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Form Elements";
+}
 <h2>Form Elements</h2>
 
 @await Component.InvokeAsync(typeof(FormElementsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Grids/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.GridsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Grids.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Grids";
+}
 <h2>Grids</h2>
 <p>Based on <a href="http://getbootstrap.com/docs/4.1/layout/grid/" target="_blank"> Bootstrap grid</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Grids" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(GridsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Index.cshtml

@@ -0,0 +1,22 @@
+@page
+
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Menus
+@using Volo.Abp.UI.Navigation
+@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.IndexModel
+
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Components";
+}
+
+<h1>Components</h1>
+
+Here is the ABP Component List
+
+<ul>
+    @foreach (var menu in (await Model._menuManager.GetAsync(StandardMenus.Main)).Items.First(x => x.Name == BasicThemeDemoMenus.Components.Root).Items)
+    {
+        <li><a href="@menu.Url">@menu.DisplayName</a></li>
+    }
+</ul>

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Index.cshtml.cs

@@ -0,0 +1,22 @@
+using System.Linq;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Menus;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components
+{
+    public class IndexModel : AbpPageModel
+    {
+        public readonly IMenuManager _menuManager;
+
+        public IndexModel(IMenuManager menuManager)
+        {
+            _menuManager = menuManager;
+        }
+
+        public void OnGet()
+        {
+
+        }
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/ListGroups/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ListGroupsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.ListGroups.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "List Groups";
+}
 <h2>List Groups</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/list-group/" target="_blank"> Bootstrap List Group</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/List-Groups" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(ListGroupsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Modals/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ModalsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Modals.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Modals";
+}
 <h2>Modals</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/modal/" target="_blank"> Bootstrap Modal</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Modals" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(ModalsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Navbars/Index.cshtml

@@ -1,6 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.NavbarsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Modals.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Navbars";
+}
 <h2>Navbars</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/navbar/" target="_blank"> Bootstrap Navbar</a>.</p>
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Navs/Index.cshtml

@@ -1,6 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.NavsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Navs.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Navs";
+}
 <h2>Navs</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/navs/" target="_blank"> Bootstrap Navs</a>.</p>
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Paginator/Index.cshtml

@@ -1,8 +1,12 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.PaginatorDemo
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Paginator
 @model IndexModel
-
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Paginator";
+}
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">
         <abp-script src="/Pages/Components/Paginator/index.js" />
@@ -11,4 +15,6 @@
 
 <h2>Paginator</h2>
 
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Paginator" target="_blank">ABP Documentation</a>.</p>
+
 @await Component.InvokeAsync(typeof(PaginatorDemoViewComponent), new { pagerModel = Model.PagerModel })

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Popovers/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.PopoversDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Popovers.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Popovers";
+}
 <h2>Popovers</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/Popovers/" target="_blank"> Bootstrap Popovers</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Popovers" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(PopoversDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/ProgressBars/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ProgressBarsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.ProgressBars.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Progress Bars";
+}
 <h2>Progress Bars</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/progress/" target="_blank"> Bootstrap Progress Bars</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Progress-Bars" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(ProgressBarsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Tables/Index.cshtml

@@ -1,6 +1,11 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.TablesDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Tables.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Tables";
+}
 <h2>Tables</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/content/Tables/" target="_blank"> Bootstrap Tables</a>.</p>
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Tabs/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.TabsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Tabs.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Tabs";
+}
 <h2>Tabs</h2>
 <p>Based on <a href="http://getbootstrap.com/docs/4.1/components/navs/#tabs" target="_blank"> Bootstrap tab</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Tabs" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(TabsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Tooltips/Index.cshtml

@@ -1,7 +1,13 @@
 @page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.TooltipsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Tooltips.IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = "Tooltips";
+}
 <h2>Tooltips</h2>
 <p>Based on <a href="https://getbootstrap.com/docs/4.1/components/tooltips/" target="_blank"> Bootstrap Tooltips</a>.</p>
+<p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Tooltips" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(TooltipsDemoViewComponent))

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Index.cshtml

@@ -1,3 +1,5 @@
 @page
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.IndexModel
-<h1>Basic Theme Demo</h1>
+<h1>Basic Theme Demo</h1>
+
+<p>Check the <a href="/Components">Components</a>.</p>

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Program.cs

@@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
                 .CreateLogger();

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/utils/abp-utils.umd.js

@@ -0,0 +1,600 @@
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('just-compare')) :
+    typeof define === 'function' && define.amd ? define('@abp/utils', ['exports', 'just-compare'], factory) :
+    (global = global || self, factory((global.abp = global.abp || {}, global.abp.utils = global.abp.utils || {}, global.abp.utils.common = {}), global.compare));
+}(this, (function (exports, compare) { 'use strict';
+
+    compare = compare && Object.prototype.hasOwnProperty.call(compare, 'default') ? compare['default'] : compare;
+
+    /*! *****************************************************************************
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain a copy of the
+    License at http://www.apache.org/licenses/LICENSE-2.0
+
+    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+    MERCHANTABLITY OR NON-INFRINGEMENT.
+
+    See the Apache Version 2.0 License for specific language governing permissions
+    and limitations under the License.
+    ***************************************************************************** */
+    /* global Reflect, Promise */
+
+    var extendStatics = function(d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+
+    function __extends(d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    }
+
+    var __assign = function() {
+        __assign = Object.assign || function __assign(t) {
+            for (var s, i = 1, n = arguments.length; i < n; i++) {
+                s = arguments[i];
+                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+            }
+            return t;
+        };
+        return __assign.apply(this, arguments);
+    };
+
+    function __rest(s, e) {
+        var t = {};
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+            t[p] = s[p];
+        if (s != null && typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+                if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                    t[p[i]] = s[p[i]];
+            }
+        return t;
+    }
+
+    function __decorate(decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    }
+
+    function __param(paramIndex, decorator) {
+        return function (target, key) { decorator(target, key, paramIndex); }
+    }
+
+    function __metadata(metadataKey, metadataValue) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+    }
+
+    function __awaiter(thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    }
+
+    function __generator(thisArg, body) {
+        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+        function verb(n) { return function (v) { return step([n, v]); }; }
+        function step(op) {
+            if (f) throw new TypeError("Generator is already executing.");
+            while (_) try {
+                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+                if (y = 0, t) op = [op[0] & 2, t.value];
+                switch (op[0]) {
+                    case 0: case 1: t = op; break;
+                    case 4: _.label++; return { value: op[1], done: false };
+                    case 5: _.label++; y = op[1]; op = [0]; continue;
+                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                    default:
+                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                        if (t[2]) _.ops.pop();
+                        _.trys.pop(); continue;
+                }
+                op = body.call(thisArg, _);
+            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+        }
+    }
+
+    function __exportStar(m, exports) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+
+    function __values(o) {
+        var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+        if (m) return m.call(o);
+        if (o && typeof o.length === "number") return {
+            next: function () {
+                if (o && i >= o.length) o = void 0;
+                return { value: o && o[i++], done: !o };
+            }
+        };
+        throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+    }
+
+    function __read(o, n) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator];
+        if (!m) return o;
+        var i = m.call(o), r, ar = [], e;
+        try {
+            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+        }
+        catch (error) { e = { error: error }; }
+        finally {
+            try {
+                if (r && !r.done && (m = i["return"])) m.call(i);
+            }
+            finally { if (e) throw e.error; }
+        }
+        return ar;
+    }
+
+    function __spread() {
+        for (var ar = [], i = 0; i < arguments.length; i++)
+            ar = ar.concat(__read(arguments[i]));
+        return ar;
+    }
+
+    function __spreadArrays() {
+        for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+        for (var r = Array(s), k = 0, i = 0; i < il; i++)
+            for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+                r[k] = a[j];
+        return r;
+    };
+
+    function __await(v) {
+        return this instanceof __await ? (this.v = v, this) : new __await(v);
+    }
+
+    function __asyncGenerator(thisArg, _arguments, generator) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var g = generator.apply(thisArg, _arguments || []), i, q = [];
+        return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+        function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+        function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+        function fulfill(value) { resume("next", value); }
+        function reject(value) { resume("throw", value); }
+        function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+    }
+
+    function __asyncDelegator(o) {
+        var i, p;
+        return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+    }
+
+    function __asyncValues(o) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var m = o[Symbol.asyncIterator], i;
+        return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+        function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+        function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+    }
+
+    function __makeTemplateObject(cooked, raw) {
+        if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+        return cooked;
+    };
+
+    function __importStar(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+        result.default = mod;
+        return result;
+    }
+
+    function __importDefault(mod) {
+        return (mod && mod.__esModule) ? mod : { default: mod };
+    }
+
+    function __classPrivateFieldGet(receiver, privateMap) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to get private field on non-instance");
+        }
+        return privateMap.get(receiver);
+    }
+
+    function __classPrivateFieldSet(receiver, privateMap, value) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to set private field on non-instance");
+        }
+        privateMap.set(receiver, value);
+        return value;
+    }
+
+    /* tslint:disable:no-non-null-assertion */
+    var ListNode = /** @class */ (function () {
+        function ListNode(value) {
+            this.value = value;
+        }
+        return ListNode;
+    }());
+    var LinkedList = /** @class */ (function () {
+        function LinkedList() {
+            this.size = 0;
+        }
+        Object.defineProperty(LinkedList.prototype, "head", {
+            get: function () {
+                return this.first;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(LinkedList.prototype, "tail", {
+            get: function () {
+                return this.last;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(LinkedList.prototype, "length", {
+            get: function () {
+                return this.size;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        LinkedList.prototype.attach = function (value, previousNode, nextNode) {
+            if (!previousNode)
+                return this.addHead(value);
+            if (!nextNode)
+                return this.addTail(value);
+            var node = new ListNode(value);
+            node.previous = previousNode;
+            previousNode.next = node;
+            node.next = nextNode;
+            nextNode.previous = node;
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.attachMany = function (values, previousNode, nextNode) {
+            if (!values.length)
+                return [];
+            if (!previousNode)
+                return this.addManyHead(values);
+            if (!nextNode)
+                return this.addManyTail(values);
+            var list = new LinkedList();
+            list.addManyTail(values);
+            list.first.previous = previousNode;
+            previousNode.next = list.first;
+            list.last.next = nextNode;
+            nextNode.previous = list.last;
+            this.size += values.length;
+            return list.toNodeArray();
+        };
+        LinkedList.prototype.detach = function (node) {
+            if (!node.previous)
+                return this.dropHead();
+            if (!node.next)
+                return this.dropTail();
+            node.previous.next = node.next;
+            node.next.previous = node.previous;
+            this.size--;
+            return node;
+        };
+        LinkedList.prototype.add = function (value) {
+            var _this = this;
+            return {
+                after: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addAfter).call.apply(_a, __spread([_this, value], params));
+                },
+                before: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addBefore).call.apply(_a, __spread([_this, value], params));
+                },
+                byIndex: function (position) { return _this.addByIndex(value, position); },
+                head: function () { return _this.addHead(value); },
+                tail: function () { return _this.addTail(value); },
+            };
+        };
+        LinkedList.prototype.addMany = function (values) {
+            var _this = this;
+            return {
+                after: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addManyAfter).call.apply(_a, __spread([_this, values], params));
+                },
+                before: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addManyBefore).call.apply(_a, __spread([_this, values], params));
+                },
+                byIndex: function (position) { return _this.addManyByIndex(values, position); },
+                head: function () { return _this.addManyHead(values); },
+                tail: function () { return _this.addManyTail(values); },
+            };
+        };
+        LinkedList.prototype.addAfter = function (value, previousValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var previous = this.find(function (node) { return compareFn(node.value, previousValue); });
+            return previous ? this.attach(value, previous, previous.next) : this.addTail(value);
+        };
+        LinkedList.prototype.addBefore = function (value, nextValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var next = this.find(function (node) { return compareFn(node.value, nextValue); });
+            return next ? this.attach(value, next.previous, next) : this.addHead(value);
+        };
+        LinkedList.prototype.addByIndex = function (value, position) {
+            if (position < 0)
+                position += this.size;
+            else if (position >= this.size)
+                return this.addTail(value);
+            if (position <= 0)
+                return this.addHead(value);
+            var next = this.get(position);
+            return this.attach(value, next.previous, next);
+        };
+        LinkedList.prototype.addHead = function (value) {
+            var node = new ListNode(value);
+            node.next = this.first;
+            if (this.first)
+                this.first.previous = node;
+            else
+                this.last = node;
+            this.first = node;
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.addTail = function (value) {
+            var node = new ListNode(value);
+            if (this.first) {
+                node.previous = this.last;
+                this.last.next = node;
+                this.last = node;
+            }
+            else {
+                this.first = node;
+                this.last = node;
+            }
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.addManyAfter = function (values, previousValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var previous = this.find(function (node) { return compareFn(node.value, previousValue); });
+            return previous ? this.attachMany(values, previous, previous.next) : this.addManyTail(values);
+        };
+        LinkedList.prototype.addManyBefore = function (values, nextValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var next = this.find(function (node) { return compareFn(node.value, nextValue); });
+            return next ? this.attachMany(values, next.previous, next) : this.addManyHead(values);
+        };
+        LinkedList.prototype.addManyByIndex = function (values, position) {
+            if (position < 0)
+                position += this.size;
+            if (position <= 0)
+                return this.addManyHead(values);
+            if (position >= this.size)
+                return this.addManyTail(values);
+            var next = this.get(position);
+            return this.attachMany(values, next.previous, next);
+        };
+        LinkedList.prototype.addManyHead = function (values) {
+            var _this = this;
+            return values.reduceRight(function (nodes, value) {
+                nodes.unshift(_this.addHead(value));
+                return nodes;
+            }, []);
+        };
+        LinkedList.prototype.addManyTail = function (values) {
+            var _this = this;
+            return values.map(function (value) { return _this.addTail(value); });
+        };
+        LinkedList.prototype.drop = function () {
+            var _this = this;
+            return {
+                byIndex: function (position) { return _this.dropByIndex(position); },
+                byValue: function () {
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return _this.dropByValue.apply(_this, params);
+                },
+                byValueAll: function () {
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return _this.dropByValueAll.apply(_this, params);
+                },
+                head: function () { return _this.dropHead(); },
+                tail: function () { return _this.dropTail(); },
+            };
+        };
+        LinkedList.prototype.dropMany = function (count) {
+            var _this = this;
+            return {
+                byIndex: function (position) { return _this.dropManyByIndex(count, position); },
+                head: function () { return _this.dropManyHead(count); },
+                tail: function () { return _this.dropManyTail(count); },
+            };
+        };
+        LinkedList.prototype.dropByIndex = function (position) {
+            if (position < 0)
+                position += this.size;
+            var current = this.get(position);
+            return current ? this.detach(current) : undefined;
+        };
+        LinkedList.prototype.dropByValue = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var position = this.findIndex(function (node) { return compareFn(node.value, value); });
+            return position < 0 ? undefined : this.dropByIndex(position);
+        };
+        LinkedList.prototype.dropByValueAll = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var dropped = [];
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (compareFn(current.value, value)) {
+                    dropped.push(this.dropByIndex(position - dropped.length));
+                }
+            }
+            return dropped;
+        };
+        LinkedList.prototype.dropHead = function () {
+            var head = this.first;
+            if (head) {
+                this.first = head.next;
+                if (this.first)
+                    this.first.previous = undefined;
+                else
+                    this.last = undefined;
+                this.size--;
+                return head;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.dropTail = function () {
+            var tail = this.last;
+            if (tail) {
+                this.last = tail.previous;
+                if (this.last)
+                    this.last.next = undefined;
+                else
+                    this.first = undefined;
+                this.size--;
+                return tail;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.dropManyByIndex = function (count, position) {
+            if (count <= 0)
+                return [];
+            if (position < 0)
+                position = Math.max(position + this.size, 0);
+            else if (position >= this.size)
+                return [];
+            count = Math.min(count, this.size - position);
+            var dropped = [];
+            while (count--) {
+                var current = this.get(position);
+                dropped.push(this.detach(current));
+            }
+            return dropped;
+        };
+        LinkedList.prototype.dropManyHead = function (count) {
+            if (count <= 0)
+                return [];
+            count = Math.min(count, this.size);
+            var dropped = [];
+            while (count--)
+                dropped.unshift(this.dropHead());
+            return dropped;
+        };
+        LinkedList.prototype.dropManyTail = function (count) {
+            if (count <= 0)
+                return [];
+            count = Math.min(count, this.size);
+            var dropped = [];
+            while (count--)
+                dropped.push(this.dropTail());
+            return dropped;
+        };
+        LinkedList.prototype.find = function (predicate) {
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (predicate(current, position, this))
+                    return current;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.findIndex = function (predicate) {
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (predicate(current, position, this))
+                    return position;
+            }
+            return -1;
+        };
+        LinkedList.prototype.forEach = function (callback) {
+            for (var node = this.first, position = 0; node; position++, node = node.next) {
+                callback(node, position, this);
+            }
+        };
+        LinkedList.prototype.get = function (position) {
+            return this.find(function (_, index) { return position === index; });
+        };
+        LinkedList.prototype.indexOf = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            return this.findIndex(function (node) { return compareFn(node.value, value); });
+        };
+        LinkedList.prototype.toArray = function () {
+            var array = new Array(this.size);
+            this.forEach(function (node, index) { return (array[index] = node.value); });
+            return array;
+        };
+        LinkedList.prototype.toNodeArray = function () {
+            var array = new Array(this.size);
+            this.forEach(function (node, index) { return (array[index] = node); });
+            return array;
+        };
+        LinkedList.prototype.toString = function (mapperFn) {
+            if (mapperFn === void 0) { mapperFn = JSON.stringify; }
+            return this.toArray()
+                .map(function (value) { return mapperFn(value); })
+                .join(' <-> ');
+        };
+        // Cannot use Generator type because of ng-packagr
+        LinkedList.prototype[Symbol.iterator] = function () {
+            var node, position;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        node = this.first, position = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!node) return [3 /*break*/, 4];
+                        return [4 /*yield*/, node.value];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        position++, node = node.next;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        };
+        return LinkedList;
+    }());
+
+    exports.LinkedList = LinkedList;
+    exports.ListNode = ListNode;
+
+    Object.defineProperty(exports, '__esModule', { value: true });
+
+})));
+//# sourceMappingURL=abp-utils.umd.js.map

modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs

@@ -28,9 +28,9 @@ namespace Volo.Docs
         [Fact]
         public async Task GetAsync()
         {
-            var project = await _projectAppService.GetAsync("ABP");
+            var project = await _projectAppService.GetAsync("abp");
             project.ShouldNotBeNull();
-            project.ShortName.ShouldBe("ABP");
+            project.ShortName.ShouldBe("abp");
         }
 
         [Fact]

modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/Document/DocumentRepository_Tests.cs

@@ -1,7 +1,9 @@
 using Volo.Docs.MongoDB;
+using Xunit;
 
 namespace Volo.Docs.Document
 {
+    [Collection(MongoTestCollection.Name)]
     public class DocumentRepository_Tests : DocumentRepository_Tests<DocsMongoDBTestModule>
     {
 

modules/docs/test/Volo.Docs.TestBase/Volo/Docs/ProjectRepository_Tests.cs

@@ -27,10 +27,10 @@ namespace Volo.Docs
         [Fact]
         public async Task GetByShortNameAsync()
         {
-            var project = await ProjectRepository.GetByShortNameAsync("ABP");
+            var project = await ProjectRepository.GetByShortNameAsync("abp");
 
             project.ShouldNotBeNull();
-            project.ShortName.ShouldBe("ABP");
+            project.ShortName.ShouldBe("abp");
         }
     }
 }

npm/lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "packages": [
     "packs/*"
   ],

npm/ng-packs/lerna.version.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "packages": [
     "packages/*"
   ],

npm/ng-packs/package.json

@@ -24,11 +24,11 @@
   "devDependencies": {
     "@abp/ng.account": "^2.5.0",
     "@abp/ng.account.config": "^2.5.0",
-    "@abp/ng.core": "^2.5.0",
-    "@abp/ng.feature-management": "^2.5.0",
+    "@abp/ng.core": "~2.5.0",
+    "@abp/ng.feature-management": "~2.5.0",
     "@abp/ng.identity": "^2.5.0",
     "@abp/ng.identity.config": "^2.5.0",
-    "@abp/ng.permission-management": "^2.5.0",
+    "@abp/ng.permission-management": "~2.5.0",
     "@abp/ng.setting-management": "^2.5.0",
     "@abp/ng.setting-management.config": "^2.5.0",
     "@abp/ng.tenant-management": "^2.5.0",

npm/ng-packs/packages/account-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.account.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

npm/ng-packs/packages/account/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.account",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.account.config": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.account.config": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.core",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

npm/ng-packs/packages/feature-management/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.feature-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/identity-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.identity.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

npm/ng-packs/packages/identity/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@abp/ng.identity",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.identity.config": "~2.5.0",
-    "@abp/ng.permission-management": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.identity.config": "^2.6.0",
+    "@abp/ng.permission-management": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/permission-management/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.permission-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/setting-management-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.setting-management.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

npm/ng-packs/packages/setting-management/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.setting-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.setting-management.config": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.setting-management.config": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/tenant-management-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.tenant-management.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

npm/ng-packs/packages/tenant-management/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@abp/ng.tenant-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.feature-management": "~2.5.0",
-    "@abp/ng.tenant-management.config": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.feature-management": "^2.6.0",
+    "@abp/ng.tenant-management.config": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/theme-basic/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.basic",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/theme-shared/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.shared",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.core": "~2.5.0",
+    "@abp/ng.core": "^2.6.0",
     "@fortawesome/fontawesome-free": "^5.12.1",
     "@ng-bootstrap/ng-bootstrap": "^5.3.0",
     "@ngx-validate/core": "^0.0.7",

npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts

@@ -27,6 +27,7 @@ export type ModalSize = 'sm' | 'md' | 'lg' | 'xl';
   templateUrl: './modal.component.html',
   animations: [fadeAnimation],
   styleUrls: ['./modal.component.scss'],
+  providers: [ModalService],
 })
 export class ModalComponent implements OnDestroy {
   @Input()

npm/ng-packs/packages/theme-shared/src/lib/services/modal.service.ts

@@ -1,11 +1,11 @@
 import { ContentProjectionService, PROJECTION_STRATEGY } from '@abp/ng.core';
-import { ComponentRef, Injectable, TemplateRef, ViewContainerRef } from '@angular/core';
+import { ComponentRef, Injectable, TemplateRef, ViewContainerRef, OnDestroy } from '@angular/core';
 import { ModalContainerComponent } from '../components/modal/modal-container.component';
 
 @Injectable({
   providedIn: 'root',
 })
-export class ModalService {
+export class ModalService implements OnDestroy {
   private containerComponentRef: ComponentRef<ModalContainerComponent>;
 
   constructor(private contentProjectionService: ContentProjectionService) {
@@ -44,4 +44,8 @@ export class ModalService {
 
     this.contentProjectionService.projectContent(strategy);
   }
+
+  ngOnDestroy() {
+    this.containerComponentRef.destroy();
+  }
 }

npm/ng-packs/yarn.lock

@@ -18,7 +18,7 @@
     "@abp/ng.theme.shared" "^2.5.0"
     tslib "^1.9.0"
 
-"@abp/ng.core@^2.5.0":
+"@abp/ng.core@^2.5.0", "@abp/ng.core@~2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-2.5.0.tgz#e7168615b4078e3fa494c4efcc69842acbd2c627"
   integrity sha512-opYkOFCKeU17YvNJhfcG1dOwZZ4F2QGspTNTagNZ9fepmeNl0yqFamFdRM6irfEEL3cOBQhUpI2NQZP+ugLOEg==
@@ -35,7 +35,7 @@
     ts-toolbelt "^6.3.6"
     tslib "^1.9.0"
 
-"@abp/ng.feature-management@^2.5.0":
+"@abp/ng.feature-management@^2.5.0", "@abp/ng.feature-management@~2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-2.5.0.tgz#3bc4501a2abbe6b6447e5b4a2b2d86fb07ce8a59"
   integrity sha512-keZ3gCDMvU/e17tsBBrZpLmpIpDm/2TTSAmCoRRy3GH4BQICXr/XJmssStNx7V7sdo6vAPiW9pcM9zI/C8IrBw==
@@ -60,7 +60,7 @@
     "@abp/ng.theme.shared" "^2.5.0"
     tslib "^1.9.0"
 
-"@abp/ng.permission-management@^2.5.0":
+"@abp/ng.permission-management@^2.5.0", "@abp/ng.permission-management@~2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-2.5.0.tgz#c769a97aee8517ec724dc5b7756e1dfc8fe7fcf1"
   integrity sha512-grmJ46Qf26cwGfDt5acL6eXXWBDgjvL/04/ZLtxsP4Hf+tSlnL/1rWz5fxMF8548sQ6vZlVIdrSa4Tz/Dh0WLw==

npm/packs/anchor-js/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/anchor-js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "anchor-js": "^4.2.2"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/aspnetcore.mvc.ui.theme.basic/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/aspnetcore.mvc.ui.theme.basic",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.5.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/aspnetcore.mvc.ui.theme.shared/package.json

@@ -1,24 +1,24 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/aspnetcore.mvc.ui.theme.shared",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui": "^2.5.0",
-    "@abp/bootstrap": "^2.5.0",
-    "@abp/bootstrap-datepicker": "^2.5.0",
-    "@abp/datatables.net-bs4": "^2.5.0",
-    "@abp/font-awesome": "^2.5.0",
-    "@abp/jquery-form": "^2.5.0",
-    "@abp/jquery-validation-unobtrusive": "^2.5.0",
-    "@abp/lodash": "^2.5.0",
-    "@abp/luxon": "^2.5.0",
-    "@abp/malihu-custom-scrollbar-plugin": "^2.5.0",
-    "@abp/select2": "^2.5.0",
-    "@abp/sweetalert": "^2.5.0",
-    "@abp/timeago": "^2.5.0",
-    "@abp/toastr": "^2.5.0"
+    "@abp/aspnetcore.mvc.ui": "^2.6.0",
+    "@abp/bootstrap": "^2.6.0",
+    "@abp/bootstrap-datepicker": "^2.6.0",
+    "@abp/datatables.net-bs4": "^2.6.0",
+    "@abp/font-awesome": "^2.6.0",
+    "@abp/jquery-form": "^2.6.0",
+    "@abp/jquery-validation-unobtrusive": "^2.6.0",
+    "@abp/lodash": "^2.6.0",
+    "@abp/luxon": "^2.6.0",
+    "@abp/malihu-custom-scrollbar-plugin": "^2.6.0",
+    "@abp/select2": "^2.6.0",
+    "@abp/sweetalert": "^2.6.0",
+    "@abp/timeago": "^2.6.0",
+    "@abp/toastr": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/aspnetcore.mvc.ui/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/aspnetcore.mvc.ui",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
     "path": "^0.12.7",
     "rimraf": "^3.0.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/blogging/package.json

@@ -1,13 +1,13 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/blogging",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.5.0",
-    "@abp/owl.carousel": "^2.5.0",
-    "@abp/tui-editor": "^2.5.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.6.0",
+    "@abp/owl.carousel": "^2.6.0",
+    "@abp/tui-editor": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/bootstrap-datepicker/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/bootstrap-datepicker",
   "publishConfig": {
     "access": "public"
@@ -7,5 +7,5 @@
   "dependencies": {
     "bootstrap-datepicker": "^1.9.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/bootstrap/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/bootstrap",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "bootstrap": "^4.3.1"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/chart.js/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/chart.js",
   "publishConfig": {
     "access": "public"
@@ -7,5 +7,5 @@
   "dependencies": {
     "chart.js": "^2.9.3"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/clipboard/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/clipboard",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "clipboard": "^2.0.4"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/codemirror/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/codemirror",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "codemirror": "^5.49.2"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/core/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/core",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/utils": "^2.5.0"
+    "@abp/utils": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/datatables.net-bs4/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/datatables.net-bs4",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/datatables.net": "^2.5.0",
+    "@abp/datatables.net": "^2.6.0",
     "datatables.net-bs4": "^1.10.20"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/datatables.net/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/datatables.net",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "^2.5.0",
+    "@abp/jquery": "^2.6.0",
     "datatables.net": "^1.10.20"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/docs/package.json

@@ -1,15 +1,15 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/docs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/anchor-js": "^2.5.0",
-    "@abp/clipboard": "^2.5.0",
-    "@abp/malihu-custom-scrollbar-plugin": "^2.5.0",
-    "@abp/popper.js": "^2.5.0",
-    "@abp/prismjs": "^2.5.0"
+    "@abp/anchor-js": "^2.6.0",
+    "@abp/clipboard": "^2.6.0",
+    "@abp/malihu-custom-scrollbar-plugin": "^2.6.0",
+    "@abp/popper.js": "^2.6.0",
+    "@abp/prismjs": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/flag-icon-css/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/flag-icon-css",
   "publishConfig": {
     "access": "public"
@@ -7,5 +7,5 @@
   "dependencies": {
     "flag-icon-css": "^3.4.5"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/font-awesome/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/font-awesome",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "@fortawesome/fontawesome-free": "^5.11.2"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/highlight.js/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/highlight.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0"
+    "@abp/core": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/jquery-form/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/jquery-form",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "^2.5.0",
+    "@abp/jquery": "^2.6.0",
     "jquery-form": "^4.2.2"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/jquery-validation-unobtrusive/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/jquery-validation-unobtrusive",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery-validation": "^2.5.0",
+    "@abp/jquery-validation": "^2.6.0",
     "jquery-validation-unobtrusive": "^3.2.11"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/jquery-validation/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/jquery-validation",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "^2.5.0",
+    "@abp/jquery": "^2.6.0",
     "jquery-validation": "^1.19.1"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/jquery/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/jquery",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "jquery": "^3.4.1"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/lodash/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/lodash",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "lodash": "^4.17.15"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/luxon/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/luxon",
   "publishConfig": {
     "access": "public"
@@ -7,5 +7,5 @@
   "dependencies": {
     "luxon": "^1.21.3"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/malihu-custom-scrollbar-plugin/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/malihu-custom-scrollbar-plugin",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "malihu-custom-scrollbar-plugin": "^3.1.5"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/markdown-it/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/markdown-it",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "markdown-it": "^10.0.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/owl.carousel/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/owl.carousel",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "owl.carousel": "^2.3.4"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/popper.js/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/popper.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "popper.js": "^1.16.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/prismjs/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/prismjs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "prismjs": "^1.17.1"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/select2/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/select2",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "select2": "^4.0.12"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/sweetalert/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/sweetalert",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "sweetalert": "^2.1.2"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }

npm/packs/timeago/package.json

@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/timeago",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "^2.5.0",
+    "@abp/jquery": "^2.6.0",
     "timeago": "^1.6.7"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }