Several other refactorings

Author: edvilme

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

@@ -61,6 +61,7 @@ public override int Execute()
             return Directory.Exists(fullPath) ? MsbuildProject.GetProjectFileFromDirectory(fullPath).FullName : fullPath;
         });
 
+        // Add projects to the solution
         AddProjectsToSolutionAsync(fullProjectPaths, CancellationToken.None).GetAwaiter().GetResult();
         return 0;
     }
@@ -120,7 +121,6 @@ private async Task AddProjectsToSolutionAsync(IEnumerable<string> projectPaths,
             SlnFileFactory.DefaultBuildTypes.ToList().ForEach(solution.AddBuildType);
         }
 
-
         foreach (var projectPath in projectPaths)
         {
             // TODO: Remove this when we have a better way to handle this
@@ -150,12 +150,12 @@ private void AddProject(SolutionModel solution, string fullProjectPath, Solution
         }
 
         ProjectInstance projectInstance = new ProjectInstance(projectRootElement);
-        SolutionProjectModel project;
 
-        // Handle guid
         string projectTypeGuid = solution.ProjectTypes.FirstOrDefault(t => t.Extension == Path.GetExtension(fullProjectPath))?.ProjectTypeId.ToString()
             ?? projectRootElement.GetProjectTypeGuid() ?? projectInstance.GetDefaultProjectTypeGuid();
 
+        SolutionProjectModel project;
+
         try
         {
             project = solution.AddProject(solutionRelativeProjectPath, projectTypeGuid, solutionFolder);
@@ -196,17 +196,7 @@ private void AddProject(SolutionModel solution, string fullProjectPath, Solution
             project.AddProjectConfigurationRule(new ConfigurationRule(BuildDimension.BuildType, solutionBuildType, "*", projectBuildType));
         }
 
-        // Get referencedprojects from the project instance
-        //var referencedProjectsFullPaths = projectInstance.EvaluatedItemElements
-        //    .Where(item => item.ItemType == "ProjectReference")
-        //    .Select(item => item.Include)
-        //    .Select(item => Path.GetFullPath(item, Path.GetDirectoryName(fullProjectPath)))
-        //    .ToList();
-
-        //foreach (var referencedProjectFullPath in referencedProjectsFullPaths)
-        //{
-        //    var referencedProjectRelativePath = Path.GetRelativePath(_solutionFileFullPath, referencedProjectFullPath);
-        //}
+
 
         Reporter.Output.WriteLine(CliStrings.ProjectAddedToTheSolution, solutionRelativeProjectPath);
     }

src/Cli/dotnet/SlnFileFactory.cs

@@ -69,13 +69,10 @@ public static SolutionModel CreateFromFileOrDirectory(string fileOrDirectory, bo
         }
         try
         {
-            ISolutionSerializer serializer = SolutionSerializers.GetSerializerByMoniker(solutionPath) ?? throw new GracefulException(
-                CliStrings.CouldNotFindSolutionOrDirectory,
-                solutionPath);
-
+            ISolutionSerializer serializer = SolutionSerializers.GetSerializerByMoniker(solutionPath)!;
             return serializer.OpenAsync(solutionPath, CancellationToken.None).Result;
         }
-        catch (SolutionException ex)
+        catch (Exception ex)
         {
             throw new GracefulException(
                 CliStrings.InvalidSolutionFormatString,