Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/fix-multiple-dependents.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"SolarWinds.Changesets": Patch
---

Fix `version` only bumping one dependent when a project is referenced by multiple projects.
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,17 @@ private static ImmutableDictionary<string, CsProject[]> GetProjectsDependentsNam
{
foreach (string projectReferenceName in csProject.ReferencedProjectNames)
{
if (csProjectNameToDependentProjects.TryGetValue(projectReferenceName, out HashSet<CsProject>? value))
if (!csProjectNameToDependentProjects.TryGetValue(projectReferenceName, out HashSet<CsProject>? value))
{
value.Add(csProject);
value = [];
csProjectNameToDependentProjects[projectReferenceName] = value;
}

csProjectNameToDependentProjects[projectReferenceName] = [csProject];
value.Add(csProject);
}
}

return csProjectNameToDependentProjects.ToImmutableDictionary(pair => pair.Key, pair => pair.Value.ToArray());
return csProjectNameToDependentProjects.ToImmutableDictionary(pair => pair.Key, pair => pair.Value.OrderBy(p => p.Name).ToArray());
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,36 @@ public void GetProcessedChangelogs_OneChangelogThreeProjectsOneProjectReference_
secondModule.GetNewVersion().Should().BeEquivalentTo(new Semver(1, 1, 2));
}

[Test]
public void GetProcessedChangelogs_ProjectWithTwoDependents_BumpsBothDependents()
{
ChangelogGenerator changelogGenerator = new();

ChangesetFile[] changesetFile = [
new(
["project1"],
BumpType.Minor,
"Changelog for shared project")
];

// project2 and project3 both reference project1
IEnumerable<CsProject> csProjects = [
new("project1", new Semver(1, 0, 0), [], @"c:\temp"),
new("project2", new Semver(1, 0, 0), ["project1"], @"c:\temp"),
new("project3", new Semver(1, 0, 0), ["project1"], @"c:\temp")
];

List<ModuleChangelog> processedChangelogs = changelogGenerator.GetProcessedChangelogs(changesetFile, csProjects).ToList();

processedChangelogs.Select(x => x.ModuleName).Should().BeEquivalentTo(["project1", "project2", "project3"]);

ModuleChangelog project2 = processedChangelogs.First(x => x.ModuleName == "project2");
ModuleChangelog project3 = processedChangelogs.First(x => x.ModuleName == "project3");

project2.GetNewVersion().Should().BeEquivalentTo(new Semver(1, 0, 1));
project3.GetNewVersion().Should().BeEquivalentTo(new Semver(1, 0, 1));
}

[Test]
public void GetProcessedChangelogs_OneProject_ReturnsOneChangelog()
{
Expand Down
Loading