Merge branch 'master' into dev

6 years ago · 5460d79f1c
parent 478e8797e3 22b7223de1
commit 5460d79f1c
3 changed files with 6 additions and 4 deletions
--- a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
+++ b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <Import Project="..\..\..\configureawait.props" />
+  <Import Project="..\..\..\common.props" />
+
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <AssemblyName>Volo.Abp.Core</AssemblyName>