Merge branch 'master' into dev

6 years ago · 5460d79f1c
parent 478e8797e3 22b7223de1
commit 5460d79f1c
3 changed files with 6 additions and 4 deletions
--- 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>
--- 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>
--- 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",