dependabot-nuget 0.351.0 → 0.353.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/MiscellaneousTests.cs

@@ -129,14 +129,15 @@ public class MiscellaneousTests
     }
 
     [Fact]
-    public void DeserializeDependencyGroup()
+    public void DeserializeDependencyGroup_SpecificValues()
     {
         var json = """
             {
               "name": "test-group",
               "rules": {
                 "patterns": ["Test.*"],
-                "exclude-patterns": ["Dependency.*"]
+                "exclude-patterns": ["Dependency.*"],
+                "update-types": ["minor", "patch"]
               }
             }
             """;
@@ -146,6 +147,24 @@ public class MiscellaneousTests
         var matcher = group.GetGroupMatcher();
         Assert.Equal(["Test.*"], matcher.Patterns);
         Assert.Equal(["Dependency.*"], matcher.ExcludePatterns);
+        Assert.Equal([GroupUpdateType.Minor, GroupUpdateType.Patch], matcher.UpdateTypes);
+    }
+
+    [Fact]
+    public void DeserializeDependencyGroup_DefaultValues()
+    {
+        var json = """
+            {
+              "name": "test-group"
+            }
+            """;
+        var group = JsonSerializer.Deserialize<DependencyGroup>(json, RunWorker.SerializerOptions);
+        Assert.NotNull(group);
+        Assert.Equal("test-group", group.Name);
+        var matcher = group.GetGroupMatcher();
+        Assert.Equal(["*"], matcher.Patterns);
+        Assert.Equal([], matcher.ExcludePatterns);
+        Assert.Equal([GroupUpdateType.Major, GroupUpdateType.Minor, GroupUpdateType.Patch], matcher.UpdateTypes);
     }
 
     [Fact]
@@ -156,7 +175,8 @@ public class MiscellaneousTests
               "name": "test-group",
               "rules": {
                 "patterns": { "unexpected": 1 },
-                "exclude-patterns": { "unexpected": 2 }
+                "exclude-patterns": { "unexpected": 2 },
+                "update-types": { "unexpected": 3 }
               }
             }
             """;
@@ -166,6 +186,7 @@ public class MiscellaneousTests
         var matcher = group.GetGroupMatcher();
         Assert.Equal([], matcher.Patterns);
         Assert.Equal([], matcher.ExcludePatterns);
+        Assert.Equal([], matcher.UpdateTypes);
     }
 
     [Theory]
@@ -515,9 +536,9 @@ public class MiscellaneousTests
 
     [Theory]
     [MemberData(nameof(DependencyInfoFromJobData))]
-    public void DependencyInfoFromJob(Job job, Dependency dependency, DependencyInfo expectedDependencyInfo)
+    public void DependencyInfoFromJob(Job job, Dependency dependency, GroupMatcher? groupMatcher, DependencyInfo expectedDependencyInfo)
     {
-        var actualDependencyInfo = RunWorker.GetDependencyInfo(job, dependency, allowCooldown: true);
+        var actualDependencyInfo = RunWorker.GetDependencyInfo(job, dependency, groupMatcher is null ? [] : [groupMatcher], allowCooldown: true);
         var expectedString = JsonSerializer.Serialize(expectedDependencyInfo, AnalyzeWorker.SerializerOptions);
         var actualString = JsonSerializer.Serialize(actualDependencyInfo, AnalyzeWorker.SerializerOptions);
         Assert.Equal(expectedString, actualString);
@@ -604,7 +625,7 @@ public class MiscellaneousTests
         ];
     }
 
-    public static IEnumerable<object[]> DependencyInfoFromJobData()
+    public static IEnumerable<object?[]> DependencyInfoFromJobData()
     {
         // with security advisory
         yield return
@@ -634,6 +655,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -679,6 +702,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -712,6 +737,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -753,6 +780,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -795,6 +824,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -808,6 +839,44 @@ public class MiscellaneousTests
             },
         ];
 
-
+        // with limited group update types; major is explicitly ignored, only patch is explicitly allowed => major and minor are ignored
+        yield return
+        [
+            // job
+            new Job()
+            {
+                Source = new()
+                {
+                    Provider = "github",
+                    Repo = "some/repo"
+                },
+                IgnoreConditions = [
+                    new Condition()
+                    {
+                        DependencyName = "Some.*",
+                        UpdateTypes = [ConditionUpdateType.SemVerMajor],
+                    },
+                ],
+            },
+            // dependency
+            new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            new GroupMatcher()
+            {
+                Patterns = ["Some.*"],
+                ExcludePatterns = [],
+                UpdateTypes = [GroupUpdateType.Patch],
+            },
+            // expectedDependencyInfo
+            new DependencyInfo()
+            {
+                Name = "Some.Dependency",
+                Version = "1.0.0",
+                IsVulnerable = false,
+                IgnoredVersions = [],
+                Vulnerabilities = [],
+                IgnoredUpdateTypes = [ConditionUpdateType.SemVerMajor, ConditionUpdateType.SemVerMinor],
+            },
+        ];
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/SerializationTests.cs

@@ -791,6 +791,14 @@ public class SerializationTests : TestBase
             """
         ];
 
+        yield return
+        [
+            new OutOfDisk(),
+            """
+            {"data":{"error-type":"out_of_disk","error-details":{}}}
+            """
+        ];
+
         yield return
         [
             new PrivateSourceAuthenticationFailure(["url1", "url2"]),

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/UpdateHandlers/GroupUpdateAllVersionsHandlerTests.cs

@@ -995,6 +995,28 @@ public class GroupUpdateAllVersionsHandlerTests : UpdateHandlersTestsBase
                     ],
                     DependencyFiles = ["/src/project.csproj"],
                 },
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Package.For.Group.One",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new() { Requirement = "1.0.0", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                        new()
+                        {
+                            Name = "Package.For.Group.Two",
+                            Version = "2.0.0",
+                            Requirements = [
+                                new() { Requirement = "2.0.0", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    DependencyFiles = ["/src/project.csproj"],
+                },
                 new MarkAsProcessed("TEST-COMMIT-SHA"),
             ]
         );
@@ -1128,4 +1150,224 @@ public class GroupUpdateAllVersionsHandlerTests : UpdateHandlersTestsBase
             ]
         );
     }
+
+    [Fact]
+    public async Task NoPullRequestCreatedForExisting_NoGroup()
+    {
+        await TestAsync(
+            job: new Job()
+            {
+                Source = CreateJobSource("/src"),
+                ExistingPullRequests = [
+                    new()
+                    {
+                        Dependencies = [
+                            new()
+                            {
+                                DependencyName = "Some.Dependency",
+                                DependencyVersion = NuGetVersion.Parse("2.0.0"),
+                            }
+                        ]
+                    }
+                ]
+            },
+            files: [
+                ("src/project.csproj", "initial contents"),
+            ],
+            discoveryWorker: TestDiscoveryWorker.FromResults(
+                ("/src", new WorkspaceDiscoveryResult()
+                {
+                    Path = "/src",
+                    Projects = [
+                        new()
+                        {
+                            FilePath = "project.csproj",
+                            Dependencies = [
+                                new("Some.Dependency", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net9.0"]),
+                            ],
+                            ImportedFiles = [],
+                            AdditionalFiles = [],
+                        }
+                    ],
+                })
+            ),
+            analyzeWorker: new TestAnalyzeWorker(input =>
+            {
+                var repoRoot = input.Item1;
+                var discovery = input.Item2;
+                var dependencyInfo = input.Item3;
+                var newVersion = dependencyInfo.Name switch
+                {
+                    "Some.Dependency" => "2.0.0",
+                    _ => throw new NotImplementedException($"Test didn't expect to update dependency {dependencyInfo.Name}"),
+                };
+                return Task.FromResult(new AnalysisResult()
+                {
+                    CanUpdate = true,
+                    UpdatedVersion = newVersion,
+                    UpdatedDependencies = [],
+                });
+            }),
+            updaterWorker: new TestUpdaterWorker(async input =>
+            {
+                var repoRoot = input.Item1;
+                var workspacePath = input.Item2;
+                var dependencyName = input.Item3;
+                var previousVersion = input.Item4;
+                var newVersion = input.Item5;
+                var isTransitive = input.Item6;
+
+                await File.WriteAllTextAsync(Path.Join(repoRoot, workspacePath), "updated contents");
+
+                return new UpdateOperationResult()
+                {
+                    UpdateOperations = [new DirectUpdate() { DependencyName = dependencyName, NewVersion = NuGetVersion.Parse(newVersion), UpdatedFiles = [workspacePath] }],
+                };
+            }),
+            expectedUpdateHandler: GroupUpdateAllVersionsHandler.Instance,
+            expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "group_update_all_versions",
+                    }
+                },
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Dependency",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new() { Requirement = "1.0.0", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    DependencyFiles = ["/src/project.csproj"],
+                },
+                new MarkAsProcessed("TEST-COMMIT-SHA"),
+            ]
+        );
+    }
+
+    [Fact]
+    public async Task NoPullRequestCreatedForExisting_Group()
+    {
+        await TestAsync(
+            job: new Job()
+            {
+                Source = CreateJobSource("/src"),
+                DependencyGroups = [new() { Name = "test-group" }],
+                ExistingGroupPullRequests = [
+                    new()
+                    {
+                        DependencyGroupName = "test-group",
+                        Dependencies = [
+                            new()
+                            {
+                                DependencyName = "Some.Dependency",
+                                DependencyVersion = NuGetVersion.Parse("2.0.0"),
+                            }
+                        ]
+                    }
+                ]
+            },
+            files: [
+                ("src/project.csproj", "initial contents"),
+            ],
+            discoveryWorker: TestDiscoveryWorker.FromResults(
+                ("/src", new WorkspaceDiscoveryResult()
+                {
+                    Path = "/src",
+                    Projects = [
+                        new()
+                        {
+                            FilePath = "project.csproj",
+                            Dependencies = [
+                                new("Some.Dependency", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net9.0"]),
+                            ],
+                            ImportedFiles = [],
+                            AdditionalFiles = [],
+                        }
+                    ],
+                })
+            ),
+            analyzeWorker: new TestAnalyzeWorker(input =>
+            {
+                var repoRoot = input.Item1;
+                var discovery = input.Item2;
+                var dependencyInfo = input.Item3;
+                var newVersion = dependencyInfo.Name switch
+                {
+                    "Some.Dependency" => "2.0.0",
+                    _ => throw new NotImplementedException($"Test didn't expect to update dependency {dependencyInfo.Name}"),
+                };
+                return Task.FromResult(new AnalysisResult()
+                {
+                    CanUpdate = true,
+                    UpdatedVersion = newVersion,
+                    UpdatedDependencies = [],
+                });
+            }),
+            updaterWorker: new TestUpdaterWorker(async input =>
+            {
+                var repoRoot = input.Item1;
+                var workspacePath = input.Item2;
+                var dependencyName = input.Item3;
+                var previousVersion = input.Item4;
+                var newVersion = input.Item5;
+                var isTransitive = input.Item6;
+
+                await File.WriteAllTextAsync(Path.Join(repoRoot, workspacePath), "updated contents");
+
+                return new UpdateOperationResult()
+                {
+                    UpdateOperations = [new DirectUpdate() { DependencyName = dependencyName, NewVersion = NuGetVersion.Parse(newVersion), UpdatedFiles = [workspacePath] }],
+                };
+            }),
+            expectedUpdateHandler: GroupUpdateAllVersionsHandler.Instance,
+            expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "group_update_all_versions",
+                    }
+                },
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Dependency",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new() { Requirement = "1.0.0", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    DependencyFiles = ["/src/project.csproj"],
+                },
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Dependency",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new() { Requirement = "1.0.0", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    DependencyFiles = ["/src/project.csproj"],
+                },
+                new MarkAsProcessed("TEST-COMMIT-SHA"),
+            ]
+        );
+    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/PackageReferenceUpdaterTests.cs

@@ -11,6 +11,36 @@ namespace NuGetUpdater.Core.Test.Update;
 
 public class PackageReferenceUpdaterTests
 {
+    [Theory]
+    [InlineData("net9.0", "net9.0")]
+    [InlineData("net9.0-android", "net9.0")]
+    [InlineData("net9.0-android", "net9.0-android")]
+    public async Task GetPackageGraphForDependencies_DifferentTargetFrameworks(string projectTfm, string packageTfm)
+    {
+        // arrange
+        using var repoRoot = await TemporaryDirectory.CreateWithContentsAsync(("project.csproj", "<Project Sdk=\"Microsoft.NET.Sdk\" />"));
+        var projectPath = Path.Combine(repoRoot.DirectoryPath, "project.csproj");
+        await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
+            MockNuGetPackage.CreateSimplePackage("Parent.Package", "1.0.0", packageTfm, [(null, [("Transitive.Package", "2.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Transitive.Package", "2.0.0", packageTfm, [(null, [("Super.Transitive.Package", "3.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Super.Transitive.Package", "3.0.0", "net8.0"), // explicitly a different but compatible tfm
+        ], repoRoot.DirectoryPath);
+        var topLevelDependencies = new[]
+        {
+            new Dependency("Parent.Package", "1.0.0", DependencyType.PackageReference),
+        };
+
+        // act
+        var packageGraph = await PackageReferenceUpdater.GetPackageGraphForDependencies(repoRoot.DirectoryPath, projectPath, projectTfm, [.. topLevelDependencies], new TestLogger());
+
+        // assert
+        Assert.Equal("1.0.0", packageGraph.PackageVersions["Parent.Package"].ToString());
+        Assert.Equal("2.0.0", packageGraph.PackageVersions["Transitive.Package"].ToString());
+        Assert.Equal("3.0.0", packageGraph.PackageVersions["Super.Transitive.Package"].ToString());
+        Assert.Equal("Parent.Package", packageGraph.PackageParents["Transitive.Package"].Single());
+        Assert.Equal("Transitive.Package", packageGraph.PackageParents["Super.Transitive.Package"].Single());
+    }
+
     [Theory]
     [MemberData(nameof(ComputeUpdateOperationsTestData))]
     public async Task ComputeUpdateOperations

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

@@ -414,6 +414,19 @@ public class MSBuildHelperTests : TestBase
                 // normalize default message for the test
                 actualError = new DependencyFileNotFound(notFound.Details["file-path"].ToString()!, "test message");
             }
+            if (actualError is DependencyFileNotParseable notParseable)
+            {
+                // normalize the path for the test
+                actualError = new DependencyFileNotParseable("/" + notParseable.Details["file-path"].ToString()!.TrimStart('.', '/'), notParseable.Details["message"]?.ToString());
+            }
+            if (actualError is UnknownError unknownError)
+            {
+                // remove callstack from unknown error to make testing easier
+                var originalMessage = unknownError.Exception.Message;
+                var newlineIndex = originalMessage.IndexOf('\n');
+                var trimmedMessage = newlineIndex >= 0 ? originalMessage[..newlineIndex] : originalMessage;
+                actualError = new UnknownError(new Exception(trimmedMessage.Trim()), "TEST-JOB-ID");
+            }
 
             var actualErrorJson = JsonSerializer.Serialize(actualError, RunWorker.SerializerOptions);
             var expectedErrorJson = JsonSerializer.Serialize(expectedError, RunWorker.SerializerOptions);
@@ -609,5 +622,17 @@ public class MSBuildHelperTests : TestBase
             // expectedError
             new DependencyFileNotParseable("/path/to/NuGet.Config", "Some error message."),
         ];
+
+        yield return
+        [
+            // output
+            """
+            Output:
+            Using Msbuild from '/usr/local/dotnet/current/sdk/9.0.307'.
+            Found multiple project files for '/home/dependabot/dependabot-updater/repo/path/to/packages.config'.
+            """,
+            // expectedError
+            new UnknownError(new Exception("Multiple project files found for single packages.config"), "TEST-JOB-ID"),
+        ];
     }
 }