Browse Source
Merge pull request #9697 from abpframework/auto-merge/rel-4-4/503
Merge branch dev with rel-4.4
pull/9703/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
12 additions and
2 deletions
-
common.props
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
|
|
|
@ -19,4 +19,13 @@ |
|
|
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> |
|
|
|
</PackageReference> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<Content Remove="*.abppkg.json"/> |
|
|
|
<None Include="*.abppkg.json"> |
|
|
|
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> |
|
|
|
<CopyToPublishDirectory>Never</CopyToPublishDirectory> |
|
|
|
</None> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -576,11 +576,12 @@ namespace Volo.Abp.Cli.ProjectModification |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
var dbMigrationsProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrations.csproj")); |
|
|
|
var dbMigrationsProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrations.csproj")) |
|
|
|
?? projectFiles.FirstOrDefault(p => p.EndsWith(".EntityFrameworkCore.csproj")) ; |
|
|
|
|
|
|
|
if (dbMigrationsProject == null) |
|
|
|
{ |
|
|
|
Logger.LogDebug("Solution doesn't have a \".DbMigrations\" project."); |
|
|
|
Logger.LogDebug("Solution doesn't have a Migrations project."); |
|
|
|
|
|
|
|
if (!skipDbMigrations) |
|
|
|
{ |
|
|
|
|
