Merge branch 'dev' into partial-docs

7 years ago · c44bcc1ab6
1239 changed files with 9882 additions and 3093 deletions
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalization.csproj
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalization.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
@ -1,6 +1,8 @@
 {
  "culture": "en",
  "texts": {
    "Permission:Organizations": "Organizations",
    "Permission:Manage": "Manage Organizations",
    "Permission:NpmPackages": "NPM Packages",
    "Permission:NugetPackages": "Nuget Packages",
    "Permission:Maintenance": "Maintenance",
@ -11,6 +13,7 @@
    "Permission:Edit": "Edit",
    "Permission:Delete": "Delete",
    "Permission:Create": "Create",
    "Menu:Organizations": "Organizations",
    "Menu:Packages": "Packages",
    "NpmPackageDeletionWarningMessage": "This NPM Package will be deleted. Do you confirm that?",
    "NugetPackageDeletionWarningMessage": "This Nuget Package will be deleted. Do you confirm that?",
@ -34,7 +37,7 @@
    "NugetPackageTarget.HttpApi": "Http Api",
    "NugetPackageTarget.HttpApiClient": "Http Api Client",
    "NugetPackageTarget.Web": "Web",
-    "NugetPackageTarget.EntityFrameworkCore": "EntityFramework Core",
+    "NugetPackageTarget.EntityFrameworkCore": "DeleteAllEntityFramework Core",
    "NugetPackageTarget.MongoDB": "MongoDB",
    "Edit": "Edit",
    "Delete": "Delete",
@ -55,6 +58,31 @@
    "Menu:NpmPackages": "NPM Packages",
    "Menu:Modules": "Modules",
    "Menu:Maintenance": "Maintenance",
-    "Menu:NugetPackages": "Nuget Packages"
+    "Menu:NugetPackages": "Nuget Packages",
    "CreateAnOrganization": "Create an organization",
    "Organizations": "Organizations",
    "LongName": "Long name",
    "LicenseType": "License type",
    "LicenseStartTime": "License start time",
    "LicenseEndTime": "License end time",
    "AllowedDeveloperCount": "Allowed developer count",
    "UserNameOrEmailAddress": "Username or email address",
    "AddOwner": "Add owner",
    "UserName": "Username",
    "Email": "Email",
    "Developers": "Developers",
    "AddDeveloper": "Add developer",
    "Create": "Create",
    "UserNotFound": "User not found",
    "{0}WillBeRemovedFromMembers": "{0} Will be removed from members",
    "Computers": "Computers",
    "UniqueComputerId": "Unique computer id",
    "LastSeenDate": "Last seen date",
    "{0}Computer{1}WillBeRemovedFromRecords": "Computer of {0} ({1}) will be removed from records",
    "OrganizationDeletionWarningMessage": "Organization will be deleted",
    "This{0}AlreadyExistInThisOrganization": "This {0} already exist in this organization",
    "AreYouSureYouWantToDeleteAllComputers": "Are you sure you want to delete all computers?",
    "DeleteAll": "Delete all",
    "DoYouWantToCreateNewUser": "Do you want to create new user?" 
  }
 }
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json
@ -1,6 +1,8 @@
 {
  "culture": "zh-Hans",
  "texts": {
    "Permission:Organizations": "组织",
    "Permission:Manage": "管理组织",
    "Permission:NpmPackages": "NPM包",
    "Permission:NugetPackages": "Nuget包",
    "Permission:Maintenance": "维护",
@ -11,6 +13,7 @@
    "Permission:Edit": "编辑",
    "Permission:Delete": "删除",
    "Permission:Create": "创建",
    "Menu:Organizations": "组织",
    "Menu:Packages": "包",
    "NpmPackageDeletionWarningMessage": "该NPM包将会被删除. 你确定吗?",
    "NugetPackageDeletionWarningMessage": "该Nuget包将会被删除. 你确定吗?",
@ -55,6 +58,30 @@
    "Menu:NpmPackages": "NPM包",
    "Menu:Modules": "模块",
    "Menu:Maintenance": "维护",
-    "Menu:NugetPackages": "Nuget包"
+    "Menu:NugetPackages": "Nuget包",
    "CreateAnOrganization": "创建新组织",
    "Organizations": "组织",
    "LongName": "完整名称",
    "LicenseType": "授权类型",
    "LicenseStartTime": "授权开始时间",
    "LicenseEndTime": "授权结束时间",
    "AllowedDeveloperCount": "允许的开发人员数量",
    "UserNameOrEmailAddress": "用户名或电子邮件地址",
    "AddOwner": "添加所有者",
    "UserName": "用户名",
    "Email": "电子邮件地址",
    "Developers": "开发者",
    "AddDeveloper": "添加开发者",
    "Create": "创建",
    "UserNotFound": "用户不存在",
    "{0}WillBeRemovedFromMembers": "{0} 将从成员中删除",
    "Computers": "计算机",
    "UniqueComputerId": "计算机唯一ID",
    "LastSeenDate": "上次查看日期",
    "{0}Computer{1}WillBeRemovedFromRecords": "计算机 {0} ({1}) 将从记录中删除",
    "OrganizationDeletionWarningMessage": "组织将被删除",
    "This{0}AlreadyExistInThisOrganization": "该组织中已经存在此 {0}",
    "AreYouSureYouWantToDeleteAllComputers": "您确定要删除所有计算机吗？",
    "DeleteAll": "删除所有"
  }
 }
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
@ -26,6 +26,7 @@
    "MyOrganizations": "My organizations",
    "ApiKey": "API key",
    "UserNameNotFound": "There is no user with username {0}",
-    "SuccessfullyAddedToNewsletter": "Thanks you for subscribing to our newsletter!"
+    "SuccessfullyAddedToNewsletter": "Thanks you for subscribing to our newsletter!",
    "ManageProfile": "Manage your profile"
  }
 }
--- a/configureawait.props
+++ b/configureawait.props
@ -0,0 +1,9 @@
 <Project>
  <ItemGroup>
      <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" />
      <PackageReference Include="Fody" Version="6.0.6">
        <PrivateAssets>all</PrivateAssets>
        <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
      </PackageReference>
  </ItemGroup>
 </Project>
--- a/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
+++ b/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
@ -50,6 +50,20 @@ namespace Acme.BookStore
        public DateTime PublishDate { get; set; }
        public float Price { get; set; }
        protected Book()
        {
        }
        public Book(Guid id, string name, BookType type, DateTime publishDate, float price)
        :base(id)
        {
            Name = name;
            Type = type;
            PublishDate = publishDate;
            Price = price;
        }
    }
 }
 ````
--- a/docs/en/Tutorials/AspNetCore-Mvc/Part-III.md
+++ b/docs/en/Tutorials/AspNetCore-Mvc/Part-III.md
@ -57,25 +57,11 @@ namespace Acme.BookStore
        public async Task SeedAsync(DataSeedContext context)
        {
            await _bookRepository.InsertAsync(
-                new Book
+                new Book(_guidGenerator.Create(), "Test book 1", BookType.Fantastic, new DateTime(2015, 05, 24), 21)
                {
                    Id = _guidGenerator.Create(),
                    Name = "Test book 1",
                    Type = BookType.Fantastic,
                    PublishDate = new DateTime(2015, 05, 24),
                    Price = 21
                }
            );
            await _bookRepository.InsertAsync(
-                new Book
+                new Book(_guidGenerator.Create(), "Test book 2", BookType.Science, new DateTime(2014, 02, 11), 15)
                {
                    Id = _guidGenerator.Create(),
                    Name = "Test book 2",
                    Type = BookType.Science,
                    PublishDate = new DateTime(2014, 02, 11),
                    Price = 15
                }
            );
        }
    }
--- a/framework/src/Volo.Abp.ApiVersioning.Abstractions/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.ApiVersioning.Abstractions/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.ApiVersioning.Abstractions/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.ApiVersioning.Abstractions/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.csproj
+++ b/framework/src/Volo.Abp.ApiVersioning.Abstractions/Volo.Abp.ApiVersioning.Abstractions.csproj
@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Microsoft/AspNetCore/Builder/JwtTokenMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Microsoft/AspNetCore/Builder/JwtTokenMiddleware.cs
@ -11,14 +11,14 @@ namespace Microsoft.AspNetCore.Builder
            {
                if (ctx.User.Identity?.IsAuthenticated != true)
                {
-                    var result = await ctx.AuthenticateAsync(schema).ConfigureAwait(false);
+                    var result = await ctx.AuthenticateAsync(schema);
                    if (result.Succeeded && result.Principal != null)
                    {
                        ctx.User = result.Principal;
                    }
                }
-                await next().ConfigureAwait(false);
+                await next();
            });
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
@ -19,4 +20,4 @@
    <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
  </ItemGroup>
-</Project>
+</Project>
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
@ -33,7 +33,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
            TenantConfiguration tenant = null;
            if (resolveResult.TenantIdOrName != null)
            {
-                tenant = await FindTenantAsync(resolveResult.TenantIdOrName).ConfigureAwait(false);
+                tenant = await FindTenantAsync(resolveResult.TenantIdOrName);
                if (tenant == null)
                {
                    //TODO: A better exception?
@ -45,7 +45,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
            using (_currentTenant.Change(tenant?.Id, tenant?.Name))
            {
-                await next(context).ConfigureAwait(false);
+                await next(context);
            }
        }
@ -53,11 +53,11 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
        {
            if (Guid.TryParse(tenantIdOrName, out var parsedTenantId))
            {
-                return await _tenantStore.FindAsync(parsedTenantId).ConfigureAwait(false);
+                return await _tenantStore.FindAsync(parsedTenantId);
            }
            else
            {
-                return await _tenantStore.FindAsync(tenantIdOrName).ConfigureAwait(false);
+                return await _tenantStore.FindAsync(tenantIdOrName);
            }
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
@ -43,12 +43,12 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
            configuration = await Cache.GetOrAddAsync(
                cacheKey,
-                async () => await Proxy.Service.GetAsync().ConfigureAwait(false),
+                async () => await Proxy.Service.GetAsync(),
                () => new DistributedCacheEntryOptions
                {
                    AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(120) //TODO: Should be configurable. Default value should be higher (5 mins would be good).
                }
-            ).ConfigureAwait(false);
+            );
            if (httpContext != null)
            {
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
        public override async Task<string> GetOrNullAsync(string name)
        {
-            var configuration = await ConfigurationClient.GetAsync().ConfigureAwait(false);
+            var configuration = await ConfigurationClient.GetAsync();
            return configuration.Features.Values.GetOrDefault(name);
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLanguageProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLanguageProvider.cs
@ -16,7 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
        public async Task<IReadOnlyList<LanguageInfo>> GetLanguagesAsync()
        {
-            var configuration = await ConfigurationClient.GetAsync().ConfigureAwait(false);
+            var configuration = await ConfigurationClient.GetAsync();
            return configuration.Localization.Languages;
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemotePermissionChecker.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemotePermissionChecker.cs
@ -16,7 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
        public async Task<bool> IsGrantedAsync(string name)
        {
-            var configuration = await ConfigurationClient.GetAsync().ConfigureAwait(false);
+            var configuration = await ConfigurationClient.GetAsync();
            return configuration.Auth.GrantedPolicies.ContainsKey(name);
        }
@ -24,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
        public async Task<bool> IsGrantedAsync(ClaimsPrincipal claimsPrincipal, string name)
        {
            /* This provider always works for the current principal. */
-            return await IsGrantedAsync(name).ConfigureAwait(false);
+            return await IsGrantedAsync(name);
        }
    }
 }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs
@ -17,13 +17,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
        public async Task<string> GetOrNullAsync(string name)
        {
-            var configuration = await ConfigurationClient.GetAsync().ConfigureAwait(false);
+            var configuration = await ConfigurationClient.GetAsync();
            return configuration.Setting.Values.GetOrDefault(name);
        }
        public async Task<List<SettingValue>> GetAllAsync()
        {
-            var configuration = await ConfigurationClient.GetAsync().ConfigureAwait(false);
+            var configuration = await ConfigurationClient.GetAsync();
            return configuration
                .Setting.Values
                .Select(s => new SettingValue(s.Key, s.Value))
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs
@ -39,13 +39,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
            tenantConfiguration = await Cache.GetOrAddAsync(
                cacheKey,
-                async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name).ConfigureAwait(false)),
+                async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name)),
                () => new DistributedCacheEntryOptions
                {
                    AbsoluteExpirationRelativeToNow =
                        TimeSpan.FromMinutes(5) //TODO: Should be configurable.
                }
-            ).ConfigureAwait(false);
+            );
            if (httpContext != null)
            {
@ -67,13 +67,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
            tenantConfiguration = await Cache.GetOrAddAsync(
                cacheKey,
-                async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id).ConfigureAwait(false)),
+                async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id)),
                () => new DistributedCacheEntryOptions
                {
                    AbsoluteExpirationRelativeToNow =
                        TimeSpan.FromMinutes(5) //TODO: Should be configurable.
                }
-            ).ConfigureAwait(false);
+            );
            if (httpContext != null)
            {
@ -95,7 +95,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
            tenantConfiguration = Cache.GetOrAdd(
                cacheKey,
-                () => AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name).ConfigureAwait(false))),
+                () => AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name))),
                () => new DistributedCacheEntryOptions
                {
                    AbsoluteExpirationRelativeToNow =
@ -123,7 +123,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
            tenantConfiguration = Cache.GetOrAdd(
                cacheKey,
-                () => AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id).ConfigureAwait(false))),
+                () => AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id))),
                () => new DistributedCacheEntryOptions
                {
                    AbsoluteExpirationRelativeToNow =
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbTagHelperService.cs
@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Breadcrumb
        {
            var list = InitilizeFormGroupContentsContext(context, output);
-            await output.GetChildContentAsync().ConfigureAwait(false);
+            await output.GetChildContentAsync();
            SetInnerOlTag(context, output);
            SetInnerList(context, output, list);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselTagHelperService.cs
@ -19,7 +19,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Carousel
            var itemList = InitilizeCarouselItemsContentsContext(context, output);
-            await output.GetChildContentAsync().ConfigureAwait(false);
+            await output.GetChildContentAsync();
            SetOneItemAsActive(context, output, itemList);
            SetItems(context, output, itemList);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
        {
            SetRandomIdIfNotProvided();
-            var innerContent = (await output.GetChildContentAsync().ConfigureAwait(false)).GetContent();
+            var innerContent = (await output.GetChildContentAsync()).GetContent();
            var html = GetAccordionHeaderItem(context, output) + GetAccordionContentItem(context, output, innerContent);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionTagHelperService.cs
@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
            var items = InitilizeFormGroupContentsContext(context, output);
-            await output.GetChildContentAsync().ConfigureAwait(false);
+            await output.GetChildContentAsync();
            var content = GetContent(items);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpCollapseBodyTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpCollapseBodyTagHelperService.cs
@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
                output.Attributes.AddClass("multi-collapse");
            }
-            var innerContent = (await output.GetChildContentAsync().ConfigureAwait(false)).GetContent();
+            var innerContent = (await output.GetChildContentAsync()).GetContent();
            output.Content.SetHtmlContent(innerContent);
        }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
@ -26,9 +26,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
        {
-            var content = await output.GetChildContentAsync().ConfigureAwait(false);
+            var content = await output.GetChildContentAsync();
-            var buttonsAsHtml = await GetButtonsAsHtmlAsync(context, output, content).ConfigureAwait(false);
+            var buttonsAsHtml = await GetButtonsAsHtmlAsync(context, output, content);
            output.PreElement.SetHtmlContent(buttonsAsHtml);
@ -43,13 +43,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
        {
            var buttonBuilder = new StringBuilder("");
-            var mainButton = await GetMainButtonAsync(context, output, content).ConfigureAwait(false);
+            var mainButton = await GetMainButtonAsync(context, output, content);
            buttonBuilder.AppendLine(mainButton);
            if (TagHelper.DropdownStyle == DropdownStyle.Split)
            {
-                var splitButton = await GetSplitButtonAsync(context, output).ConfigureAwait(false);
+                var splitButton = await GetSplitButtonAsync(context, output);
                buttonBuilder.AppendLine(splitButton);
            }
@ -68,7 +68,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
            abpButtonTagHelper.ButtonType = TagHelper.ButtonType;
            var attributes = GetAttributesForMainButton(context, output);
-            var buttonTag = await abpButtonTagHelper.ProcessAndGetOutputAsync(attributes, context, "button", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            var buttonTag = await abpButtonTagHelper.ProcessAndGetOutputAsync(attributes, context, "button", TagMode.StartTagAndEndTag);
            buttonTag.PreContent.SetHtmlContent(content.GetContent());
@ -89,7 +89,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
            abpButtonTagHelper.ButtonType = TagHelper.ButtonType;
            var attributes = GetAttributesForSplitButton(context, output);
-            return await abpButtonTagHelper.RenderAsync(attributes, context, _htmlEncoder, "button", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            return await abpButtonTagHelper.RenderAsync(attributes, context, _htmlEncoder, "button", TagMode.StartTagAndEndTag);
        }
        protected virtual TagHelperAttributeList GetAttributesForMainButton(TagHelperContext context, TagHelperOutput output)
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperExtensions.cs
@ -19,14 +19,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions
            tagHelper.Init(context);
-            await tagHelper.ProcessAsync(innerContext, innerOutput).ConfigureAwait(false);
+            await tagHelper.ProcessAsync(innerContext, innerOutput);
            return innerOutput;
        }
        public static async Task<string> RenderAsync(this TagHelper tagHelper, TagHelperAttributeList attributeList, TagHelperContext context, HtmlEncoder htmlEncoder, string tagName = "div", TagMode tagMode = TagMode.SelfClosing)
        {
-            var innerOutput = await tagHelper.ProcessAndGetOutputAsync(attributeList, context, tagName, tagMode).ConfigureAwait(false);
+            var innerOutput = await tagHelper.ProcessAndGetOutputAsync(attributeList, context, tagName, tagMode);
            return innerOutput.Render(htmlEncoder);
        }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
@ -37,11 +37,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
            NormalizeTagMode(context, output);
-            var childContent = (await output.GetChildContentAsync().ConfigureAwait(false)).GetContent();
+            var childContent = (await output.GetChildContentAsync()).GetContent();
-            await ConvertToMvcForm(context, output).ConfigureAwait(false);
+            await ConvertToMvcForm(context, output);
-            await ProcessFieldsAsync(context, output).ConfigureAwait(false);
+            await ProcessFieldsAsync(context, output);
            SetContent(context, output, list, childContent);
@ -67,9 +67,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                ViewContext = TagHelper.ViewContext
            };
-            var formTagOutput = await formTagHelper.ProcessAndGetOutputAsync(output.Attributes, context, "form", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            var formTagOutput = await formTagHelper.ProcessAndGetOutputAsync(output.Attributes, context, "form", TagMode.StartTagAndEndTag);
-            await formTagOutput.GetChildContentAsync().ConfigureAwait(false);
+            await formTagOutput.GetChildContentAsync();
            output.PostContent.SetHtmlContent(output.PostContent.GetContent() + formTagOutput.PostContent.GetContent());
            output.PreContent.SetHtmlContent(output.PreContent.GetContent() + formTagOutput.PreContent.GetContent());
@ -134,11 +134,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
            {
                if (IsSelectGroup(context, model))
                {
-                    await ProcessSelectGroupAsync(context, output, model).ConfigureAwait(false);
+                    await ProcessSelectGroupAsync(context, output, model);
                }
                else
                {
-                    await ProcessInputGroupAsync(context, output, model).ConfigureAwait(false);
+                    await ProcessInputGroupAsync(context, output, model);
                }
            }
        }
@ -147,7 +147,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
        {
            var abpSelectTagHelper = GetSelectGroupTagHelper(context, output, model);
-            await abpSelectTagHelper.RenderAsync(new TagHelperAttributeList(), context, _htmlEncoder, "div", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            await abpSelectTagHelper.RenderAsync(new TagHelperAttributeList(), context, _htmlEncoder, "div", TagMode.StartTagAndEndTag);
        }
        protected virtual AbpTagHelper GetSelectGroupTagHelper(TagHelperContext context, TagHelperOutput output, ModelExpression model)
@ -185,7 +185,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
            abpButtonTagHelper.Text = "Submit";
            abpButtonTagHelper.ButtonType = AbpButtonType.Primary;
-            return await abpButtonTagHelper.RenderAsync(attributes, context, _htmlEncoder, "button", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            return await abpButtonTagHelper.RenderAsync(attributes, context, _htmlEncoder, "button", TagMode.StartTagAndEndTag);
        }
        protected virtual async Task ProcessInputGroupAsync(TagHelperContext context, TagHelperOutput output, ModelExpression model)
@ -195,7 +195,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
            abpInputTagHelper.ViewContext = TagHelper.ViewContext;
            abpInputTagHelper.DisplayRequiredSymbol = TagHelper.RequiredSymbols ?? true;
-            await abpInputTagHelper.RenderAsync(new TagHelperAttributeList(), context, _htmlEncoder, "div", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            await abpInputTagHelper.RenderAsync(new TagHelperAttributeList(), context, _htmlEncoder, "div", TagMode.StartTagAndEndTag);
        }
        protected virtual List<ModelExpression> GetModels(TagHelperContext context, TagHelperOutput output)
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
@ -27,7 +27,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
        {
-            var (innerHtml, isCheckBox) = await GetFormInputGroupAsHtmlAsync(context, output).ConfigureAwait(false);
+            var (innerHtml, isCheckBox) = await GetFormInputGroupAsHtmlAsync(context, output);
            var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();
@ -57,12 +57,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
        protected virtual async Task<(string, bool)> GetFormInputGroupAsHtmlAsync(TagHelperContext context, TagHelperOutput output)
        {
-            var (inputTag, isCheckBox) = await GetInputTagHelperOutputAsync(context, output).ConfigureAwait(false);
+            var (inputTag, isCheckBox) = await GetInputTagHelperOutputAsync(context, output);
            var inputHtml = inputTag.Render(_encoder);
-            var label = await GetLabelAsHtmlAsync(context, output, inputTag, isCheckBox).ConfigureAwait(false);
+            var label = await GetLabelAsHtmlAsync(context, output, inputTag, isCheckBox);
            var info = GetInfoAsHtml(context, output, inputTag, isCheckBox);
-            var validation = isCheckBox ? "" : await GetValidationAsHtmlAsync(context, output, inputTag).ConfigureAwait(false);
+            var validation = isCheckBox ? "" : await GetValidationAsHtmlAsync(context, output, inputTag);
            return (GetContent(context, output, label, inputHtml, validation, info, isCheckBox), isCheckBox);
        }
@ -82,7 +82,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
            var attributeList = new TagHelperAttributeList { { "class", "text-danger" } };
-            return await validationMessageTagHelper.RenderAsync(attributeList, context, _encoder, "span", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            return await validationMessageTagHelper.RenderAsync(attributeList, context, _encoder, "span", TagMode.StartTagAndEndTag);
        }
        protected virtual string GetContent(TagHelperContext context, TagHelperOutput output, string label, string inputHtml, string validation, string infoHtml, bool isCheckbox)
@ -125,7 +125,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
        {
            var tagHelper = GetInputTagHelper(context, output);
-            var inputTagHelperOutput = await tagHelper.ProcessAndGetOutputAsync(GetInputAttributes(context, output), context, "input").ConfigureAwait(false);
+            var inputTagHelperOutput = await tagHelper.ProcessAndGetOutputAsync(GetInputAttributes(context, output), context, "input");
            ConvertToTextAreaIfTextArea(inputTagHelperOutput);
            AddDisabledAttribute(inputTagHelperOutput);
@ -227,7 +227,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
            if (string.IsNullOrEmpty(TagHelper.Label))
            {
-                return await GetLabelAsHtmlUsingTagHelperAsync(context, output, isCheckbox).ConfigureAwait(false) + GetRequiredSymbol(context, output);
+                return await GetLabelAsHtmlUsingTagHelperAsync(context, output, isCheckbox) + GetRequiredSymbol(context, output);
            }
            var checkboxClass = isCheckbox ? "class=\"custom-control-label\" " : "";
@ -301,7 +301,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                attributeList.AddClass("custom-control-label");
            }
-            return await labelTagHelper.RenderAsync(attributeList, context, _encoder, "label", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            return await labelTagHelper.RenderAsync(attributeList, context, _encoder, "label", TagMode.StartTagAndEndTag);
        }
        protected virtual void ConvertToTextAreaIfTextArea(TagHelperOutput tagHelperOutput)
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
@ -30,7 +30,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
        {
-            var innerHtml = await GetFormInputGroupAsHtmlAsync(context, output).ConfigureAwait(false);
+            var innerHtml = await GetFormInputGroupAsHtmlAsync(context, output);
            var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();
@ -52,10 +52,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
        protected virtual async Task<string> GetFormInputGroupAsHtmlAsync(TagHelperContext context, TagHelperOutput output)
        {
-            var selectTag = await GetSelectTagAsync(context, output).ConfigureAwait(false);
+            var selectTag = await GetSelectTagAsync(context, output);
            var selectAsHtml = selectTag.Render(_encoder);
-            var label = await GetLabelAsHtmlAsync(context, output, selectTag).ConfigureAwait(false);
+            var label = await GetLabelAsHtmlAsync(context, output, selectTag);
-            var validation = await GetValidationAsHtmlAsync(context, output, selectTag).ConfigureAwait(false);
+            var validation = await GetValidationAsHtmlAsync(context, output, selectTag);
            var infoText = GetInfoAsHtml(context, output, selectTag);
            return label + Environment.NewLine + selectAsHtml + Environment.NewLine + infoText + Environment.NewLine + validation;
@ -75,7 +75,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                ViewContext = TagHelper.ViewContext
            };
-            var selectTagHelperOutput = await selectTagHelper.ProcessAndGetOutputAsync(GetInputAttributes(context, output), context, "select", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            var selectTagHelperOutput = await selectTagHelper.ProcessAndGetOutputAsync(GetInputAttributes(context, output), context, "select", TagMode.StartTagAndEndTag);
            selectTagHelperOutput.Attributes.AddClass("form-control");
            selectTagHelperOutput.Attributes.AddClass(GetSize(context, output));
@ -123,7 +123,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                return "<label " + GetIdAttributeAsString(selectTag) + ">" + TagHelper.Label + "</label>" + GetRequiredSymbol(context, output);
            }
-            return await GetLabelAsHtmlUsingTagHelperAsync(context, output).ConfigureAwait(false) + GetRequiredSymbol(context, output);
+            return await GetLabelAsHtmlUsingTagHelperAsync(context, output) + GetRequiredSymbol(context, output);
        }
        protected virtual string GetRequiredSymbol(TagHelperContext context, TagHelperOutput output)
@ -242,7 +242,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                ViewContext = TagHelper.ViewContext
            };
-            return await labelTagHelper.RenderAsync(new TagHelperAttributeList(), context, _encoder, "label", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            return await labelTagHelper.RenderAsync(new TagHelperAttributeList(), context, _encoder, "label", TagMode.StartTagAndEndTag);
        }
        protected virtual async Task<string> GetValidationAsHtmlAsync(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag)
@ -255,7 +255,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
            var attributeList = new TagHelperAttributeList { { "class", "text-danger" } };
-            return await validationMessageTagHelper.RenderAsync(attributeList, context, _encoder, "span", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            return await validationMessageTagHelper.RenderAsync(attributeList, context, _encoder, "span", TagMode.StartTagAndEndTag);
        }
        protected virtual string GetSize(TagHelperContext context, TagHelperOutput output)
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
@ -31,7 +31,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
            }
            ProcessMainTag(context, output);
-            await SetContentAsHtmlAsync(context, output).ConfigureAwait(false);
+            await SetContentAsHtmlAsync(context, output);
        }
        protected virtual async Task SetContentAsHtmlAsync(TagHelperContext context, TagHelperOutput output)
@ -39,9 +39,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
            var html = new StringBuilder("");
            html.AppendLine(GetOpeningTags(context, output));
-            html.AppendLine(await GetPreviousButtonAsync(context, output).ConfigureAwait(false));
+            html.AppendLine(await GetPreviousButtonAsync(context, output));
-            html.AppendLine(await GetPagesAsync(context, output).ConfigureAwait(false));
+            html.AppendLine(await GetPagesAsync(context, output));
-            html.AppendLine(await GetNextButton(context, output).ConfigureAwait(false));
+            html.AppendLine(await GetNextButton(context, output));
            html.AppendLine(GetClosingTags(context, output));
            output.Content.SetHtmlContent(html.ToString());
@ -61,7 +61,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
            foreach (var page in TagHelper.Model.Pages)
            {
-                pagesHtml.AppendLine(await GetPageAsync(context, output, page).ConfigureAwait(false));
+                pagesHtml.AppendLine(await GetPageAsync(context, output, page));
            }
            return pagesHtml.ToString();
@ -86,7 +86,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
            }
            else
            {
-                pageHtml.AppendLine(await RenderAnchorTagHelperLinkHtmlAsync(context, output, page.Index.ToString(), page.Index.ToString()).ConfigureAwait(false));
+                pageHtml.AppendLine(await RenderAnchorTagHelperLinkHtmlAsync(context, output, page.Index.ToString(), page.Index.ToString()));
            }
            pageHtml.AppendLine("</li>");
@ -102,7 +102,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
                : (TagHelper.Model.CurrentPage - 1).ToString();
            return
                "<li class=\"page-item " + (TagHelper.Model.CurrentPage == 1 ? "disabled" : "") + "\">\r\n" +
-                (await RenderAnchorTagHelperLinkHtmlAsync(context, output, currentPage, localizationKey).ConfigureAwait(false)) + "                </li>";
+                (await RenderAnchorTagHelperLinkHtmlAsync(context, output, currentPage, localizationKey)) + "                </li>";
        }
        protected virtual async Task<string> GetNextButton(TagHelperContext context, TagHelperOutput output)
@ -111,7 +111,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
            var currentPage = (TagHelper.Model.CurrentPage + 1).ToString();
            return
                "<li class=\"page-item " + (TagHelper.Model.CurrentPage >= TagHelper.Model.TotalPageCount ? "disabled" : "") + "\">\r\n" +
-                (await RenderAnchorTagHelperLinkHtmlAsync(context, output, currentPage, localizationKey).ConfigureAwait(false)) +
+                (await RenderAnchorTagHelperLinkHtmlAsync(context, output, currentPage, localizationKey)) +
                "                </li>";
        }
@ -121,7 +121,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
            var anchorTagHelper = GetAnchorTagHelper(currentPage, out var attributeList);
-            var tagHelperOutput = await anchorTagHelper.ProcessAndGetOutputAsync(attributeList, context, "a", TagMode.StartTagAndEndTag).ConfigureAwait(false);
+            var tagHelperOutput = await anchorTagHelper.ProcessAndGetOutputAsync(attributeList, context, "a", TagMode.StartTagAndEndTag);
            tagHelperOutput.Content.SetHtmlContent(localizer[localizationKey]);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
                throw new Exception("Name of tab dropdown tag can not bu null or empty.");
            }
-            await output.GetChildContentAsync().ConfigureAwait(false);
+            await output.GetChildContentAsync();
            var tabHeader = GetTabHeaderItem(context, output);
            var tabHeaderItems = context.GetValue<List<TabItem>>(TabItems);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
        {
            SetPlaceholderForNameIfNotProvided();
-            var innerContent = await output.GetChildContentAsync().ConfigureAwait(false);
+            var innerContent = await output.GetChildContentAsync();
            var tabHeader = GetTabHeaderItem(context, output);
            var tabContent = GetTabContentItem(context, output, innerContent.GetContent());
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabsTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabsTagHelperService.cs
@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
            var items = InitilizeFormGroupContentsContext(context, output);
-            await output.GetChildContentAsync().ConfigureAwait(false);
+            await output.GetChildContentAsync();
            var headers = GetHeaders(context, output, items);
            var contents = GetConents(context, output, items);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs
@ -61,12 +61,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
        public virtual async Task<IReadOnlyList<string>> GetStyleBundleFilesAsync(string bundleName)
        {
-            return await GetBundleFilesAsync(Options.StyleBundles, bundleName, StyleBundler).ConfigureAwait(false);
+            return await GetBundleFilesAsync(Options.StyleBundles, bundleName, StyleBundler);
        }
        public virtual async Task<IReadOnlyList<string>> GetScriptBundleFilesAsync(string bundleName)
        {
-            return await GetBundleFilesAsync(Options.ScriptBundles, bundleName, ScriptBundler).ConfigureAwait(false);
+            return await GetBundleFilesAsync(Options.ScriptBundles, bundleName, ScriptBundler);
        }
        protected virtual async Task<IReadOnlyList<string>> GetBundleFilesAsync(BundleConfigurationCollection bundles, string bundleName, IBundler bundler)
@ -185,17 +185,17 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
            foreach (var contributor in contributors)
            {
-                await contributor.PreConfigureBundleAsync(context).ConfigureAwait(false);
+                await contributor.PreConfigureBundleAsync(context);
            }
            foreach (var contributor in contributors)
            {
-                await contributor.ConfigureBundleAsync(context).ConfigureAwait(false);
+                await contributor.ConfigureBundleAsync(context);
            }
            foreach (var contributor in contributors)
            {
-                await contributor.PostConfigureBundleAsync(context).ConfigureAwait(false);
+                await contributor.PostConfigureBundleAsync(context);
            }
            return context.Files;
@ -207,7 +207,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
            foreach (var contributor in contributors)
            {
-                await contributor.ConfigureDynamicResourcesAsync(context).ConfigureAwait(false);
+                await contributor.ConfigureDynamicResourcesAsync(context);
            }
            return context.Files;
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs
@ -33,7 +33,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
                        TagHelper.CreateBundleTagHelperItem()
                    },
                    TagHelper.GetNameOrNull()
-                ).ConfigureAwait(false);
+                );
            }
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs
@ -20,16 +20,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
            await ResourceService.ProcessAsync(
                context,
                output,
-                await GetBundleItems(context, output).ConfigureAwait(false),
+                await GetBundleItems(context, output),
                TagHelper.GetNameOrNull()
-            ).ConfigureAwait(false);
+            );
        }
        protected virtual async Task<List<BundleTagHelperItem>> GetBundleItems(TagHelperContext context, TagHelperOutput output)
        {
            var bundleItems = new List<BundleTagHelperItem>();
            context.Items[AbpTagHelperConsts.ContextBundleItemListKey] = bundleItems;
-            await output.GetChildContentAsync().ConfigureAwait(false); //TODO: Is there a way of executing children without getting content?
+            await output.GetChildContentAsync(); //TODO: Is there a way of executing children without getting content?
            return bundleItems;
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
@ -56,7 +56,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
            CreateBundle(bundleName, bundleItems);
-            var bundleFiles = await GetBundleFilesAsync(bundleName).ConfigureAwait(false);
+            var bundleFiles = await GetBundleFilesAsync(bundleName);
            output.Content.Clear();
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs
@ -36,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
        protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
        {
-            return await BundleManager.GetScriptBundleFilesAsync(bundleName).ConfigureAwait(false);
+            return await BundleManager.GetScriptBundleFilesAsync(bundleName);
        }
        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs
@ -36,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
        protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
        {
-            return await BundleManager.GetStyleBundleFilesAsync(bundleName).ConfigureAwait(false);
+            return await BundleManager.GetStyleBundleFilesAsync(bundleName);
        }
        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantAppService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantAppService.cs
@ -17,7 +17,7 @@ namespace Pages.Abp.MultiTenancy
        public async Task<FindTenantResultDto> FindTenantByNameAsync(string name)
        {
-            var tenant = await TenantStore.FindAsync(name).ConfigureAwait(false);
+            var tenant = await TenantStore.FindAsync(name);
            if (tenant == null)
            {
@ -34,7 +34,7 @@ namespace Pages.Abp.MultiTenancy
        public async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id)
        {
-            var tenant = await TenantStore.FindAsync(id).ConfigureAwait(false);
+            var tenant = await TenantStore.FindAsync(id);
            if (tenant == null)
            {
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantController.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantController.cs
@ -17,18 +17,17 @@ namespace Pages.Abp.MultiTenancy
        }
        [HttpGet]
        [Route("find-tenant/{name}")] //TODO: Remove on v1.0
        [Route("tenants/by-name/{name}")]
        public async Task<FindTenantResultDto> FindTenantByNameAsync(string name)
        {
-            return await _abpTenantAppService.FindTenantByNameAsync(name).ConfigureAwait(false);
+            return await _abpTenantAppService.FindTenantByNameAsync(name);
        }
        [HttpGet]
        [Route("tenants/by-id/{id}")]
        public async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id)
        {
-            return await _abpTenantAppService.FindTenantByIdAsync(id).ConfigureAwait(false);
+            return await _abpTenantAppService.FindTenantByIdAsync(id);
        }
    }
 }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs
@ -34,7 +34,7 @@ namespace Pages.Abp.MultiTenancy
            if (CurrentTenant.IsAvailable)
            {
-                var tenant = await TenantStore.FindAsync(CurrentTenant.GetId()).ConfigureAwait(false);
+                var tenant = await TenantStore.FindAsync(CurrentTenant.GetId());
                Input.Name = tenant?.Name;
            }
        }
@ -47,7 +47,7 @@ namespace Pages.Abp.MultiTenancy
            }
            else
            {
-                var tenant = await TenantStore.FindAsync(Input.Name).ConfigureAwait(false);
+                var tenant = await TenantStore.FindAsync(Input.Name);
                if (tenant == null)
                {
                    throw new UserFriendlyException(L["GivenTenantIsNotAvailable", Input.Name]);
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs
@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu
        public async Task<IViewComponentResult> InvokeAsync()
        {
-            var menu = await _menuManager.GetAsync(StandardMenus.Main).ConfigureAwait(false);
+            var menu = await _menuManager.GetAsync(StandardMenus.Main);
            return View("~/Themes/Basic/Components/Menu/Default.cshtml", menu);
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs
@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar
        public async Task<IViewComponentResult> InvokeAsync()
        {
-            var languages = await _languageProvider.GetLanguagesAsync().ConfigureAwait(false);
+            var languages = await _languageProvider.GetLanguagesAsync();
            var currentLanguage = languages.FindByCulture(
                CultureInfo.CurrentCulture.Name,
                CultureInfo.CurrentUICulture.Name
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolsViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolsViewComponent.cs
@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar
        public async Task<IViewComponentResult> InvokeAsync()
        {
-            var toolbar = await _toolbarManager.GetAsync(StandardToolbars.Main).ConfigureAwait(false);
+            var toolbar = await _toolbarManager.GetAsync(StandardToolbars.Main);
            return View("~/Themes/Basic/Components/Toolbar/Default.cshtml", toolbar);
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs
@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar
        public async Task<IViewComponentResult> InvokeAsync()
        {
-            var menu = await _menuManager.GetAsync(StandardMenus.User).ConfigureAwait(false);
+            var menu = await _menuManager.GetAsync(StandardMenus.User);
            return View("~/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml", menu);
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs
@ -25,7 +25,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Toolbars
            var languageProvider = context.ServiceProvider.GetService<ILanguageProvider>();
            //TODO: This duplicates GetLanguages() usage. Can we eleminate this?
-            var languages = await languageProvider.GetLanguagesAsync().ConfigureAwait(false);
+            var languages = await languageProvider.GetLanguagesAsync();
            if (languages.Count > 1)
            {
                context.Toolbar.Items.Add(new ToolbarItem(typeof(LanguageSwitchViewComponent)));
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
@ -36,4 +37,4 @@
    <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
  </ItemGroup>
-</Project>
+</Project>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
@ -33,7 +33,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
                foreach (var contributor in Options.Contributors)
                {
-                    await contributor.ConfigureToolbarAsync(context).ConfigureAwait(false);
+                    await contributor.ConfigureToolbarAsync(context);
                }
            }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
@ -39,4 +40,4 @@
    <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Widgets\Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj" />
  </ItemGroup>
-</Project>
+</Project>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpViewComponentHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpViewComponentHelper.cs
@ -33,10 +33,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets
            var widget = Options.Widgets.Find(name);
            if (widget == null)
            {
-                return await DefaultViewComponentHelper.InvokeAsync(name, arguments).ConfigureAwait(false);
+                return await DefaultViewComponentHelper.InvokeAsync(name, arguments);
            }
-            return await InvokeWidgetAsync(arguments, widget).ConfigureAwait(false);
+            return await InvokeWidgetAsync(arguments, widget);
        }
        public virtual async Task<IHtmlContent> InvokeAsync(Type componentType, object arguments)
@ -44,10 +44,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets
            var widget = Options.Widgets.Find(componentType);
            if (widget == null)
            {
-                return await DefaultViewComponentHelper.InvokeAsync(componentType, arguments).ConfigureAwait(false);
+                return await DefaultViewComponentHelper.InvokeAsync(componentType, arguments);
            }
-            return await InvokeWidgetAsync(arguments, widget).ConfigureAwait(false);
+            return await InvokeWidgetAsync(arguments, widget);
        }
        public virtual void Contextualize(ViewContext viewContext)
@ -68,7 +68,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets
            return new HtmlContentBuilder()
                .AppendHtml($"<div {wrapperAttributesBuilder}>")
-                .AppendHtml(await DefaultViewComponentHelper.InvokeAsync(widget.ViewComponentType, arguments).ConfigureAwait(false))
+                .AppendHtml(await DefaultViewComponentHelper.InvokeAsync(widget.ViewComponentType, arguments))
                .AppendHtml("</div>");
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetManager.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetManager.cs
@ -27,14 +27,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets
        {
            var widget = Options.Widgets.Find(widgetComponentType);
-            return await IsGrantedAsyncInternal(widget, widgetComponentType.FullName).ConfigureAwait(false);
+            return await IsGrantedAsyncInternal(widget, widgetComponentType.FullName);
        }
        public async Task<bool> IsGrantedAsync(string name)
        {
            var widget = Options.Widgets.Find(name);
-            return await IsGrantedAsyncInternal(widget, name).ConfigureAwait(false);
+            return await IsGrantedAsyncInternal(widget, name);
        }
        private async Task<bool> IsGrantedAsyncInternal(WidgetDefinition widget, string wantedWidgetName)
@ -48,7 +48,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets
            {
                foreach (var requiredPolicy in widget.RequiredPolicies)
                {
-                    if (!(await AuthorizationService.AuthorizeAsync(requiredPolicy).ConfigureAwait(false)).Succeeded)
+                    if (!(await AuthorizationService.AuthorizeAsync(requiredPolicy)).Succeeded)
                    {
                        return false;
                    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/FodyWeavers.xml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/FodyWeavers.xml
@ -0,0 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/FodyWeavers.xsd
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/FodyWeavers.xsd
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
          <xs:complexType>
            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
          </xs:complexType>
        </xs:element>
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="GenerateXsd" type="xs:boolean">
        <xs:annotation>
          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
  </xs:element>
 </xs:schema>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj
@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
  <Import Project="..\..\..\configureawait.props" />
  <Import Project="..\..\..\common.props" />
  <PropertyGroup>
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
@ -56,12 +56,12 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
            return new ApplicationConfigurationDto
            {
-                Auth = await GetAuthConfigAsync().ConfigureAwait(false),
+                Auth = await GetAuthConfigAsync(),
-                Features = await GetFeaturesConfigAsync().ConfigureAwait(false),
+                Features = await GetFeaturesConfigAsync(),
-                Localization = await GetLocalizationConfigAsync().ConfigureAwait(false),
+                Localization = await GetLocalizationConfigAsync(),
                CurrentUser = GetCurrentUser(),
                Setting = await GetSettingConfigAsync()
-.ConfigureAwait(false)
+
            };
        }
@ -82,7 +82,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
            var authConfig = new ApplicationAuthConfigurationDto();
-            var policyNames = await _abpAuthorizationPolicyProvider.GetPoliciesNamesAsync().ConfigureAwait(false);
+            var policyNames = await _abpAuthorizationPolicyProvider.GetPoliciesNamesAsync();
            Logger.LogDebug($"GetPoliciesNamesAsync returns {policyNames.Count} items.");
@ -92,7 +92,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
                Logger.LogDebug($"_authorizationService.IsGrantedAsync? {policyName}");
-                if (await _authorizationService.IsGrantedAsync(policyName).ConfigureAwait(false))
+                if (await _authorizationService.IsGrantedAsync(policyName))
                {
                    authConfig.GrantedPolicies[policyName] = true;
                }
@ -175,7 +175,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
                    continue;
                }
-                result.Values[settingDefinition.Name] = await _settingProvider.GetOrNullAsync(settingDefinition.Name).ConfigureAwait(false);
+                result.Values[settingDefinition.Name] = await _settingProvider.GetOrNullAsync(settingDefinition.Name);
            }
            Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetSettingConfigAsync()");
@ -196,7 +196,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
                    continue;
                }
-                result.Values[featureDefinition.Name] = await FeatureChecker.GetOrNullAsync(featureDefinition.Name).ConfigureAwait(false);
+                result.Values[featureDefinition.Name] = await FeatureChecker.GetOrNullAsync(featureDefinition.Name);
            }
            Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetFeaturesConfigAsync()");
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs
@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
        [HttpGet]
        public async Task<ApplicationConfigurationDto> GetAsync()
        {
-            return await _applicationConfigurationAppService.GetAsync().ConfigureAwait(false);
+            return await _applicationConfigurationAppService.GetAsync();
        }
    }
 }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs
@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
        [Produces(MimeTypes.Application.Javascript, MimeTypes.Text.Plain)]
        public async Task<ActionResult> Get()
        {
-            var script = CreateAbpExtendScript(await _configurationAppService.GetAsync().ConfigureAwait(false));
+            var script = CreateAbpExtendScript(await _configurationAppService.GetAsync());
            return Content(
                _options.MinifyGeneratedScript == true
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
@ -175,7 +175,10 @@ namespace Volo.Abp.AspNetCore.Mvc
                        parameterDescription.RouteInfo?.IsOptional ?? false,
                        parameterDescription.RouteInfo?.DefaultValue,
                        parameterDescription.RouteInfo?.Constraints?.Select(c => c.GetType().Name).ToArray(),
-                        parameterDescription.Source.Id
+                        parameterDescription.Source.Id,
                        parameterDescription.ModelMetadata?.ContainerType != null
                            ? parameterDescription.ParameterDescriptor?.Name ?? string.Empty
                            : string.Empty
                    )
                );
            }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Auditing/AbpAuditActionFilter.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Auditing/AbpAuditActionFilter.cs
@ -27,7 +27,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
        {
            if (!ShouldSaveAudit(context, out var auditLog, out var auditLogAction))
            {
-                await next().ConfigureAwait(false);
+                await next();
                return;
            }
@ -37,7 +37,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
                try
                {
-                    var result = await next().ConfigureAwait(false);
+                    var result = await next();
                    if (result.Exception != null && !result.ExceptionHandled)
                    {
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Authentication/ChallengeAccountController.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Authentication/ChallengeAccountController.cs
@ -42,7 +42,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Authentication
        [HttpGet]
        public async Task<ActionResult> Logout(string returnUrl = "", string returnUrlHash = "")
        {
-            await HttpContext.SignOutAsync().ConfigureAwait(false);
+            await HttpContext.SignOutAsync();
            if (HttpContext.User.Identity.AuthenticationType == AuthenticationType)
            {
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Features/AbpFeatureActionFilter.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Features/AbpFeatureActionFilter.cs
@ -23,7 +23,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
        {
            if (!context.ActionDescriptor.IsControllerAction())
            {
-                await next().ConfigureAwait(false);
+                await next();
                return;
            }
@ -33,9 +33,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
            {
                await _methodInvocationAuthorizationService.CheckAsync(
                    new MethodInvocationFeatureCheckerContext(methodInfo)
-                ).ConfigureAwait(false);
+                );
-                await next().ConfigureAwait(false);
+                await next();
            }
        }
    }
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs
@ -24,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
        public async Task BindModelAsync(ModelBindingContext bindingContext)
        {
-            await _simpleTypeModelBinder.BindModelAsync(bindingContext).ConfigureAwait(false);
+            await _simpleTypeModelBinder.BindModelAsync(bindingContext);
            if (!bindingContext.Result.IsModelSet)
            {
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs
@ -25,7 +25,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
        {
            if (!context.ActionDescriptor.IsControllerAction())
            {
-                await next().ConfigureAwait(false);
+                await next();
                return;
            }
@ -39,7 +39,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
            if (unitOfWorkAttr?.IsDisabled == true)
            {
-                await next().ConfigureAwait(false);
+                await next();
                return;
            }
@ -48,10 +48,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
            //Trying to begin a reserved UOW by AbpUnitOfWorkMiddleware
            if (_unitOfWorkManager.TryBeginReserved(AbpUnitOfWorkMiddleware.UnitOfWorkReservationName, options))
            {
-                var result = await next().ConfigureAwait(false);
+                var result = await next();
                if (!Succeed(result))
                {
-                    await RollbackAsync(context).ConfigureAwait(false);
+                    await RollbackAsync(context);
                }
                return;
@ -60,10 +60,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
            //Begin a new, independent unit of work
            using (var uow = _unitOfWorkManager.Begin(options))
            {
-                var result = await next().ConfigureAwait(false);
+                var result = await next();
                if (Succeed(result))
                {
-                    await uow.CompleteAsync(context.HttpContext.RequestAborted).ConfigureAwait(false);
+                    await uow.CompleteAsync(context.HttpContext.RequestAborted);
                }
            }
        }
@ -89,7 +89,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
            var currentUow = _unitOfWorkManager.Current;
            if (currentUow != null)
            {
-                await currentUow.RollbackAsync(context.HttpContext.RequestAborted).ConfigureAwait(false);
+                await currentUow.RollbackAsync(context.HttpContext.RequestAborted);
            }
        }