[automated] Merge branch 'release/9.0.3xx' => 'main' (#48150)

Forgind · web-flow · commit e579a1066a65 · 2025-04-07T13:22:28.000-07:00
diff --git a/src/Cli/dotnet/Commands/Solution/Add/Program.cs b/src/Cli/dotnet/Commands/Solution/Add/Program.cs
@@ -134,6 +134,7 @@ private static void AddProject(SolutionModel solution, string solutionRelativePr
     {
         // Open project instance to see if it is a valid project
         ProjectRootElement projectRootElement = ProjectRootElement.Open(fullPath);
+        ProjectInstance projectInstance = new ProjectInstance(projectRootElement);
         SolutionProjectModel project;
         try
         {
@@ -142,7 +143,7 @@ private static void AddProject(SolutionModel solution, string solutionRelativePr
         catch (SolutionArgumentException ex) when (ex.ParamName == "projectTypeName")
         {
             // 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 +152,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>)
         {
diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs
@@ -221,21 +221,29 @@ internal static int ExceptionHandler(Exception exception, ParseResult parseResul
 
         if (exception is GracefulException)
         {
-            Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose
-                ? exception.ToString().Red().Bold()
-                : exception.Message.Red().Bold());
+            Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose ?
+                exception.ToString().Red().Bold() :
+                exception.Message.Red().Bold());
         }
         else if (exception is CommandParsingException)
         {
-            Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose
-                ? exception.ToString().Red().Bold()
-                : exception.Message.Red().Bold());
+            Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose ?
+                exception.ToString().Red().Bold() :
+                exception.Message.Red().Bold());
             parseResult.ShowHelp();
         }
+        else if (exception.GetType().Name.Equals("WorkloadManifestCompositionException"))
+        {
+            Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose ?
+                exception.ToString().Red().Bold() :
+                exception.Message.Red().Bold());
+        }
         else
         {
             Reporter.Error.Write("Unhandled exception: ".Red().Bold());
-            Reporter.Error.WriteLine(exception.ToString().Red().Bold());
+            Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose ?
+                exception.ToString().Red().Bold() :
+                exception.Message.Red().Bold());
         }
 
         return 1;
diff --git a/test/TestAssets/TestProjects/TestAppWithEmptySln/App.slnx b/test/TestAssets/TestProjects/TestAppWithEmptySln/App.slnx
@@ -1 +1 @@
-<Solution />
+<Solution />
diff --git a/test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/App.sln b/test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/App.sln
@@ -0,0 +1,5 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
diff --git a/test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/App.slnx b/test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/App.slnx
@@ -0,0 +1 @@
+<Solution />
diff --git a/test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/Unknown.unknownproj b/test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/Unknown.unknownproj
@@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <DefaultProjectTypeGuid>{2F08BC15-189B-4804-B644-653F34C968A8}</DefaultProjectTypeGuid>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs
@@ -19,6 +19,7 @@ public static class ProjectTypeGuids
         public const string VBProjectTypeGuid = "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}";
         public const string SolutionFolderGuid = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}";
         public const string SharedProjectGuid = "{D954291E-2A0B-460D-934E-DC6B0785DB48}";
+        public const string DefaultProjectGuid = "{130159A9-F047-44B3-88CF-0CF7F02ED50F}";
     }
 
     public class GivenDotnetSlnAdd : SdkTest
@@ -750,13 +751,13 @@ public void WhenPassedAnUnknownProjectTypeItFails(string solutionCommand)
         [InlineData("sln", "SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)]
         [InlineData("sln", "SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)]
         [InlineData("sln", "SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)]
-        [InlineData("sln", "SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")]
-        [InlineData("sln", "SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")]
+        [InlineData("sln", "SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", ProjectTypeGuids.DefaultProjectGuid)]
+        [InlineData("sln", "SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", ProjectTypeGuids.DefaultProjectGuid)]
         [InlineData("solution", "SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)]
         [InlineData("solution", "SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)]
         [InlineData("solution", "SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)]
-        [InlineData("solution", "SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")]
-        [InlineData("solution", "SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")]
+        [InlineData("solution", "SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", ProjectTypeGuids.DefaultProjectGuid)]
+        [InlineData("solution", "SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", ProjectTypeGuids.DefaultProjectGuid)]
         public async Task WhenPassedAProjectItAddsCorrectProjectTypeGuid(
             string solutionCommand,
             string testAsset,
@@ -789,7 +790,7 @@ public async Task WhenPassedAProjectItAddsCorrectProjectTypeGuid(
         [InlineData("solution", ".sln")]
         [InlineData("sln", ".slnx")]
         [InlineData("solution", ".slnx")]
-        public void WhenPassedAProjectWithoutATypeGuidItErrors(string solutionCommand, string solutionExtension)
+        public void WhenPassedAProjectWithoutATypeGuidNorDefaultTypeGuidItErrors(string solutionCommand, string solutionExtension)
         {
             var solutionDirectory = _testAssetsManager
                 .CopyTestAsset("SlnFileWithNoProjectReferencesAndUnknownProjectType", identifier: $"GivenDotnetSlnAdd-{solutionCommand}{solutionExtension}")
@@ -815,6 +816,26 @@ public void WhenPassedAProjectWithoutATypeGuidItErrors(string solutionCommand, s
                 .BeVisuallyEquivalentTo(contentBefore);
         }
 
+        [Theory]
+        [InlineData("sln", ".sln")]
+        [InlineData("solution", ".sln")]
+        [InlineData("sln", ".slnx")]
+        [InlineData("solution", ".slnx")]
+        public void WhenPassedAProjectWithDefaultProjectGuidItPasses(string solutionCommand, string solutionExtension)
+        {
+            var solutionDirectory = _testAssetsManager
+                .CopyTestAsset("TestAppWithSlnAndDefaultProjectType", identifier: $"GivenDotnetSlnAdd-{solutionCommand}{solutionExtension}")
+                .WithSource()
+                .Path;
+            
+            var cmd = new DotnetCommand(Log)
+                .WithWorkingDirectory(solutionDirectory)
+                .Execute(solutionCommand, $"App{solutionExtension}", "add", "Unknown.unknownproj");
+            
+            cmd.Should().Pass();
+            cmd.StdErr.Should().BeEmpty();
+        }
+
         [Theory]
         [InlineData("sln", ".sln")]
         [InlineData("solution", ".sln")]

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ private static void AddProject(SolutionModel solution, string solutionRelativePr`
`134`	`134`	`{`
`135`	`135`	`// Open project instance to see if it is a valid project`
`136`	`136`	`ProjectRootElement projectRootElement = ProjectRootElement.Open(fullPath);`
	`137`	`+ ProjectInstance projectInstance = new ProjectInstance(projectRootElement);`
`137`	`138`	`SolutionProjectModel project;`
`138`	`139`	`try`
`139`	`140`	`{`
`@@ -142,7 +143,7 @@ private static void AddProject(SolutionModel solution, string solutionRelativePr`
`142`	`143`	`catch (SolutionArgumentException ex) when (ex.ParamName == "projectTypeName")`
`143`	`144`	`{`
`144`	`145`	`// If guid is not identified by vs-solutionpersistence, check in project element itself`
`145`		`- var guid = projectRootElement.GetProjectTypeGuid();`
	`146`	`+ var guid = projectRootElement.GetProjectTypeGuid() ?? projectInstance.GetDefaultProjectTypeGuid();`
`146`	`147`	`if (string.IsNullOrEmpty(guid))`
`147`	`148`	`{`
`148`	`149`	`Reporter.Error.WriteLine(CommonLocalizableStrings.UnsupportedProjectType, fullPath);`
`@@ -151,7 +152,6 @@ private static void AddProject(SolutionModel solution, string solutionRelativePr`
`151`	`152`	`project = solution.AddProject(solutionRelativeProjectPath, guid, solutionFolder);`
`152`	`153`	`}`
`153`	`154`	`// Add settings based on existing project instance`
`154`		`- ProjectInstance projectInstance = new ProjectInstance(projectRootElement);`
`155`	`155`	`string projectInstanceId = projectInstance.GetProjectId();`
`156`	`156`	`if (!string.IsNullOrEmpty(projectInstanceId) && serializer is ISolutionSerializer<SlnV12SerializerSettings>)`
`157`	`157`	`{`