Restore sln-add Program.cs

Author: edvilme

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

@@ -1,22 +1,24 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.CommandLine;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Exceptions;
 using Microsoft.Build.Execution;
+using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Tools.Common;
 using Microsoft.VisualStudio.SolutionPersistence;
 using Microsoft.VisualStudio.SolutionPersistence.Model;
 using Microsoft.VisualStudio.SolutionPersistence.Serializer.SlnV12;
 
 namespace Microsoft.DotNet.Cli.Commands.Solution.Add;
-
 internal class AddProjectToSolutionCommand : CommandBase
 {
-    private static readonly string[] _defaultPlatforms = ["Any CPU", "x64", "x86"];
-    private static readonly string[] _defaultBuildTypes = ["Debug", "Release"];
+    private static string[] _defaultPlatforms = new[] { "Any CPU", "x64", "x86" };
+    private static string[] _defaultBuildTypes = new[] { "Debug", "Release" };
     private readonly string _fileOrDirectory;
     private readonly bool _inRoot;
     private readonly IReadOnlyCollection<string> _projects;
@@ -91,7 +93,7 @@ private async Task AddProjectsToSolutionAsync(string solutionFileFullPath, IEnum
             }
         }
 
-        SolutionFolderModel? solutionFolder = !_inRoot && !string.IsNullOrEmpty(_solutionFolderPath)
+        SolutionFolderModel? solutionFolder = (!_inRoot && !string.IsNullOrEmpty(_solutionFolderPath))
             ? solution.AddFolder(GetSolutionFolderPathWithForwardSlashes(_solutionFolderPath))
             : null;
 
@@ -106,7 +108,7 @@ private async Task AddProjectsToSolutionAsync(string solutionFileFullPath, IEnum
             {
                 if (relativeSolutionFolder.Split(Path.DirectorySeparatorChar).LastOrDefault() == Path.GetFileNameWithoutExtension(relativePath))
                 {
-                    relativeSolutionFolder = Path.Combine([.. relativeSolutionFolder.Split(Path.DirectorySeparatorChar).SkipLast(1)]);
+                    relativeSolutionFolder = Path.Combine(relativeSolutionFolder.Split(Path.DirectorySeparatorChar).SkipLast(1).ToArray());
                 }
                 if (!string.IsNullOrEmpty(relativeSolutionFolder))
                 {
@@ -130,19 +132,20 @@ private async Task AddProjectsToSolutionAsync(string solutionFileFullPath, IEnum
         await serializer.SaveAsync(solutionFileFullPath, solution, cancellationToken);
     }
 
-    private static void AddProject(SolutionModel solution, string solutionRelativeProjectPath, string fullPath, SolutionFolderModel? solutionFolder, ISolutionSerializer serializer = null)
+    private void AddProject(SolutionModel solution, string solutionRelativeProjectPath, string fullPath, SolutionFolderModel? solutionFolder, ISolutionSerializer serializer = null)
     {
         // Open project instance to see if it is a valid project
         ProjectRootElement projectRootElement = ProjectRootElement.Open(fullPath);
+        ProjectInstance projectInstance = new ProjectInstance(projectRootElement);
         SolutionProjectModel project;
         try
         {
             project = solution.AddProject(solutionRelativeProjectPath, null, solutionFolder);
         }
-        catch (SolutionArgumentException ex) when (ex.ParamName == "projectTypeName")
+        catch (SolutionArgumentException ex) when (ex.Type == SolutionErrorType.InvalidProjectTypeReference)
         {
             // If guid is not identified by vs-solutionpersistence, check in project element itself
-            var guid = projectRootElement.GetProjectTypeGuid();
+            var guid = projectRootElement.GetProjectTypeGuid() ?? projectInstance.GetDefaultProjectTypeGuid();
             if (string.IsNullOrEmpty(guid))
             {
                 Reporter.Error.WriteLine(CommonLocalizableStrings.UnsupportedProjectType, fullPath);
@@ -151,7 +154,6 @@ private static void AddProject(SolutionModel solution, string solutionRelativePr
             project = solution.AddProject(solutionRelativeProjectPath, guid, solutionFolder);
         }
         // Add settings based on existing project instance
-        ProjectInstance projectInstance = new ProjectInstance(projectRootElement);
         string projectInstanceId = projectInstance.GetProjectId();
         if (!string.IsNullOrEmpty(projectInstanceId) && serializer is ISolutionSerializer<SlnV12SerializerSettings>)
         {
@@ -176,4 +178,4 @@ private static void AddProject(SolutionModel solution, string solutionRelativePr
         }
         Reporter.Output.WriteLine(CommonLocalizableStrings.ProjectAddedToTheSolution, solutionRelativeProjectPath);
     }
-}
+}