From e8fde2d472d9bb609a6757748d908dbd7bbebae1 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 28 Jul 2021 12:20:38 +0300
Subject: [PATCH 1/2] Remove abppkg.json files on build

resolves https://github.com/abpframework/abp/issues/9585
---
 common.props | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common.props b/common.props
index d7d4fd2a05..fef0ae48da 100644
--- a/common.props
+++ b/common.props
@@ -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>

From bbb003ffca9cbc3bd482ffc25784f24c3f000b93 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 29 Jul 2021 09:30:33 +0300
Subject: [PATCH 2/2] CLI: fix add-module command

---
 .../Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
index 273f011f41..62d490d64d 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
@@ -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)
                 {