add-module improvements

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs

@@ -16,10 +16,12 @@ namespace Volo.Abp.Cli.Commands
         public ILogger<AddModuleCommand> Logger { get; set; }
 
         protected SolutionModuleAdder SolutionModuleAdder { get; }
+        public SolutionAbpVersionFinder SolutionAbpVersionFinder { get; }
 
-        public AddModuleCommand(SolutionModuleAdder solutionModuleAdder)
+        public AddModuleCommand(SolutionModuleAdder solutionModuleAdder, SolutionAbpVersionFinder solutionAbpVersionFinder)
         {
             SolutionModuleAdder = solutionModuleAdder;
+            SolutionAbpVersionFinder = solutionAbpVersionFinder;
             Logger = NullLogger<AddModuleCommand>.Instance;
         }
 
@@ -34,18 +36,26 @@ namespace Volo.Abp.Cli.Commands
                 );
             }
 
+            var withSourceCode = commandLineArgs.Options.ContainsKey("with-source-code");
+
             var skipDbMigrations = Convert.ToBoolean(
                 commandLineArgs.Options.GetOrNull(Options.DbMigrations.Skip) ?? "false");
 
+            var solutionFile = GetSolutionFile(commandLineArgs);
+
             var version = commandLineArgs.Options.GetOrNull(Options.Version.Short, Options.Version.Long);
+            if (version == null)
+            {
+                version = SolutionAbpVersionFinder.Find(solutionFile);
+            }
 
             await SolutionModuleAdder.AddAsync(
-                GetSolutionFile(commandLineArgs),
+                solutionFile,
                 commandLineArgs.Target,
                 commandLineArgs.Options.GetOrNull(Options.StartupProject.Short, Options.StartupProject.Long),
                 version,
                 skipDbMigrations,
-                commandLineArgs.Options.ContainsKey("with-source-code")
+                withSourceCode
             );
         }
 

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

@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
 using Volo.Abp.Cli.ProjectBuilding.Files;
+using Volo.Abp.Cli.Utils;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
@@ -92,7 +93,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 
                 var doc = new XmlDocument() { PreserveWhitespace = true };
 
-                doc.Load(GenerateStreamFromString(content));
+                doc.Load(StreamHelper.GenerateStreamFromString(content));
 
                 return ProcessReferenceNodes(doc, content);
             }
@@ -125,16 +126,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 
             protected abstract XmlElement GetNewReferenceNode(XmlDocument doc, string oldNodeIncludeValue);
 
-            private static Stream GenerateStreamFromString(string s)
-            {
-                var stream = new MemoryStream();
-                var writer = new StreamWriter(stream);
-                writer.Write(s);
-                writer.Flush();
-                stream.Position = 0;
-                return stream;
-            }
-
 
             public class NugetReferenceReplacer : ProjectReferenceReplacer
             {

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

@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
 using Volo.Abp.Cli.ProjectBuilding.Files;
+using Volo.Abp.Cli.Utils;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
@@ -41,7 +42,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 
                 var doc = new XmlDocument() { PreserveWhitespace = true };
 
-                doc.Load(GenerateStreamFromString(content));
+                doc.Load(StreamHelper.GenerateStreamFromString(content));
 
                 return ProcessReferenceNodes(doc, content);
             }
@@ -81,16 +82,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 
                 return doc.OuterXml;
             }
-
-            private static Stream GenerateStreamFromString(string s)
-            {
-                var stream = new MemoryStream();
-                var writer = new StreamWriter(stream);
-                writer.Write(s);
-                writer.Flush();
-                stream.Position = 0;
-                return stream;
-            }
         }
     }
 }

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

@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
 using Volo.Abp.Cli.ProjectBuilding.Files;
+using Volo.Abp.Cli.Utils;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
@@ -41,7 +42,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 
                 var doc = new XmlDocument() { PreserveWhitespace = true };
 
-                doc.Load(GenerateStreamFromString(content));
+                doc.Load(StreamHelper.GenerateStreamFromString(content));
 
                 return ProcessReferenceNodes(doc, content);
             }
@@ -69,16 +70,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 
                 return doc.OuterXml;
             }
-
-            private static Stream GenerateStreamFromString(string s)
-            {
-                var stream = new MemoryStream();
-                var writer = new StreamWriter(stream);
-                writer.Write(s);
-                writer.Flush();
-                stream.Position = 0;
-                return stream;
-            }
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs

@@ -18,7 +18,7 @@ namespace Volo.Abp.Cli.ProjectModification
             Logger = NullLogger<DbContextFileBuilderConfigureAdder>.Instance;
         }
 
-        public void Add(string path, string moduleConfiguration)
+        public bool Add(string path, string moduleConfiguration)
         {
             var file = File.ReadAllText(path);
 
@@ -32,13 +32,18 @@ namespace Volo.Abp.Cli.ProjectModification
                 if (indexToInsert <= 0 || indexToInsert >= file.Length)
                 {
                     Logger.LogWarning($"\"OnModelCreating(ModelBuilder builder)\" method couldn't be found in {path}");
-                    return;
+                    return false;
                 }
                 file = file.Insert(indexToInsert, "    " + stringToAdd + Environment.NewLine + "        ");
             }
+            else
+            {
+                return false;
+            }
 
 
             File.WriteAllText(path, file);
+            return true;
         }
 
         protected int FindIndexToInsert(string file)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs

@@ -53,7 +53,6 @@ namespace Volo.Abp.Cli.ProjectModification
 
         protected bool IsDerived(string csFile, string baseClass)
         {
-            Logger.LogDebug(csFile);
             var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot();
             var namespaceSyntax = root.DescendantNodes().OfType<NamespaceDeclarationSyntax>().First();
             var classDeclaration = (namespaceSyntax.DescendantNodes().OfType<ClassDeclarationSyntax>()).First();

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
+using Volo.Abp.Cli.Utils;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Cli.ProjectModification
@@ -15,9 +16,9 @@ namespace Volo.Abp.Cli.ProjectModification
         {
             var nugetPackageList = GetNugetPackages(module);
 
-            var projectFilesUnderModules = GetProjectFilesUnder(Path.Combine(Path.GetDirectoryName(solutionFile), "modules")); ;
-            var projectFilesUnderSrc = GetProjectFilesUnder(Path.Combine(Path.GetDirectoryName(solutionFile), "src")); ;
-            var projectFilesUnderTest = GetProjectFilesUnder(Path.Combine(Path.GetDirectoryName(solutionFile), "test")); ;
+            var projectFilesUnderModules = GetProjectFilesUnder(Path.Combine(Path.GetDirectoryName(solutionFile), "modules"));
+            var projectFilesUnderSrc = GetProjectFilesUnder(Path.Combine(Path.GetDirectoryName(solutionFile), "src"));
+            var projectFilesUnderTest = GetProjectFilesUnder(Path.Combine(Path.GetDirectoryName(solutionFile), "test"));
 
             foreach (var projectFile in projectFilesUnderModules)
             {
@@ -38,7 +39,7 @@ namespace Volo.Abp.Cli.ProjectModification
             var content = File.ReadAllText(projectFile);
             var doc = new XmlDocument() { PreserveWhitespace = true };
 
-            doc.Load(GenerateStreamFromString(content));
+            doc.Load(StreamHelper.GenerateStreamFromString(content));
 
             var convertedProject =  ProcessReferenceNodes(doc, nugetPackageList, localPathPrefix, sourceFile);
 
@@ -116,16 +117,6 @@ namespace Volo.Abp.Cli.ProjectModification
                 SearchOption.AllDirectories);
         }
 
-        private static Stream GenerateStreamFromString(string s)
-        {
-            var stream = new MemoryStream();
-            var writer = new StreamWriter(stream);
-            writer.Write(s);
-            writer.Flush();
-            stream.Position = 0;
-            return stream;
-        }
-
         public class NugetPackageInfoWithModuleName
         {
             public NugetPackageInfo NugetPackage { get; set; }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs

@@ -20,7 +20,7 @@ namespace Volo.Abp.Cli.ProjectModification
         public Task AddAsync(string directory, NpmPackageInfo npmPackage)
         {
             var packageJsonFilePath = Path.Combine(directory, "package.json");
-            if (!File.Exists(packageJsonFilePath))
+            if (!File.Exists(packageJsonFilePath) || File.ReadAllText(packageJsonFilePath).Contains($"\"{npmPackage.Name}\""))
             {
                 return Task.CompletedTask;
             }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs

@@ -50,6 +50,11 @@ namespace Volo.Abp.Cli.ProjectModification
 
         public Task AddAsync(string projectFile, NugetPackageInfo package)
         {
+            if (File.ReadAllText(projectFile).Contains($"\"{package.Name}\""))
+            {
+                return Task.CompletedTask;
+            }
+
             using (DirectoryHelper.ChangeCurrentDirectory(Path.GetDirectoryName(projectFile)))
             {
                 Logger.LogInformation($"Installing '{package.Name}' package to the project '{Path.GetFileNameWithoutExtension(projectFile)}'...");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionAbpVersionFinder.cs

@@ -0,0 +1,36 @@
+using System.IO;
+using System.Xml;
+using Volo.Abp.Cli.Utils;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.ProjectModification
+{
+    public class SolutionAbpVersionFinder : ITransientDependency
+    {
+        public string Find(string solutionFile)
+        {
+            var projectFilesUnderSrc = Directory.GetFiles(Path.GetDirectoryName(solutionFile),
+                "*.csproj",
+                SearchOption.AllDirectories);
+
+            foreach (var projectFile in projectFilesUnderSrc)
+            {
+                var content = File.ReadAllText(projectFile);
+                var doc = new XmlDocument() { PreserveWhitespace = true };
+
+                doc.Load(StreamHelper.GenerateStreamFromString(content));
+
+                var nodes = doc.SelectNodes("/Project/ItemGroup/PackageReference[starts-with(@Include, 'Volo.Abp')]");
+
+                var value = nodes?[0]?.Attributes?["Version"]?.Value;
+
+                if (value != null)
+                {
+                    return value;
+                }
+            }
+
+            return null;
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -75,7 +75,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
             var projectFiles = ProjectFinder.GetProjectFiles(solutionFile);
 
-            //await AddNugetAndNpmReferences(module, projectFiles);
+            await AddNugetAndNpmReferences(module, projectFiles);
 
             if (withSourceCode)
             {
@@ -85,7 +85,7 @@ namespace Volo.Abp.Cli.ProjectModification
                 await NugetPackageToLocalReferenceConverter.Convert(module, solutionFile);
             }
 
-            //ModifyDbContext(projectFiles, module, startupProject, skipDbMigrations);
+            ModifyDbContext(projectFiles, module, startupProject, skipDbMigrations);
         }
 
         private async Task DownloadSourceCodesToSolutionFolder(ModuleWithMastersInfo module, string modulesFolderInSolution, string version = null)
@@ -174,9 +174,9 @@ namespace Volo.Abp.Cli.ProjectModification
                 return;
             }
 
-            DbContextFileBuilderConfigureAdder.Add(dbContextFile, module.EfCoreConfigureMethodName);
+            var addedNewBuilder = DbContextFileBuilderConfigureAdder.Add(dbContextFile, module.EfCoreConfigureMethodName);
 
-            if (!skipDbMigrations)
+            if (addedNewBuilder && !skipDbMigrations)
             {
                 EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name, startupProject); 
             }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/StreamHelper.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Volo.Abp.Cli.Utils
+{
+    public static class StreamHelper
+    {
+        public static Stream GenerateStreamFromString(string s)
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            writer.Write(s);
+            writer.Flush();
+            stream.Position = 0;
+            return stream;
+        }
+    }
+}