diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj index 4892b37..6ccea5d 100644 --- a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj +++ b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj @@ -2,8 +2,8 @@ 1.0.0.0 - net461;netcoreapp1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + net461;netcoreapp2.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; AbpCompanyName.AbpProjectName.Application AbpCompanyName.AbpProjectName.Application false @@ -17,8 +17,8 @@ - - + + diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj index f12be4f..b9db452 100644 --- a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj +++ b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj @@ -2,8 +2,8 @@ 1.0.0.0 - net461;netcoreapp1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + net461;netcoreapp2.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; AbpCompanyName.AbpProjectName.Core AbpCompanyName.AbpProjectName.Core false @@ -17,9 +17,9 @@ - - - + + + diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj index 89584da..9dc14a4 100644 --- a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj +++ b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj @@ -2,8 +2,8 @@ 1.0.0.0 - net461;netcoreapp1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + net461;netcoreapp2.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; AbpCompanyName.AbpProjectName.EntityFrameworkCore Library AbpCompanyName.AbpProjectName.EntityFrameworkCore @@ -21,10 +21,10 @@ - - - - + + + + All @@ -35,7 +35,7 @@ - + diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs index 350935f..cd35517 100644 --- a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs +++ b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs @@ -1,23 +1,23 @@ using AbpCompanyName.AbpProjectName.Configuration; using AbpCompanyName.AbpProjectName.Web; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Design; using Microsoft.Extensions.Configuration; namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore { /* This class is needed to run EF Core PMC commands. Not used anywhere else */ - public class AbpProjectNameDbContextFactory : IDbContextFactory + public class AbpProjectNameDbContextFactory : IDesignTimeDbContextFactory { - public AbpProjectNameDbContext Create(DbContextFactoryOptions options) + public AbpProjectNameDbContext CreateDbContext(string[] args) { var builder = new DbContextOptionsBuilder(); var configuration = AppConfigurations.Get(WebContentDirectoryFinder.CalculateContentRootFolder()); DbContextOptionsConfigurer.Configure( - builder, + builder, configuration.GetConnectionString(AbpProjectNameConsts.ConnectionStringName) - ); + ); return new AbpProjectNameDbContext(builder.Options); } diff --git a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj index c9a6bb0..bd90a5e 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj +++ b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj @@ -2,8 +2,8 @@ 1.0.0.0 - net461;netcoreapp1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + net461;netcoreapp2.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true AbpCompanyName.AbpProjectName.Web Exe @@ -30,24 +30,27 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + All - - + + + @@ -56,7 +59,7 @@ - + diff --git a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj index b04d6aa..b4b70ed 100644 --- a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj +++ b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj @@ -2,8 +2,8 @@ 1.0.0.0 - net461;netcoreapp1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + net461;netcoreapp2.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; AbpCompanyName.AbpProjectName.Tests AbpCompanyName.AbpProjectName.Tests true @@ -20,16 +20,17 @@ - + - - + + - - + + + diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj index f0dd8ed..192913c 100644 --- a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj +++ b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj @@ -2,7 +2,7 @@ 1.0.0.0 - net461;netcoreapp1.1 + net461;netcoreapp2.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 true AbpCompanyName.AbpProjectName.Web.Tests @@ -21,12 +21,13 @@ - + - - + + +