Skip to content

NuGet: Add FindRootDirectory experiment to resolve root entry points #15021

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
brettfo merged 1 commit into from
May 20, 2026
Merged

NuGet: Add FindRootDirectory experiment to resolve root entry points #15021

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
430 changes: 430 additions & 0 deletions nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/EntryPointFinderTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

228 changes: 228 additions & 0 deletions nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/EndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,234 @@ await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
Assert.Equal("2.1.0", resolvedInLibrary);
}

[Fact]
public async Task FindRootDirectory_ExpandsDirectoryThroughProjChain()
{
// Job starts at /src/client, but a .proj chain leads up to the repo root.
// With FindRootDirectory enabled, the job should discover from "/" instead,
// which also picks up /test/client/client-test.csproj that would not be found
// if only /src/client were examined.
await RunAsync(
packages: [
MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net9.0"),
MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net9.0"),
],
job: new()
{
Source = new()
{
Provider = "github",
Repo = "test/repo",
Directory = "/src/client",
}
},
files: [
("Directory.Build.props", "<Project />"),
("Directory.Build.targets", "<Project />"),
("Directory.Packages.props", """
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>
</Project>
"""),
("dirs.proj", """
<Project>
<ItemGroup>
<ProjectFile Include="src\dirs.proj" />
<ProjectFile Include="test\dirs.proj" />
</ItemGroup>
</Project>
"""),
("src/dirs.proj", """
<Project>
<ItemGroup>
<ProjectFile Include="client\client.csproj" />
</ItemGroup>
</Project>
"""),
("test/dirs.proj", """
<Project>
<ItemGroup>
<ProjectFile Include="client\client-test.csproj" />
</ItemGroup>
</Project>
"""),
("src/client/client.csproj", """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Some.Package" Version="1.0.0" />
</ItemGroup>
</Project>
"""),
("test/client/client-test.csproj", """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Some.Package" Version="1.0.0" />
<ProjectReference Include="..\..\src\client\client.csproj" />
</ItemGroup>
</Project>
"""),
],
discoveryWorker: null,
analyzeWorker: null,
updaterWorker: null,
experimentsManager: new ExperimentsManager() { FindRootDirectory = true },
expectedApiMessages: [
new IncrementMetric()
{
Metric = "updater.started",
Tags = new()
{
["operation"] = "group_update_all_versions"
}
},
new UpdatedDependencyList()
{
Dependencies = [
new()
{
Name = "Some.Package",
Version = "1.0.0",
Requirements = [
new()
{
Requirement = "1.0.0",
File = "/src/client/client.csproj",
Groups = ["dependencies"],
}
]
},
new()
{
Name = "Some.Package",
Version = "1.0.0",
Requirements = [
new()
{
Requirement = "1.0.0",
File = "/test/client/client-test.csproj",
Groups = ["dependencies"],
}
]
},
],
DependencyFiles = [
"/Directory.Build.props",
"/Directory.Build.targets",
"/Directory.Packages.props",
"/src/client/client.csproj",
"/test/client/client-test.csproj",
],
},
new CreatePullRequest()
{
Dependencies = [
new()
{
Name = "Some.Package",
Version = "2.0.0",
Requirements = [
new()
{
Requirement = "2.0.0",
File = "/src/client/client.csproj",
Groups = ["dependencies"],
Source = new()
{
SourceUrl = null,
Type = "nuget_repo",
}
}
],
PreviousVersion = "1.0.0",
PreviousRequirements = [
new()
{
Requirement = "1.0.0",
File = "/src/client/client.csproj",
Groups = ["dependencies"],
}
],
},
new()
{
Name = "Some.Package",
Version = "2.0.0",
Requirements = [
new()
{
Requirement = "2.0.0",
File = "/test/client/client-test.csproj",
Groups = ["dependencies"],
Source = new()
{
SourceUrl = null,
Type = "nuget_repo",
}
}
],
PreviousVersion = "1.0.0",
PreviousRequirements = [
new()
{
Requirement = "1.0.0",
File = "/test/client/client-test.csproj",
Groups = ["dependencies"],
}
],
},
],
UpdatedDependencyFiles = [
new()
{
Directory = "/src/client",
Name = "client.csproj",
Content = """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Some.Package" Version="2.0.0" />
</ItemGroup>
</Project>
"""
},
new()
{
Directory = "/test/client",
Name = "client-test.csproj",
Content = """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Some.Package" Version="2.0.0" />
<ProjectReference Include="..\..\src\client\client.csproj" />
</ItemGroup>
</Project>
"""
},
],
BaseCommitSha = "TEST-COMMIT-SHA",
CommitMessage = TestPullRequestCommitMessage,
PrTitle = TestPullRequestTitle,
PrBody = TestPullRequestBody,
DependencyGroup = null,
},
new MarkAsProcessed("TEST-COMMIT-SHA")
]
);
}

public const string TestPullRequestCommitMessage = "test-pull-request-commit-message";
public const string TestPullRequestTitle = "test-pull-request-title";
public const string TestPullRequestBody = "test-pull-request-body";
Expand Down
Loading
Loading