Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/Cli/dotnet/CliStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@
<data name="SolutionAlreadyContainsProject" xml:space="preserve">
<value>Solution {0} already contains project {1}.</value>
</data>
<data name="SolutionFolderAlreadyContainsProjectWithFilename" xml:space="preserve">
<value>Solution folder '{0}' already contains a project with the filename '{1}'.</value>
</data>
<data name="SpecifyAtLeastOneReferenceToRemove" xml:space="preserve">
<value>You must specify at least one reference to remove.</value>
</data>
Expand Down
31 changes: 31 additions & 0 deletions src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,37 @@ private void AddProject(SolutionModel solution, string fullProjectPath, ISolutio
// Generate the solution folder path based on the project path
SolutionFolderModel? solutionFolder = GenerateIntermediateSolutionFoldersForProjectPath(solution, solutionRelativeProjectPath);

// Check if a project with the same filename already exists in the solution folder
string projectFileName = Path.GetFileName(solutionRelativeProjectPath);
if (solutionFolder != null)
{
var rootFolder = solutionFolder;
while (rootFolder.Parent is SolutionFolderModel parentFolder)
{
rootFolder = parentFolder;
}

var existingProjectWithSameName = solution.SolutionProjects.FirstOrDefault(
p => IsInSameFolderHierarchy(p.Parent, rootFolder) && Path.GetFileName(p.FilePath).Equals(projectFileName, StringComparison.OrdinalIgnoreCase));

if (existingProjectWithSameName != null)
{
throw new GracefulException(string.Format(CliStrings.SolutionFolderAlreadyContainsProjectWithFilename, rootFolder.Name, projectFileName));
}
}

static bool IsInSameFolderHierarchy(SolutionItemModel? projectParent, SolutionFolderModel rootFolder)
{
var current = projectParent;
while (current != null)
{
if (current == rootFolder)
return true;
current = current.Parent;
}
return false;
}

SolutionProjectModel project;

try
Expand Down
5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.cs.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.de.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.es.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.fr.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.it.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.ja.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.ko.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.pl.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.pt-BR.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.ru.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.tr.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.zh-Hans.xlf

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

5 changes: 5 additions & 0 deletions src/Cli/dotnet/xlf/CliStrings.zh-Hant.xlf

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

Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string soluti

}

[Theory(Skip = "https://github.com/dotnet/sdk/issues/47859")]
[Theory]
[InlineData("sln")]
[InlineData("solution")]
public void WhenNestedDuplicateProjectIsAddedToASolutionFolder(string solutionCommand)
Expand Down