Merge branch 'master' into dev

luoyunchong · Feb 20, 2020 · 5460d79 · 5460d79
2 parents 478e879 + 22b7223
commit 5460d79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <Version>2.2.0</Version>
+    <LangVersion>latest</LangVersion> 
+    <Version>2.2.0</Version> 
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>

diff --git 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>

diff --git a/npm/package.json b/npm/package.json
@@ -1,5 +1,5 @@
-{
-  "version": "2.2.0",
+{ 
+  "version": "2.2.0", 
   "scripts": {
     "lerna": "lerna",
     "gulp:app": "node run-gulp-script.js ../templates/app/aspnet-core",