Merge pull request #18 from MORYX-Industry/fix/project-references

Fix project references

Author: seveneleven

src/Moryx.Cli.Commands/AddStep.cs

@@ -26,14 +26,29 @@ public static CommandResult Exec(Template template, string step)
                     (createdFiles) =>
                     {
                         createdFiles.AddProjectsToSolution(template.Settings);
-                        AddProjectsTests(createdFiles, template.Settings);
+                        AddProjectsTests(createdFiles);
+                        AddProjectsStartupApplication(createdFiles, template.Settings);
                     },
                     namespacePlaceholder
                 );
             });
         }
 
-        private static void AddProjectsTests(IEnumerable<string> createdFiles, TemplateSettings settings)
+        private static void AddProjectsStartupApplication(IEnumerable<string> createdFiles, TemplateSettings settings)
+        {
+            var projectFiles = createdFiles
+               .Where(f => f.EndsWith(".csproj"))
+               .ToList();
+
+            var applicationProjectFile = Path.Combine(settings.TargetDirectory, "src", settings.AppName + ".App", settings.AppName + ".App.csproj");
+
+            foreach (var project in projectFiles)
+            {
+                ProjectFileManipulation.AddProjectReference(applicationProjectFile, project);
+            }
+        }
+
+        private static void AddProjectsTests(IEnumerable<string> createdFiles)
         {
             var projectFiles = createdFiles
                .Where(f => f.EndsWith(".csproj"))

src/Moryx.Cli.Commands/Components/ProjectFileManipulation.cs

@@ -1,7 +1,4 @@
-using Castle.MicroKernel.Registration;
-using Microsoft.AspNetCore.Routing.Constraints;
-using Moryx.Container;
-using System.Xml;
+using System.Xml;
 using System.Xml.Linq;
 
 namespace Moryx.Cli.Commands.Components
@@ -14,7 +11,8 @@ internal class ProjectFileManipulation
         public static void AddProjectReference(string targetProjectFileName, string referenceProjectFileName)
         {
 
-            var referencePath = Path.GetRelativePath(targetProjectFileName, referenceProjectFileName);
+            var referencePath = Path.GetRelativePath(Path.GetDirectoryName(targetProjectFileName), Path.GetDirectoryName(referenceProjectFileName));
+            referencePath = Path.Combine(referencePath, Path.GetFileName(referenceProjectFileName));
 
             var projectFile = LoadXml(targetProjectFileName);