Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sln-add: Get project DefaultProjectTypeGuid #47661

Open
wants to merge 6 commits into
base: release/9.0.2xx
Choose a base branch
from
Open

sln-add: Get project DefaultProjectTypeGuid #47661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02bbd62
sln-add: Get project DefaultProjectTypeGuid
edvilme Mar 17, 2025
134cb2e
Add tests
edvilme Mar 17, 2025
7c6c7bc
Fix incorrect tests
edvilme Mar 17, 2025
6566497
Update tests for clarity
edvilme Mar 17, 2025
b37a5a4
Typo
edvilme Mar 17, 2025
55fccf1
Update to catch exception better
edvilme Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Cli/dotnet/commands/dotnet-sln/add/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,16 @@ private void AddProject(SolutionModel solution, string solutionRelativeProjectPa
{
// 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);
Expand All @@ -153,7 +154,6 @@ private void AddProject(SolutionModel solution, string solutionRelativeProjectPa
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>)
{
Expand Down
2 changes: 1 addition & 1 deletion test/TestAssets/TestProjects/TestAppWithEmptySln/App.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<Solution />
<Solution />
5 changes: 5 additions & 0 deletions test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/App.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/App.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<Solution />
7 changes: 7 additions & 0 deletions test/TestAssets/TestProjects/TestAppWithSlnAndDefaultProjectType/Unknown.unknownproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>

<PropertyGroup>
<DefaultProjectTypeGuid>{2F08BC15-189B-4804-B644-653F34C968A8}</DefaultProjectTypeGuid>
</PropertyGroup>

</Project>
31 changes: 26 additions & 5 deletions test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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
Expand Down Expand Up @@ -749,13 +750,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,
Expand Down Expand Up @@ -788,7 +789,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}")
Expand All @@ -814,6 +815,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")]
Expand Down
Loading