Skip to content

Fix NRE when running sln remove #53200

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

Open
andbrl wants to merge 1 commit into
base: release/10.0.3xx
Choose a base branch
from
+21 −1
Open

Fix NRE when running sln remove #53200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private static async Task RemoveProjectsAsync(string solutionFileFullPath, IEnum
// If the project is not found, try to find it by name without extension
if (project is null && !Path.HasExtension(projectPath))
{
var projectsMatchByName = solution.SolutionProjects.Where(p => Path.GetFileNameWithoutExtension(p.DisplayName).Equals(projectPath));
var projectsMatchByName = solution.SolutionProjects.Where(p => p.ActualDisplayName.Equals(projectPath));
Copy link
Contributor

@edvilme edvilme Feb 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! p.DisplayName could return null

project = projectsMatchByName.Count() == 1 ? projectsMatchByName.First() : null;
}
// If project is still not found, print error
Expand Down
20 changes: 20 additions & 0 deletions test/dotnet.Tests/CommandTests/Solution/Remove/GivenDotnetSlnRemove.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,26 @@ public void WhenNoProjectIsPassedItPrintsErrorAndUsage(string solutionCommand, s
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized("");
}

[Theory]
[InlineData("sln", ".sln")]
[InlineData("solution", ".sln")]
[InlineData("sln", ".slnx")]
[InlineData("solution", ".slnx")]
public void WhenProjectWithoutExtensionIsPassedAndDoesntExistItPrintsError(string solutionCommand, string solutionExtension)
{
var projectDirectory = _testAssetsManager
.CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}GivenDotnetSlnRemove")
.WithSource()
.Path;

var cmd = new DotnetCommand(Log)
.WithWorkingDirectory(projectDirectory)
.Execute(solutionCommand, $"App{solutionExtension}", "remove", "InexistingProjectNameWithoutExtension");

cmd.Should().Pass();
cmd.StdOut.Should().Be(string.Format(CliStrings.ProjectNotFoundInTheSolution, "InexistingProjectNameWithoutExtension"));
}

[Theory]
[InlineData("sln")]
[InlineData("solution")]
Expand Down
Loading