diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj index bba1b71c39..b7e7872cf4 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.Application.Contracts AbpDesk.Application.Contracts - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj b/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj index 78b767ebea..7575fb273a 100644 --- a/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj +++ b/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.Application AbpDesk.Application - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj index 58b70fee2d..76358439dd 100644 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj @@ -1,12 +1,11 @@  - netcoreapp1.1 + netcoreapp2.0 AbpDesk.ConsoleDemo Exe AbpDesk.ConsoleDemo - 1.1.1 - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -30,14 +29,14 @@ - + All - + - + diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj index b87c4742e0..3ee436880c 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.Domain AbpDesk.Domain - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,7 +16,7 @@ - + diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj index fa8ec7f243..857a6a409c 100644 --- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj +++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.EntityFrameworkCore AbpDesk.EntityFrameworkCore - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -17,14 +17,14 @@ - - + + All - + diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs index 128d106209..396e17a3d7 100644 --- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs +++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs @@ -1,13 +1,13 @@ using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Design; namespace AbpDesk.EntityFrameworkCore { /* This class is needed for EF Core command line tooling */ - public class AbpDeskDefaultDbContextFactory : IDbContextFactory + public class AbpDeskDefaultDbContextFactory : IDesignTimeDbContextFactory { - public AbpDeskDbContext Create(DbContextFactoryOptions options) + public AbpDeskDbContext CreateDbContext(string[] args) { var builder = new DbContextOptionsBuilder(); builder.UseSqlServer("Server=localhost;Database=AbpDesk;Trusted_Connection=True;"); diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj index 61cc374046..499829b3e9 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj +++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.MongoBlog AbpDesk.MongoBlog - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj index 36ffe0c652..ef27b1183d 100644 --- a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj +++ b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.SamplePlugInModule AbpDesk.SamplePlugInModule - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj index d4f2dcdc00..bd117d6e1e 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj @@ -1,13 +1,12 @@  - netcoreapp1.1 + netcoreapp2.0 true AbpDesk.Web.Mvc Exe AbpDesk.Web.Mvc - 1.1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; AbpDesk.Web.Mvc @@ -31,23 +30,23 @@ - - - - - - - - - + + + + + + + + + All - + - + diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 78b2ec69cd..8eeb6eab29 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.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj index 80e83b7420..b43df8a416 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.Mvc.UI.Bootstrap Volo.Abp.AspNetCore.Mvc.UI.Bootstrap - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj index 51eb9a82b7..d23daf5e80 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.Mvc.UI Volo.Abp.AspNetCore.Mvc.UI - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; Volo.Abp.AspNetCore.Mvc 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 52ede67dfe..cb52e807b0 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 @@ -32,7 +32,7 @@ All - +