dependabot-nuget 0.345.0 → 0.346.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7165cb0246630d370d724bfcfeb22ed03175c78145255faa76643f7b03cf60fe
-  data.tar.gz: 174ba03152133f0c03fe6da96cae0b110b6f7642482c325be3dfab2a397b261f
+  metadata.gz: 1560ef2944db7a46d2e26478b56c91abc4a054bbb325003e4435d89e6e23ae94
+  data.tar.gz: 0d00ce7b7ebdeaea3752ed889b904a87648e5bc1a13e1ac9c1e53abab9835b53
 SHA512:
-  metadata.gz: b64d571108c83699e1dc521d883979b968c2e6ded9644cada7513fe319046c6fc31d235c77ba63b59ae0deed8c29768140125d7425956669921a50b1034821e9
-  data.tar.gz: 30e4eebd3db7f09e8b9c6af6bbbfdee7a1456e0c1a001ef774ed71f9bfbba85bd9680623489a5e9893c942b7d2490051465d66b92932492eb8ec39f7d5a4b432
+  metadata.gz: 90b739b20c70f4ee18fdde1704d7bed69e7cc0fbe45f948cdee8fd0e6f0ad1e7b48dfdc36a356af0def8831c0b490c2865ad38861d660d8c02b57734209c3f13
+  data.tar.gz: d01ff80fcd31819a6b8a098b4201cfa5a291878d5c8311c81f98eecd55d9a02feb9c82efad44ec51a1dd5d876372e754e02bd0e9856d80576d1eacc257d38b73

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/FileWriters/FileWriterWorker.cs

@@ -209,7 +209,62 @@ public class FileWriterWorker
             foreach (var projectDiscovery in orderedProjectDiscovery)
             {
                 var projectFullPath = Path.Join(repoContentsPath.FullName, initialDiscoveryResult.Path, projectDiscovery.FilePath).FullyNormalizedRootedPath();
-                var updatedFiles = await TryPerformFileWritesAsync(_fileWriter, repoContentsPath, initialProjectDirectory, projectDiscovery, resolvedDependencies.Value);
+                var projectDirectory = new DirectoryInfo(Path.GetDirectoryName(projectFullPath)!);
+                var projectRelativePath = Path.GetRelativePath(repoContentsPath.FullName, projectFullPath).FullyNormalizedRootedPath();
+                var projectRelativeDirectory = Path.GetDirectoryName(projectRelativePath)!.NormalizePathToUnix();
+                _logger.Info($"Attempting to update {dependencyName} for {projectRelativePath}");
+
+                // rerun discovery because a previous file update may have already fixed this
+                var rerunWorkspaceDiscovery = await _discoveryWorker.RunAsync(repoContentsPath.FullName, projectRelativeDirectory);
+                var rerunProjectDiscovery = rerunWorkspaceDiscovery.GetProjectDiscoveryFromFullPath(repoContentsPath, new FileInfo(projectFullPath));
+                if (rerunProjectDiscovery is null)
+                {
+                    _logger.Warn($"  Unable to re-run project discovery for project {projectRelativePath}.");
+                    continue;
+                }
+
+                var candidateDependencyToUpdate = rerunProjectDiscovery.Dependencies.FirstOrDefault(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase));
+                if (candidateDependencyToUpdate?.Version is null)
+                {
+                    _logger.Warn($"  Unable to find dependency after discovery rerun.");
+                    continue;
+                }
+
+                if (!NuGetVersion.TryParse(candidateDependencyToUpdate.Version, out var candidateDependencyCurrentVersion))
+                {
+                    _logger.Warn($"  Unable to parse discovered version number from string: {candidateDependencyToUpdate.Version}");
+                    continue;
+                }
+
+                if (candidateDependencyCurrentVersion >= newDependencyVersion)
+                {
+                    _logger.Info($"  Dependency is already up to date at version {candidateDependencyCurrentVersion}, possibly from a previous operation.");
+                    continue;
+                }
+
+                var rerunTopLevelDependencies = rerunProjectDiscovery.Dependencies
+                    .Where(d => !d.IsTransitive)
+                    .ToImmutableArray();
+                var rerunDesiredDependencies = rerunTopLevelDependencies.Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase))
+                    ? rerunTopLevelDependencies.Select(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase) ? newDependency : d).ToImmutableArray()
+                    : rerunTopLevelDependencies.Concat([newDependency]).ToImmutableArray();
+                var resolvedDependenciesInThisproject = await _dependencySolver.SolveAsync(rerunTopLevelDependencies, rerunDesiredDependencies, targetFramework);
+                if (resolvedDependenciesInThisproject is null)
+                {
+                    _logger.Warn($"  Unable to solve dependency conflicts for {projectRelativePath}/{targetFramework}.");
+                    continue;
+                }
+
+                var updatedFiles = await TryPerformFileWritesAsync(_fileWriter, repoContentsPath, projectDirectory, rerunProjectDiscovery!, resolvedDependenciesInThisproject.Value);
+                if (updatedFiles.Length == 0)
+                {
+                    _logger.Info("  Files were unable to be updated.");
+                }
+                else
+                {
+                    _logger.Info($"  Successfully updated the following files: {string.Join(", ", updatedFiles)}");
+                }
+
                 allUpdatedFiles.AddRange(updatedFiles);
             }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/FileWriterWorkerTests.cs

@@ -812,10 +812,12 @@ public class FileWriterWorkerTests : TestBase
             discoveryWorker: new TestDiscoveryWorker(args =>
             {
                 discoveryRequestCount++;
-                var result = discoveryRequestCount switch
+                if (discoveryRequestCount <= 3)
                 {
-                    // initial request, report 1.0.0
-                    1 => new WorkspaceDiscoveryResult()
+                    // 1 - initial request
+                    // 2 - pre-edit request
+                    // 3 - post-edit request - no change made, indicates failure
+                    return Task.FromResult(new WorkspaceDiscoveryResult()
                     {
                         Path = "/",
                         Projects = [
@@ -829,26 +831,10 @@ public class FileWriterWorkerTests : TestBase
                                 ReferencedProjectPaths = []
                             }
                         ]
-                    },
-                    // post-edit request, report 1.0.0 again, indicating the file edits didn't produce the desired result
-                    2 => new WorkspaceDiscoveryResult()
-                    {
-                        Path = "/",
-                        Projects = [
-                            new ProjectDiscoveryResult()
-                            {
-                                FilePath = "project.csproj",
-                                Dependencies = [new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference)],
-                                TargetFrameworks = ["net9.0"],
-                                AdditionalFiles = [],
-                                ImportedFiles = [],
-                                ReferencedProjectPaths = []
-                            }
-                        ]
-                    },
-                    _ => throw new NotSupportedException($"Didn't expect {discoveryRequestCount} discovery requests"),
-                };
-                return Task.FromResult(result);
+                    });
+                }
+
+                throw new NotSupportedException($"Didn't expect {discoveryRequestCount} discovery requests");
             }),
             dependencySolver: null, // use real worker
             fileWriter: null, // use real worker
@@ -867,6 +853,80 @@ public class FileWriterWorkerTests : TestBase
         );
     }
 
+    [Fact]
+    public async Task EndToEnd_PriorFileEditResolvedDependencyInSubsequentFile()
+    {
+        // via a ProjectReference, two projects have the same dependency and updating the root causes the other dependency to also be updated and not result in unnecessarily pinning anything
+        await TestAsync(
+            dependencyName: "Some.Dependency",
+            oldDependencyVersion: "1.0.0",
+            newDependencyVersion: "2.0.0",
+            files: [
+                ("src/a/a.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <ProjectReference Include="..\b\b.csproj" />
+                      </ItemGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Unrelated.Dependency" Version="3.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("src/b/b.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("Directory.Build.props", "<Project />"),
+                ("Directory.Build.targets", "<Project />"),
+            ],
+            packages: [
+                MockNuGetPackage.CreateSimplePackage("Some.Dependency", "1.0.0", "net9.0"),
+                MockNuGetPackage.CreateSimplePackage("Some.Dependency", "2.0.0", "net9.0"),
+                MockNuGetPackage.CreateSimplePackage("Unrelated.Dependency", "3.0.0", "net9.0"),
+            ],
+            discoveryWorker: null, // use real worker
+            dependencySolver: null, // use real worker
+            fileWriter: null, // use real worker
+            expectedFiles: [
+                ("src/a/a.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <ProjectReference Include="..\b\b.csproj" />
+                      </ItemGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Unrelated.Dependency" Version="3.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("src/b/b.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+            ],
+            expectedOperations: [
+                new PinnedUpdate() { DependencyName = "Some.Dependency", NewVersion = NuGetVersion.Parse("2.0.0"), UpdatedFiles = ["/src/b/b.csproj"] }
+            ]
+        );
+    }
+
     private static async Task TestAsync(
         string dependencyName,
         string oldDependencyVersion,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.345.0
+  version: 0.346.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.345.0
+        version: 0.346.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.345.0
+        version: 0.346.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -551,7 +551,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.345.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.346.0
 rdoc_options: []
 require_paths:
 - lib