dependabot-nuget 0.369.0 → 0.370.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c69daba9caa7c5be1ee39fa7454b232d79aaf70394a4c2eec181366e0479dc13
-  data.tar.gz: a75674364b9ed467d976022a40838fd3cf412f804af8ce1dd73e0f564fe0fca8
+  metadata.gz: a443457e2e8e24c70f4cb8a9e11a2fff6c3f9d15255b7e023c29a1ccdf4bd548
+  data.tar.gz: 272f36da3e3a53a28cd748d21da99bf8b5c94ca94c854e549db6dc1ee8b2f40a
 SHA512:
-  metadata.gz: ee6ac6119b759938fde039435263620115fa9364cc17fb9c48ec42aec11312d4206a70c1b81e35cbc5e82bd2b6956435177b0658e860d0324a43e72b29b5f010
-  data.tar.gz: ed556d26ad7a22992e30a80b3e2c844add33a65ee501158f9ec741e04924edd7ada871513854b64527fdab13969865605b0a7a3b58592cecafc302522be13cdf
+  metadata.gz: 7e5806e6b08c76324c6ba174c1f0a4e085ab62ef8f6694b365932beefa770ea5cdcdf578574f73e61f3b08b1ff7fd2523fa7f23a9598a34f69ccf1f236397b44
+  data.tar.gz: 7786d4b33b44eb4fe14cc7ba98d77c5ad45c9213ae80320d895de61db18e19592b72243c3a25b4bcdc182dbdb0f6e2787812b14dd8cf49c606503053c3612a3b

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyGroup.cs

@@ -44,9 +44,14 @@ public class GroupMatcher
 
     public bool IsAllowedByVersion(NuGetVersion oldVersion, NuGetVersion newVersion)
     {
+        if (newVersion <= oldVersion)
+        {
+            return false;
+        }
+
         var isMajorBump = newVersion.Major > oldVersion.Major;
         var isMinorBump = newVersion.Major == oldVersion.Major && newVersion.Minor > oldVersion.Minor;
-        var isPatchBump = newVersion.Major == oldVersion.Major && newVersion.Minor == oldVersion.Minor && newVersion.Patch > oldVersion.Patch;
+        var isPatchEquivalentBump = newVersion.Major == oldVersion.Major && newVersion.Minor == oldVersion.Minor;
 
         var allowedUpdateTypes = new HashSet<GroupUpdateType>(UpdateTypes);
 
@@ -60,7 +65,7 @@ public class GroupMatcher
             return true;
         }
 
-        if (isPatchBump && allowedUpdateTypes.Contains(GroupUpdateType.Patch))
+        if (isPatchEquivalentBump && allowedUpdateTypes.Contains(GroupUpdateType.Patch))
         {
             return true;
         }

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

@@ -265,6 +265,54 @@ public class MiscellaneousTests
         ];
     }
 
+    [Theory]
+    [MemberData(nameof(GroupMatcher_IsAllowedByVersionTestData))]
+    public void GroupMatcher_IsAllowedByVersion(string[]? updateTypes, string oldVersion, string newVersion, bool expectedAllowed)
+    {
+        var rules = new Dictionary<string, object>();
+        if (updateTypes is not null)
+        {
+            rules["update-types"] = updateTypes;
+        }
+
+        var group = new DependencyGroup()
+        {
+            Name = "TestGroup",
+            Rules = rules,
+        };
+
+        var matcher = group.GetGroupMatcher();
+        var actualAllowed = matcher.IsAllowedByVersion(NuGetVersion.Parse(oldVersion), NuGetVersion.Parse(newVersion));
+        Assert.Equal(expectedAllowed, actualAllowed);
+    }
+
+    public static IEnumerable<object?[]> GroupMatcher_IsAllowedByVersionTestData()
+    {
+        // defaults to major, minor, and patch
+        yield return [null, "1.0.0", "2.0.0", true];
+        yield return [null, "1.0.0", "1.1.0", true];
+        yield return [null, "1.0.0", "1.0.1", true];
+
+        // constrained update type behavior
+        yield return [new[] { "major" }, "1.0.0", "2.0.0", true];
+        yield return [new[] { "major" }, "1.0.0", "1.1.0", false];
+        yield return [new[] { "minor", "patch" }, "1.0.0", "2.0.0", false];
+
+        // revision-only and prerelease-only updates should be patch-equivalent, but only for upgrades
+        yield return [null, "1.0.0.1", "1.0.0.3", true];
+        yield return [null, "1.0.0.1", "1.0.0.1", false];
+        yield return [null, "1.0.0.3", "1.0.0.1", false];
+        yield return [new[] { "patch" }, "1.0.0.1", "1.0.0.3", true];
+        yield return [new[] { "patch" }, "1.0.0.1", "1.0.0.1", false];
+        yield return [new[] { "patch" }, "1.0.0.3", "1.0.0.1", false];
+        yield return [null, "1.0.0-alpha", "1.0.0-beta", true];
+        yield return [null, "1.0.0-alpha", "1.0.0-alpha", false];
+        yield return [null, "1.0.0-beta", "1.0.0-alpha", false];
+        yield return [new[] { "patch" }, "1.0.0-alpha", "1.0.0-beta", true];
+        yield return [new[] { "patch" }, "1.0.0-alpha", "1.0.0-alpha", false];
+        yield return [new[] { "patch" }, "1.0.0-beta", "1.0.0-alpha", false];
+    }
+
     [Theory]
     [MemberData(nameof(GetMatchingPullRequestTestData))]
     public void GetMatchingPullRequest(Job job, IEnumerable<Dependency> dependencies, bool considerVersions, string? expectedGroupPrName, string[]? expectedPrDependencyNames)

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

@@ -1371,6 +1371,146 @@ public class GroupUpdateAllVersionsHandlerTests : UpdateHandlersTestsBase
         );
     }
 
+    [Fact]
+    public async Task RevisionOnlyUpdateIsGroupedWhenUpdateTypesNotSpecified()
+    {
+        await TestAsync(
+            job: new Job()
+            {
+                Source = CreateJobSource("/src"),
+                DependencyGroups = [new()
+                {
+                    Name = "test-group",
+                    Rules = new()
+                    {
+                        ["patterns"] = new[] { "Some.Dependency" },
+                    },
+                }]
+            },
+            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.1", DependencyType.PackageReference, TargetFrameworks: ["net9.0"]),
+                            ],
+                            ImportedFiles = [],
+                            AdditionalFiles = [],
+                        }
+                    ],
+                })
+            ),
+            analyzeWorker: new TestAnalyzeWorker(input =>
+            {
+                var dependencyInfo = input.Item3;
+                var newVersion = dependencyInfo.Name switch
+                {
+                    "Some.Dependency" => "1.0.0.3",
+                    _ => 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 newVersion = input.Item5;
+
+                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",
+                    }
+                },
+                // grouped check
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Dependency",
+                            Version = "1.0.0.1",
+                            Requirements = [
+                                new() { Requirement = "1.0.0.1", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    DependencyFiles = ["/src/project.csproj"],
+                },
+                new CreatePullRequest()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Dependency",
+                            Version = "1.0.0.3",
+                            Requirements = [
+                                new() { Requirement = "1.0.0.3", File = "/src/project.csproj", Groups = ["dependencies"], Source = new() { SourceUrl = null } },
+                            ],
+                            PreviousVersion = "1.0.0.1",
+                            PreviousRequirements = [
+                                new() { Requirement = "1.0.0.1", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    UpdatedDependencyFiles = [
+                        new()
+                        {
+                            Directory = "/src",
+                            Name = "project.csproj",
+                            Content = "updated contents",
+                        },
+                    ],
+                    BaseCommitSha = "TEST-COMMIT-SHA",
+                    CommitMessage = EndToEndTests.TestPullRequestCommitMessage,
+                    PrTitle = EndToEndTests.TestPullRequestTitle,
+                    PrBody = EndToEndTests.TestPullRequestBody,
+                    DependencyGroup = "test-group",
+                },
+                // ungrouped check
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Dependency",
+                            Version = "1.0.0.1",
+                            Requirements = [
+                                new() { Requirement = "1.0.0.1", File = "/src/project.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    DependencyFiles = ["/src/project.csproj"],
+                },
+                new MarkAsProcessed("TEST-COMMIT-SHA"),
+            ]
+        );
+    }
+
     [Fact]
     public async Task UngroupedPullRequestCanBeCreatedIfGroupAppliesToNonMatchedTypes()
     {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.369.0
+  version: 0.370.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.369.0
+        version: 0.370.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.369.0
+        version: 0.370.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -553,7 +553,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.369.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.370.0
 rdoc_options: []
 require_paths:
 - lib