Skip to content

Improve error message when duplicate project name is detected. #99

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

Merged
richardstanton merged 1 commit into from
Feb 21, 2025
Merged

Improve error message when duplicate project name is detected. #99

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
6 changes: 3 additions & 3 deletions src/Microsoft.VisualStudio.SolutionPersistence/Errors.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Microsoft.VisualStudio.SolutionPersistence/Errors.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@
<value>Project path '{0}' already exists in the solution.</value>
<comment>Error message. {0} is the file path that already exists.</comment>
</data>
<data name="DuplicateProjectName_Arg1" xml:space="preserve">
<value>Project name '{0}' already exists in the solution folder.</value>
<data name="DuplicateProjectName_Arg2" xml:space="preserve">
<value>Project name '{0}' already exists in the '{1}' solution folder.</value>
<comment>Error message. {0} is the name of the folder.</comment>
</data>
<data name="InvalidFolderPath_Args1" xml:space="preserve">
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.VisualStudio.SolutionPersistence/Model/SolutionModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,8 @@ internal void ValidateProjectName(SolutionProjectModel project)
}

string displayName = project.ActualDisplayName;
string folderPath = project.Parent?.Path ?? "Root";

foreach (SolutionProjectModel existingProject in this.SolutionProjects)
{
if (!ReferenceEquals(existingProject.Parent, project.Parent) || ReferenceEquals(existingProject, project))
Expand All @@ -597,7 +599,7 @@ internal void ValidateProjectName(SolutionProjectModel project)

if (existingProject.ActualDisplayName.Equals(displayName, StringComparison.OrdinalIgnoreCase))
{
throw new SolutionArgumentException(string.Format(Errors.DuplicateProjectName_Arg1, displayName), SolutionErrorType.DuplicateProjectName);
throw new SolutionArgumentException(string.Format(Errors.DuplicateProjectName_Arg2, displayName, folderPath), SolutionErrorType.DuplicateProjectName);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.VisualStudio.SolutionPersistence.Tests/Serialization/Folders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void MoveProjectToFolder()

// Try moving project to folder with existing project
ArgumentException ex = Assert.Throws<SolutionArgumentException>(() => wanderingProject.MoveToFolder(folderA));
Assert.Equal(string.Format(Errors.DuplicateProjectName_Arg1, wanderingProject.ActualDisplayName), ex.Message);
Assert.Equal(string.Format(Errors.DuplicateProjectName_Arg2, wanderingProject.ActualDisplayName, folderA.Path), ex.Message);
Assert.Equal("/This/Is/A/Nested/Folder/", wanderingProject.Parent.ItemRef);

// Move project to root
Expand Down