Add nuget packages to new csproj (#43)

Author: trurl123

Commands/RefAdd.cs

@@ -132,21 +132,18 @@ private void CheckBranch()
         private void AddModuleToCsproj(InstallData installData)
         {
             var projectPath = Path.GetFullPath(project);
+            var csproj = new ProjectFile(projectPath);
 
             try
             {
-                var currentModuleDirectory = Helper.GetModuleDirectory(Directory.GetCurrentDirectory());
-                var packagesDirectory = Path.Combine(currentModuleDirectory, "packages");
-                new NuGetPackageHepler(Log).InstallPackages(installData.NuGetPackages, packagesDirectory, projectPath);
+                csproj.InstallNuGetPackages(installData.NuGetPackages);
             }
             catch (Exception e)
             {
                 ConsoleWriter.WriteWarning($"Installation of NuGet packages failed: {e.InnerException?.Message ?? e.Message}");
                 Log.Error("Installation of NuGet packages failed:", e);
             }
 
-            var csproj = new ProjectFile(projectPath);
-
             foreach (var buildItem in installData.BuildFiles)
             {
                 var refName = Path.GetFileNameWithoutExtension(buildItem);

Common/NuGetPackageHepler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -32,28 +32,28 @@ public NuGetPackageHepler(ILog log)
         private class NuGetProject
         {
             private readonly List<string> packagesList;
+            private readonly ProjectFile projectFile;
             private readonly Console logger;
             private readonly MSBuildNuGetProject project;
             private readonly ConsoleProjectContext projectContext;
             private readonly MSBuildProjectSystem projectSystem;
             private readonly List<SourceRepository> repositories;
             private readonly HashSet<PackageIdentity> installedPackages;
-            private readonly string originalLineEndings;
             private readonly ILog log;
 
-            public NuGetProject(List<string> packagesList, string packagesPath, string projectFilePath, ILog log)
+            public NuGetProject(List<string> packagesList, string packagesPath, ProjectFile projectFile, ILog log)
             {
                 this.log = log;
                 this.packagesList = packagesList;
+                this.projectFile = projectFile;
                 installedPackages = new HashSet<PackageIdentity>();
                 var sourceProvider = new PackageSourceProvider(Settings.LoadDefaultSettings(null));
                 var sourceRepositoryProvider = new CommandLineSourceRepositoryProvider(sourceProvider);
                 repositories = sourceProvider.LoadPackageSources().Select(sourceRepositoryProvider.CreateRepository)
                     .ToList();
                 logger = new Console();
 
-                var projectFileContent = File.ReadAllText(projectFilePath);
-                originalLineEndings = projectFileContent.Contains("\r\n") ? "\r\n" : "\n";
+                var projectFilePath = projectFile.FilePath;
 
                 var msbuildDirectory =
                     Path.GetDirectoryName(ModuleBuilderHelper.FindMsBuild(null, "Cement NuGet Package Installer"));
@@ -85,7 +85,7 @@ public void Install()
                 contentLines[0] = contentLines[0].Replace("utf-16", "utf-8");
                 File.WriteAllText(
                     projectSystem.ProjectFileFullPath,
-                    string.Join(originalLineEndings, contentLines),
+                    string.Join(projectFile.LineEndings, contentLines),
                     new UTF8Encoding(true));
             }
 
@@ -154,7 +154,7 @@ private static PackageIdentity ParsePackage(string packageName)
             }
         }
 
-        public void InstallPackages(List<string> packagesList, string packagesPath, string projectFilePath)
+        public void InstallPackages(List<string> packagesList, string packagesPath, ProjectFile projectFilePath)
         {
             new NuGetProject(packagesList, packagesPath, projectFilePath, log).Install();
         }

Common/ProjectFile.cs

@@ -9,19 +9,19 @@ namespace Common
 {
     public class ProjectFile
     {
-        private readonly string lineEndings;
+        public readonly string LineEndings;
 
         public readonly string FilePath;
         public readonly XmlDocument Document;
-        private bool newFormat;
+        private readonly bool newFormat;
         private ILog log;
 
         public ProjectFile(string csprojFilePath)
         {
             var fileContent = File.ReadAllText(csprojFilePath);
             log = LogManager.GetLogger(typeof(ProjectFile));
 
-            lineEndings = fileContent.Contains("\r\n") ? "\r\n" : "\n";
+            LineEndings = fileContent.Contains("\r\n") ? "\r\n" : "\n";
             FilePath = csprojFilePath;
             Document = XmlDocumentHelper.Create(fileContent);
             newFormat = !string.IsNullOrEmpty(Document.DocumentElement?.GetAttribute("Sdk"));
@@ -100,6 +100,13 @@ public XmlNode CreateReference(string refName, string refPath)
 
             return elementToInsert;
         }
+        public XmlNode CreateNuGetReference(string refName, string version)
+        {
+            var elementToInsert = Document.CreateElement("PackageReference", Document.DocumentElement.NamespaceURI);
+            elementToInsert.SetAttribute("Include", refName);
+            elementToInsert.SetAttribute("Version", version);
+            return elementToInsert;
+        }
 
         public void AddRef(string refName, string refPath)
         {
@@ -200,7 +207,7 @@ public XmlDocument CreateCsProjWithNugetReferences(List<Dep> deps, string module
 
         public void Save()
         {
-            XmlDocumentHelper.Save(Document, FilePath, lineEndings);
+            XmlDocumentHelper.Save(Document, FilePath, LineEndings);
         }
 
         private XmlNode CreateAnalyzerGroup()
@@ -221,6 +228,12 @@ private bool IsReferenceGroup(XmlNode xmlNode)
                 .Cast<XmlNode>()
                 .Any(childNode => childNode.Name == "Reference");
         }
+        private bool IsPackageReferenceGroup(XmlNode xmlNode)
+        {
+            return xmlNode.ChildNodes
+                .Cast<XmlNode>()
+                .Any(childNode => childNode.Name == "PackageReference");
+        }
 
         private XmlNode CreateItemGroup()
         {
@@ -239,5 +252,55 @@ private XmlNode CreateItemGroup()
 
             return itemGroup;
         }
+
+        public void InstallNuGetPackages(List<string> nuGetPackages)
+        {
+            if (newFormat)
+            {
+                foreach (var package in nuGetPackages)
+                {
+                    var splitted = package.Split('/');
+                    if (splitted.Length != 2)
+                    {
+                        log.Error("package version is not defined: " + package);
+                    }
+                    else
+                    {
+                        InstallNuGetPackage(splitted[0], splitted[1]);
+                    }
+                }
+            }
+            else
+            {
+                var currentModuleDirectory = Helper.GetModuleDirectory(Directory.GetCurrentDirectory());
+                var packagesDirectory = Path.Combine(currentModuleDirectory, "packages");
+                new NuGetPackageHepler(log).InstallPackages(nuGetPackages, packagesDirectory, this);
+            }
+        }
+
+        private void InstallNuGetPackage(string packageName, string packageVersion)
+        {
+            try
+            {
+                var referenceGroup = Document
+                                         .GetElementsByTagName("ItemGroup")
+                                         .Cast<XmlNode>()
+                                         .FirstOrDefault(IsPackageReferenceGroup) ?? CreateItemGroup();
+                var packageNode = Document.SelectNodes("*/ItemGroup/PackageReference")?.Cast<XmlElement>()
+                    .FirstOrDefault(el => el.Attributes["Include", Document.DocumentElement.NamespaceURI].Value.Equals(packageName, StringComparison.InvariantCultureIgnoreCase));
+                if (packageNode == null)
+                    referenceGroup?.AppendChild(CreateNuGetReference(packageName, packageVersion));
+                else
+                {
+                    packageNode.ParentNode?.RemoveChild(packageNode);
+                    packageNode.SetAttribute("Version", packageVersion);
+                    referenceGroup?.AppendChild(packageNode);
+                }
+            }
+            catch (Exception e)
+            {
+                throw new Exception($"Failed to add ref {packageName} to {FilePath}", e);
+            }
+        }
     }
 }