allow exiting from a parent package lookup if no better match was found (#12128)

Co-authored-by: Abhishek <[email protected]>

Author: brettfo

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs

@@ -1370,11 +1370,11 @@ await File.WriteAllTextAsync(projectPath, """
             """);
         await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
             // initial packages
-            MockNuGetPackage.CreateSimplePackage("Microsoft.EntityFrameworkCore", "7.0.11", "net8.0", [(null, [("Microsoft.EntityFrameworkCore.Analyzers", "7.0.11"), ("Microsoft.Extensions.Caching.Memory", "7.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Microsoft.EntityFrameworkCore", "7.0.11", "net8.0", [(null, [("Microsoft.EntityFrameworkCore.Analyzers", "7.0.11"), ("Microsoft.Extensions.Caching.Memory", "[7.0.0]")])]),
             MockNuGetPackage.CreateSimplePackage("Microsoft.EntityFrameworkCore.Analyzers", "7.0.11", "net8.0"),
             MockNuGetPackage.CreateSimplePackage("Microsoft.Extensions.Caching.Memory", "7.0.0", "net8.0"),
             // available packages
-            MockNuGetPackage.CreateSimplePackage("Microsoft.EntityFrameworkCore", "8.0.0", "net8.0", [(null, [("Microsoft.EntityFrameworkCore.Analyzers", "8.0.0"), ("Microsoft.Extensions.Caching.Memory", "8.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Microsoft.EntityFrameworkCore", "8.0.0", "net8.0", [(null, [("Microsoft.EntityFrameworkCore.Analyzers", "8.0.0"), ("Microsoft.Extensions.Caching.Memory", "[8.0.0]")])]),
             MockNuGetPackage.CreateSimplePackage("Microsoft.EntityFrameworkCore.Analyzers", "8.0.0", "net8.0"),
             MockNuGetPackage.CreateSimplePackage("Microsoft.Extensions.Caching.Memory", "8.0.0", "net8.0"),
         ], tempDirectory.DirectoryPath);
@@ -1627,16 +1627,13 @@ await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
             // initial packages
             MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.CSharp.Workspaces", "4.8.0", "net8.0", [(null, [("Microsoft.CodeAnalysis.CSharp", "[4.8.0]"), ("Microsoft.CodeAnalysis.Common", "[4.8.0]")])]),
             MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.CSharp", "4.8.0", "net8.0", [(null, [("Microsoft.CodeAnalysis.Common", "[4.8.0]")])]),
-            MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.Common", "4.8.0", "net8.0", [(null, [("System.Collections.Immutable", "7.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.Common", "4.8.0", "net8.0", [(null, [("System.Collections.Immutable", "[7.0.0]")])]),
             MockNuGetPackage.CreateSimplePackage("System.Collections.Immutable", "7.0.0", "net8.0"),
             // available packages
             MockNuGetPackage.CreateSimplePackage("System.Collections.Immutable", "8.0.0", "net8.0"),
             MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.CSharp.Workspaces", "4.9.2", "net8.0", [(null, [("Microsoft.CodeAnalysis.CSharp", "[4.9.2]"), ("Microsoft.CodeAnalysis.Common", "[4.9.2]")])]),
             MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.CSharp", "4.9.2", "net8.0", [(null, [("Microsoft.CodeAnalysis.Common", "[4.9.2]")])]),
-            MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.Common", "4.9.2", "net8.0", [(null, [("System.Collections.Immutable", "8.0.0")])]),
-            //MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.CSharp.Workspaces", "4.10.0", "net8.0", [(null, [("Microsoft.CodeAnalysis.CSharp", "[4.10.0]"), ("Microsoft.CodeAnalysis.Common", "[4.10.0]")])]),
-            //MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.CSharp", "4.10.0", "net8.0", [(null, [("Microsoft.CodeAnalysis.Common", "[4.10.0]")])]),
-            //MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.Common", "4.10.0", "net8.0", [(null, [("System.Collections.Immutable", "8.0.0")])])
+            MockNuGetPackage.CreateSimplePackage("Microsoft.CodeAnalysis.Common", "4.9.2", "net8.0", [(null, [("System.Collections.Immutable", "[8.0.0]")])]),
        ], tempDirectory.DirectoryPath);
 
         var dependencies = new[]
@@ -1669,6 +1666,59 @@ await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
         };
         AssertEx.Equal(expectedResolvedDependencies, actualResolvedDependencies);
     }
+
+    [Fact(Timeout = 120_000)] // 2m
+    public async Task DependencyConflictsCanBeResolved_TopLevelDependencyHasNewerVersionsThatDoNotPullUpTransitive()
+    {
+        using var tempDirectory = new TemporaryDirectory();
+        var projectPath = Path.Join(tempDirectory.DirectoryPath, "project.csproj");
+        await File.WriteAllTextAsync(projectPath, """
+            <Project Sdk="Microsoft.NET.Sdk">
+              <PropertyGroup>
+                <TargetFramework>net8.0</TargetFramework>
+              </PropertyGroup>
+              <ItemGroup>
+                <PackageReference Include="Top.Level.Package" Version="1.41.0" />
+              </ItemGroup>
+            </Project>
+            """);
+        await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
+            // initial packages
+            MockNuGetPackage.CreateSimplePackage("Top.Level.Package", "1.41.0", "net8.0", [(null, [("Transitive.Package", "6.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Transitive.Package", "6.0.0", "net8.0"),
+            // available packages
+            MockNuGetPackage.CreateSimplePackage("Top.Level.Package", "1.45.0", "net8.0", [(null, [("Transitive.Package", "6.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Transitive.Package", "8.0.5", "net8.0"),
+       ], tempDirectory.DirectoryPath);
+
+        var dependencies = new[]
+        {
+            new Dependency("Top.Level.Package", "1.41.0", DependencyType.PackageReference),
+        }.ToImmutableArray();
+        var update = new[]
+        {
+            new Dependency("Transitive.Package", "8.0.5", DependencyType.PackageReference),
+        }.ToImmutableArray();
+
+        var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflicts(
+            tempDirectory.DirectoryPath,
+            projectPath,
+            "net8.0",
+            dependencies,
+            update,
+            new ExperimentsManager() { InstallDotnetSdks = true },
+            new TestLogger()
+        );
+        Assert.NotNull(resolvedDependencies);
+        var actualResolvedDependencies = resolvedDependencies.Value.Select(d => $"{d.Name}/{d.Version}").ToArray();
+        var expectedResolvedDependencies = new[]
+        {
+            "Top.Level.Package/1.41.0",
+            "Transitive.Package/8.0.5",
+        };
+        AssertEx.Equal(expectedResolvedDependencies, actualResolvedDependencies);
+    }
+
     #endregion
 
     [Theory]

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DependencyConflictResolver.cs

@@ -465,19 +465,16 @@ public async Task<string> UpdateVersion(List<PackageToUpdate> existingPackages,
                             NuGetVersion latestVersion = versions.Where(v => !v.IsPrerelease).Max();
 
                             // Loop from the current version to the latest version, use next patch as a limit (unless there's a limit) so it doesn't look for versions that don't exist
-                            for (NuGetVersion version = currentVersionParent; version <= latestVersion; version = NextPatch(version, versions))
+                            for (NuGetVersion? version = currentVersionParent; version is not null && version <= latestVersion; version = NextPatch(version, versions))
                             {
-                                string parentVersion = version.ToString();
-                                parent.NewVersion = parentVersion;
-
                                 // Check if the parent needs to be updated since the child isn't in the existing package list  and the parent can update to a newer version to remove the dependency
                                 List<PackageToUpdate> dependencyListParentTemp = await GetDependenciesAsync(parent, targetFramework, projectDirectory, logger);
                                 PackageToUpdate parentDependencyTemp = dependencyListParentTemp.FirstOrDefault(p => string.Compare(p.PackageName, package.PackageName, StringComparison.OrdinalIgnoreCase) == 0);
 
                                 // If the newer package version of the parent has the same version as the parent's previous dependency, update
                                 if (parentDependencyTemp.CurrentVersion == package.CurrentVersion)
                                 {
-                                    parent.NewVersion = parentVersion;
+                                    parent.NewVersion = version.ToString();
                                     parent.CurrentVersion = null;
                                     await UpdateVersion(existingPackages, parent, targetFramework, projectDirectory, logger);
                                     package.IsSpecific = true;
@@ -534,18 +531,10 @@ public async Task<bool> IsCompatibleAsync(PackageToUpdate parent, PackageToUpdat
     }
 
     // Method to update a version to the next available version for a package
-    public NuGetVersion NextPatch(NuGetVersion version, IEnumerable<NuGetVersion> allVersions)
+    private static NuGetVersion? NextPatch(NuGetVersion version, IEnumerable<NuGetVersion> allVersions)
     {
-        var versions = allVersions.Where(v => v > version);
-
-        if (!versions.Any())
-        {
-            // If there are no greater versions, return current version
-            return version;
-        }
-
-        // Find smallest version in the versions
-        return versions.Min();
+        var candidateVersions = allVersions.Where(v => v > version).ToArray();
+        return candidateVersions.Min();
     }
 
     // Method to find a compatible version with the child for the parent to update to
@@ -588,18 +577,10 @@ public async Task<NuGetVersion> FindCompatibleVersionAsync(List<PackageToUpdate>
         }
 
         // Loop from the current version to the latest version, use next patch as a limit (unless there's a limit) so it doesn't look for versions that don't exist
-        for (NuGetVersion version = CurrentVersion; version <= latestVersion; version = NextPatch(version, versions))
+        for (NuGetVersion? version = CurrentVersion; version is not null && version <= latestVersion; version = NextPatch(version, versions))
         {
             possibleParent.NewVersion = version.ToString();
 
-            NuGetVersion nextPatch = NextPatch(version, versions);
-
-            // If the next patch is the same as the CurrentVersion, then nothing is needed
-            if (nextPatch == version)
-            {
-                return nextPatch;
-            }
-
             // Check if there's compatibility with parent and dependency
             if (await IsCompatibleAsync(possibleParent, possibleDependency, targetFramework, nugetContext.CurrentDirectory, logger))
             {