Browse Source

Merge branch 'master' into dev

pull/2875/head
Arkat Erol 7 years ago
parent
commit
5460d79f1c
  1. 4
      common.props
  2. 2
      framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
  3. 4
      npm/package.json

4
common.props

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

2
framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj

@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Volo.Abp.Core</AssemblyName> <AssemblyName>Volo.Abp.Core</AssemblyName>

4
npm/package.json

@ -1,5 +1,5 @@
{ {
"version": "2.2.0", "version": "2.2.0",
"scripts": { "scripts": {
"lerna": "lerna", "lerna": "lerna",
"gulp:app": "node run-gulp-script.js ../templates/app/aspnet-core", "gulp:app": "node run-gulp-script.js ../templates/app/aspnet-core",

Loading…
Cancel
Save