diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 72c2ecaacf..78b2ec69cd 100644 Binary files a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll and b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll differ diff --git a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.csproj b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.csproj index 239dcb5727..f436113aab 100644 --- a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.csproj +++ b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.EmbeddedFiles Volo.Abp.AspNetCore.EmbeddedFiles - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,7 +16,7 @@ - + diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj index 0b707c97d9..2f8bd42972 100644 --- a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj +++ b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.MultiTenancy Volo.Abp.AspNetCore.MultiTenancy - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj index 3264f31809..828bdfbb27 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.Mvc Volo.Abp.AspNetCore.Mvc - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,7 +16,7 @@ - + diff --git a/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj b/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj index 2b76194e1c..c6ff8966ba 100644 --- a/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj +++ b/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.TestBase Volo.Abp.AspNetCore.TestBase - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,7 +16,7 @@ - + diff --git a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj index 27ba4e138c..9ec283e65c 100644 --- a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj +++ b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore Volo.Abp.AspNetCore - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,9 +16,9 @@ - - - + + + diff --git a/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj index 6678671ddc..0f24c220e5 100644 --- a/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj +++ b/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj @@ -1,11 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AutoMapper Volo.Abp.AutoMapper - 1.6.1 - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj b/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj index 030a65896e..384019b20a 100644 --- a/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj +++ b/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj @@ -1,11 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Autofac Volo.Abp.Autofac - 1.6.1 - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj b/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj index 24327fe3e3..8e2a2607c2 100644 --- a/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj +++ b/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj @@ -1,11 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Castle.Core Volo.Abp.Castle.Core - 1.6.1 - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj index b53835633c..252c61d826 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj +++ b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.EntityFrameworkCore Volo.Abp.EntityFrameworkCore - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,7 +16,7 @@ - + diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj index 5c78c28f08..22e26eb056 100644 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Identity.Application.Contracts Volo.Abp.Identity.Application.Contracts - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj index 5dde635301..489ea9e63a 100644 --- a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj +++ b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Identity.Application Volo.Abp.Identity.Application - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj index 15e2d97031..1d941dab84 100644 --- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj +++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Identity.EntityFrameworkCore Volo.Abp.Identity.EntityFrameworkCore - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -17,8 +17,8 @@ - - + + diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs index d72e71f529..a74fbd4b0d 100644 --- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs +++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; using Microsoft.EntityFrameworkCore.Infrastructure; using Volo.Abp.Identity.EntityFrameworkCore; @@ -6,9 +7,9 @@ namespace AbpDesk.EntityFrameworkCore { /* This class is needed for EF Core command line tooling */ - public class IdentityDefaultDbContextFactory : IDbContextFactory + public class IdentityDefaultDbContextFactory : IDesignTimeDbContextFactory { - public IdentityDbContext Create(DbContextFactoryOptions options) + public IdentityDbContext CreateDbContext(string[] args) { var builder = new DbContextOptionsBuilder(); builder.UseSqlServer("Server=localhost;Database=AbpDesk;Trusted_Connection=True;"); diff --git a/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj b/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj index bde698ddf2..fbb3a1dce0 100644 --- a/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj +++ b/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Identity.HttpApi.Client Volo.Abp.Identity.HttpApi.Client - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj b/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj index 489d60a303..52ede67dfe 100644 --- a/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj +++ b/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj @@ -1,13 +1,12 @@  - netcoreapp1.1 + netcoreapp2.0 true Volo.Abp.Identity.HttpApi.Host Exe Volo.Abp.Identity.HttpApi.Host - 1.1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -23,14 +22,14 @@ - - - - - - - - + + + + + + + + All @@ -38,7 +37,7 @@ - + diff --git a/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj b/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj index 0618365e64..1c474ad3a1 100644 --- a/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj +++ b/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Identity.HttpApi Volo.Abp.Identity.HttpApi - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj index ba413d98b6..be187435cd 100644 --- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj +++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Identity.Web Volo.Abp.Identity.Web - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/src/Volo.Abp.Identity/Volo.Abp.Identity.csproj b/src/Volo.Abp.Identity/Volo.Abp.Identity.csproj index b7e88d9346..10dc563688 100644 --- a/src/Volo.Abp.Identity/Volo.Abp.Identity.csproj +++ b/src/Volo.Abp.Identity/Volo.Abp.Identity.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.Identity Volo.Abp.Identity - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,7 +16,7 @@ - + diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs index 11e19c6795..5718c95c2e 100644 --- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs +++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Volo.Abp.Domain.Services; @@ -13,15 +12,13 @@ namespace Volo.Abp.Identity IEnumerable> roleValidators, ILookupNormalizer keyNormalizer, IdentityErrorDescriber errors, - ILogger logger, - IHttpContextAccessor contextAccessor) + ILogger logger) : base( store, roleValidators, keyNormalizer, errors, - logger, - contextAccessor) + logger) { } } diff --git a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj index 169bf84e3a..c7dc55df46 100644 --- a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj +++ b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.MongoDB Volo.Abp.MongoDB - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj b/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj index ea77e1fe4e..5257454f9b 100644 --- a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj +++ b/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.MultiTenancy Volo.Abp.MultiTenancy - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj b/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj index f3b7354073..170f3bd949 100644 --- a/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj +++ b/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.TestBase Volo.Abp.TestBase - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/Volo.Abp/Volo.Abp.csproj b/src/Volo.Abp/Volo.Abp.csproj index 6dfeb0cc88..68b4e781b4 100644 --- a/src/Volo.Abp/Volo.Abp.csproj +++ b/src/Volo.Abp/Volo.Abp.csproj @@ -1,11 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp Volo.Abp - 1.6.1 - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -13,11 +12,11 @@ - - - - - + + + + +