sln-add: --include-references when adding a project (#48815)

Author: edvilme

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -2483,4 +2483,7 @@ To display a value, specify the corresponding command-line option without provid
   <data name="ZeroTestsRan" xml:space="preserve">
     <value>Zero tests ran</value>
   </data>
-</root>
+  <data name="SolutionAddReferencedProjectsOptionDescription" xml:space="preserve">
+    <value>Recursively add projects' ReferencedProjects to solution</value>
+  </data>
+</root>

src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs

@@ -22,6 +22,7 @@ internal class SolutionAddCommand : CommandBase
     private readonly IReadOnlyCollection<string> _projects;
     private readonly string? _solutionFolderPath;
     private string _solutionFileFullPath = string.Empty;
+    private bool _includeReferences;
 
     private static string GetSolutionFolderPathWithForwardSlashes(string path)
     {
@@ -43,6 +44,7 @@ public SolutionAddCommand(ParseResult parseResult) : base(parseResult)
         _projects = (IReadOnlyCollection<string>)(parseResult.GetValue(SolutionAddCommandParser.ProjectPathArgument) ?? []);
         _inRoot = parseResult.GetValue(SolutionAddCommandParser.InRootOption);
         _solutionFolderPath = parseResult.GetValue(SolutionAddCommandParser.SolutionFolderOption);
+        _includeReferences = parseResult.GetValue(SolutionAddCommandParser.IncludeReferencesOption);
         SolutionArgumentValidator.ParseAndValidateArguments(_fileOrDirectory, _projects, SolutionArgumentValidator.CommandType.Add, _inRoot, _solutionFolderPath);
         _solutionFileFullPath = SlnFileFactory.GetSolutionFileFullPath(_fileOrDirectory);
     }
@@ -138,7 +140,7 @@ private async Task AddProjectsToSolutionAsync(IEnumerable<string> projectPaths,
         await serializer.SaveAsync(_solutionFileFullPath, solution, cancellationToken);
     }
 
-    private void AddProject(SolutionModel solution, string fullProjectPath, ISolutionSerializer serializer = null)
+    private void AddProject(SolutionModel solution, string fullProjectPath, ISolutionSerializer serializer = null, bool showMessageOnDuplicate = true)
     {
         string solutionRelativeProjectPath = Path.GetRelativePath(Path.GetDirectoryName(_solutionFileFullPath), fullProjectPath);
 
@@ -175,7 +177,10 @@ private void AddProject(SolutionModel solution, string fullProjectPath, ISolutio
         }
         catch (SolutionArgumentException ex) when (ex.Type == SolutionErrorType.DuplicateProjectName || solution.FindProject(solutionRelativeProjectPath) is not null)
         {
-            Reporter.Output.WriteLine(CliStrings.SolutionAlreadyContainsProject, _solutionFileFullPath, solutionRelativeProjectPath);
+            if (showMessageOnDuplicate)
+            {
+                Reporter.Output.WriteLine(CliStrings.SolutionAlreadyContainsProject, _solutionFileFullPath, solutionRelativeProjectPath);
+            }
             return;
         }
 
@@ -205,5 +210,17 @@ private void AddProject(SolutionModel solution, string fullProjectPath, ISolutio
         }
 
         Reporter.Output.WriteLine(CliStrings.ProjectAddedToTheSolution, solutionRelativeProjectPath);
+
+        // Get referencedprojects from the project instance
+        var referencedProjectsFullPaths = projectInstance.GetItems("ProjectReference")
+            .Select(item => Path.GetFullPath(item.EvaluatedInclude, Path.GetDirectoryName(fullProjectPath)));
+
+        if (_includeReferences)
+        {
+            foreach (var referencedProjectFullPath in referencedProjectsFullPaths)
+            {
+                AddProject(solution, referencedProjectFullPath, serializer, showMessageOnDuplicate: false);
+            }
+        }
     }
 }

src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommandParser.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.CommandLine;
+using System.CommandLine.Parsing;
 
 namespace Microsoft.DotNet.Cli.Commands.Solution.Add;
 
@@ -26,6 +27,12 @@ public static class SolutionAddCommandParser
         Description = CliCommandStrings.AddProjectSolutionFolderArgumentDescription
     };
 
+    public static readonly Option<bool> IncludeReferencesOption = new("--include-references")
+    {
+        Description = CliCommandStrings.SolutionAddReferencedProjectsOptionDescription,
+        DefaultValueFactory = (_) => true,
+    };
+
     private static readonly Command Command = ConstructCommand();
 
     public static Command GetCommand()
@@ -40,6 +47,7 @@ private static Command ConstructCommand()
         command.Arguments.Add(ProjectPathArgument);
         command.Options.Add(InRootOption);
         command.Options.Add(SolutionFolderOption);
+        command.Options.Add(IncludeReferencesOption);
 
         command.SetAction((parseResult) => new SolutionAddCommand(parseResult).Execute());