Merge pull request #18254 from abpframework/auto-merge/rel-8-0/2292

Merge branch dev with rel-8.0

common.props

@@ -29,8 +29,8 @@
 		<Pack>true</Pack>
 		<PackagePath>content\</PackagePath>
 	</Content>
-    <None Remove="*.abppkg.json" />
-    <Content Include="*.abppkg.json">
+    <None Remove="*.abppkg" />
+    <Content Include="*.abppkg">
 		<Pack>true</Pack>
 		<PackagePath>content\</PackagePath>
     </Content>

framework/Volo.Abp.abpsln

@@ -2,7 +2,7 @@
   "template": "empty",
   "modules": {
     "Volo.Abp": {
-      "path": "Volo.Abp.abpmdl.json"
+      "path": "Volo.Abp.abpmdl"
     }
   }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs

@@ -45,7 +45,7 @@ public class RemoveProjectFromSolutionStep : ProjectBuildPipelineStep
 
     private void RemoveProjectFromAbpmdlFile(ProjectBuildContext context)
     {
-        var abpmdlFile = context.FindFile(_solutionFilePath.RemovePostFix(".sln") + ".abpmdl.json");
+        var abpmdlFile = context.FindFile(_solutionFilePath.RemovePostFix(".sln") + ".abpmdl");
 
         if (abpmdlFile == null)
         {