Skip to content
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

gracefully exit if we can't solve an issue with peer dependencies #11000

Merged
merged 1 commit into from
Nov 23, 2024
Merged

gracefully exit if we can't solve an issue with peer dependencies #11000

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: 4 additions & 2 deletions nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ protected static Task TestNoChangeforProject(
TestFile[]? additionalFiles = null,
MockNuGetPackage[]? packages = null,
ExperimentsManager? experimentsManager = null,
string projectFilePath = "test-project.csproj")
string projectFilePath = "test-project.csproj",
ExpectedUpdateOperationResult? expectedResult = null)
=> TestUpdateForProject(
dependencyName,
oldVersion,
Expand All @@ -88,7 +89,8 @@ protected static Task TestNoChangeforProject(
additionalFiles,
additionalFilesExpected: additionalFiles,
packages: packages,
experimentsManager: experimentsManager);
experimentsManager: experimentsManager,
expectedResult: expectedResult);

protected static Task TestUpdateForProject(
string dependencyName,
Expand Down
40 changes: 40 additions & 0 deletions ...pers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackageReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3109,6 +3109,46 @@ await TestNoChangeforProject("Some.Package", "7.0.1", "13.0.1",
);
}

[Fact]
public async Task NoChange_IfPeerDependenciesCannotBeEvaluated()
{
// make sure we don't throw if we find conflicting peer dependencies; this can happen in multi-tfm projects if the dependencies are too complicated to resolve
// eventually this should be able to be resolved, but currently we can't branch on the different packages for different TFMs
await TestNoChangeforProject("Some.Package", "1.0.0", "1.1.0",
packages:
[
// initial packages
new MockNuGetPackage("Some.Package", "1.0.0",
DependencyGroups: [
("net8.0", [("Transitive.Dependency", "8.0.0")]),
("net9.0", [("Transitive.Dependency", "9.0.0")])
]),
MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "8.0.0", "net8.0"),
MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "9.0.0", "net9.0"),

// what we're trying to update to, but will fail
new MockNuGetPackage("Some.Package", "1.1.0",
DependencyGroups: [
("net8.0", [("Transitive.Dependency", "8.1.0")]),
("net9.0", [("Transitive.Dependency", "9.1.0")])
]),
MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "8.1.0", "net8.0"),
MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "9.1.0", "net9.0"),
],
projectContents: """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Some.Package" Version="1.0.0" />
</ItemGroup>
</Project>
""",
expectedResult: new() // success
);
}

[Fact]
public async Task ProcessingProjectWithWorkloadReferencesDoesNotFail()
{
Expand Down
5 changes: 5 additions & 0 deletions nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/PackageReferenceUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public static async Task UpdateDependencyAsync(
}
else
{
if (peerDependencies is null)
{
return;
}

await UpdateDependencyWithConflictResolution(repoRootPath, buildFiles, tfms, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive, peerDependencies, logger);
}

Expand Down
Loading