dependabot-nuget 0.327.0 → 0.330.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c53c1e05c9b8cde942ab41cf373abdba2ca9dc50e22a1628d757f6440ef38a
-  data.tar.gz: cf4e153cbbada4472ffd8c91b637e11d484ea99c8cbaee37101a8cc18233d867
+  metadata.gz: f873f613d2174dfdf82367b571a8f389e332d02f2dfb0f3e37e7db656bcb0442
+  data.tar.gz: fa66bffbadf7e9e8d51dd2d7fabfa60562504315b2c03fe5722aad203e582982
 SHA512:
-  metadata.gz: 4d07db62b6858379c4f0ee05edc59f7a1ac1e7d56fa2be3dde67eddaef7e41b8642007fda756961d0f96720ad6a000c73ae7dbb65e384e951cc360d9c27f5b88
-  data.tar.gz: 260cc4581f9e7c37a6af95f4e3a1c9eae779f542ce0002de09707625ff53aeaeae4c409653109835eb2732efdb5734a74d8dea8ea53d825e76b06674a5cdb710
+  metadata.gz: b45f0eb1a0fc68119d181985244952bd0527d344ef54265bc3d8810e30083f3f6aff61225e4d813d195a723905b77e9fd76f18b0a7c99c06978a028d8d56b82c
+  data.tar.gz: 68f201f704f413c26db73bb7a6fa6235013761189153585adf6822cdc6cca93a0ce6bd88c89997b3f34a0502df1636a36f7e23be216b648273ec5caef692c919

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/PullRequestTextGenerator.cs

@@ -95,8 +95,11 @@ public class PullRequestTextGenerator
     private static string GetDependencySetBumpText(DependencySet dependencySet, bool isCommitMessageDetail)
     {
         var bumpSuffix = isCommitMessageDetail ? "s" : string.Empty; // "Bumps" for commit message details, "Bump" otherwise
-        var fromText = dependencySet.Versions.Length == 1 && dependencySet.Versions[0].OldVersion is not null
-            ? $"from {dependencySet.Versions[0].OldVersion} "
+        var versionSets = dependencySet.Versions
+            .DistinctBy(versionSet => $"{versionSet.OldVersion}/{versionSet.NewVersion}".ToLowerInvariant())
+            .ToArray();
+        var fromText = versionSets.Length == 1 && versionSets[0].OldVersion is not null
+            ? $"from {versionSets[0].OldVersion} "
             : string.Empty;
         var newVersions = dependencySet.Versions
             .Select(v => v.NewVersion)

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

@@ -482,6 +482,253 @@ public class EndToEndTests
         );
     }
 
+    [Fact]
+    public async Task WithJsonFiles()
+    {
+        await RunAsync(
+            packages: [
+                // dotnet-tools.json packages
+                MockNuGetPackage.CreateDotNetToolPackage("Test.Tool", "1.0.0", "net9.0"),
+                MockNuGetPackage.CreateDotNetToolPackage("Test.Tool", "2.0.0", "net9.0"),
+                // global.json packages
+                MockNuGetPackage.CreateMSBuildSdkPackage("TestSdk", "3.10.1"),
+                MockNuGetPackage.CreateMSBuildSdkPackage("TestSdk", "3.10.3"),
+                // regular package is up to date
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net9.0"),
+            ],
+            job: new()
+            {
+                Source = new()
+                {
+                    Provider = "github",
+                    Repo = "test/repo",
+                    Directory = "/",
+                }
+            },
+            files: [
+                (".config/dotnet-tools.json", """
+                    {
+                      "version": 1,
+                      "isRoot": true,
+                      "tools": {
+                        "Test.Tool": {
+                          "version": "1.0.0",
+                          "commands": [
+                            "test-tool"
+                          ],
+                          "rollForward": false
+                        }
+                      }
+                    }
+                    """),
+                ("global.json", """
+                    {
+                      "msbuild-sdks": {
+                        "TestSdk": "3.10.1"
+                      }
+                    }
+                    """),
+                ("Directory.Build.props", "<Project />"),
+                ("Directory.Build.targets", "<Project />"),
+                ("Directory.Packages.props", """
+                    <Project>
+                      <PropertyGroup>
+                        <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+                      </PropertyGroup>
+                    </Project>
+                    """),
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            discoveryWorker: null, // use real worker
+            analyzeWorker: null, // use real worker
+            updaterWorker: null, // use real worker
+            expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "group_update_all_versions"
+                    }
+                },
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Test.Tool",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "1.0.0",
+                                    File = "/.config/dotnet-tools.json",
+                                    Groups = ["dependencies"],
+                                }
+                            ]
+                        },
+                        new()
+                        {
+                            Name = "TestSdk",
+                            Version = "3.10.1",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "3.10.1",
+                                    File = "/global.json",
+                                    Groups = ["dependencies"],
+                                }
+                            ]
+                        },
+                        new()
+                        {
+                            Name = "Some.Package",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "1.0.0",
+                                    File = "/project.csproj",
+                                    Groups = ["dependencies"],
+                                }
+                            ]
+                        },
+                    ],
+                    DependencyFiles = [
+                        "/.config/dotnet-tools.json",
+                        "/Directory.Build.props",
+                        "/Directory.Build.targets",
+                        "/Directory.Packages.props",
+                        "/global.json",
+                        "/project.csproj",
+                    ],
+                },
+                // for dotnet-tools.json
+                new CreatePullRequest()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Test.Tool",
+                            Version = "2.0.0",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "2.0.0",
+                                    File = "/.config/dotnet-tools.json",
+                                    Groups = ["dependencies"],
+                                    Source = new()
+                                    {
+                                        SourceUrl = null,
+                                        Type = "nuget_repo",
+                                    }
+                                }
+                            ],
+                            PreviousVersion = "1.0.0",
+                            PreviousRequirements = [
+                                new()
+                                {
+                                    Requirement = "1.0.0",
+                                    File = "/.config/dotnet-tools.json",
+                                    Groups = ["dependencies"],
+                                }
+                            ],
+                        },
+                    ],
+                    UpdatedDependencyFiles = [
+                        new()
+                        {
+                            Directory = "/.config",
+                            Name = "dotnet-tools.json",
+                            Content = """
+                                {
+                                  "version": 1,
+                                  "isRoot": true,
+                                  "tools": {
+                                    "Test.Tool": {
+                                      "version": "2.0.0",
+                                      "commands": [
+                                        "test-tool"
+                                      ],
+                                      "rollForward": false
+                                    }
+                                  }
+                                }
+                                """
+                        },
+                    ],
+                    BaseCommitSha = "TEST-COMMIT-SHA",
+                    CommitMessage = TestPullRequestCommitMessage,
+                    PrTitle = TestPullRequestTitle,
+                    PrBody = TestPullRequestBody,
+                    DependencyGroup = null,
+                },
+                // for global.json
+                new CreatePullRequest()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "TestSdk",
+                            Version = "3.10.3",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "3.10.3",
+                                    File = "/global.json",
+                                    Groups = ["dependencies"],
+                                    Source = new()
+                                    {
+                                        SourceUrl = null,
+                                        Type = "nuget_repo",
+                                    }
+                                }
+                            ],
+                            PreviousVersion = "3.10.1",
+                            PreviousRequirements = [
+                                new()
+                                {
+                                    Requirement = "3.10.1",
+                                    File = "/global.json",
+                                    Groups = ["dependencies"],
+                                }
+                            ],
+                        },
+                    ],
+                    UpdatedDependencyFiles = [
+                        new()
+                        {
+                            Directory = "/",
+                            Name = "global.json",
+                            Content = """
+                                {
+                                  "msbuild-sdks": {
+                                    "TestSdk": "3.10.3"
+                                  }
+                                }
+                                """
+                        },
+                    ],
+                    BaseCommitSha = "TEST-COMMIT-SHA",
+                    CommitMessage = TestPullRequestCommitMessage,
+                    PrTitle = TestPullRequestTitle,
+                    PrBody = TestPullRequestBody,
+                    DependencyGroup = null,
+                },
+                new MarkAsProcessed("TEST-COMMIT-SHA")
+            ]
+        );
+    }
+
     [Fact]
     public async Task UpdatePackageWithDifferentVersionsInDifferentDirectories()
     {

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

@@ -32,6 +32,22 @@ public class PullRequestTextTests
         Assert.Equal(expectedTitle, actualTitle);
     }
 
+    [Fact]
+    public void FromClauseInTitleIsIncludedIfVersionUpdatesAreIdentical()
+    {
+        // this can happen if the same update was performed for multiple projects
+        var job = FromCommitOptions(null);
+        var updateOperations = new UpdateOperationBase[]
+        {
+            new DirectUpdate() { DependencyName = "Some.Dependency", OldVersion = NuGetVersion.Parse("1.0.0"), NewVersion = NuGetVersion.Parse("2.0.0"), UpdatedFiles = [] },
+            new DirectUpdate() { DependencyName = "Some.Dependency", OldVersion = NuGetVersion.Parse("1.0.0"), NewVersion = NuGetVersion.Parse("2.0.0"), UpdatedFiles = [] },
+        };
+
+        var actualTitle = PullRequestTextGenerator.GetPullRequestTitle(job, [.. updateOperations], dependencyGroupName: null);
+        var expectedTitle = "Bump Some.Dependency from 1.0.0 to 2.0.0";
+        Assert.Equal(expectedTitle, actualTitle);
+    }
+
     [Theory]
     [MemberData(nameof(GetPullRequestTextTestData))]
     public async Task PullRequestText(
@@ -422,7 +438,7 @@ public class PullRequestTextTests
                 new DirectUpdate()
                 {
                     DependencyName = "Some.Package",
-                    OldVersion = NuGetVersion.Parse("1.0.0"),
+                    OldVersion = NuGetVersion.Parse("1.1.0"),
                     NewVersion = NuGetVersion.Parse("1.2.3"),
                     UpdatedFiles = ["b.txt"]
                 }
@@ -439,6 +455,7 @@ public class PullRequestTextTests
             """
             Performed the following updates:
             - Updated Some.Package from 1.0.0 to 1.2.3
+            - Updated Some.Package from 1.1.0 to 1.2.3
             """
         ];
     }

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

@@ -297,6 +297,37 @@ public class XmlFileWriterTests : FileWriterTestsBase
         );
     }
 
+    [Fact]
+    public async Task SingleDependency_SingleFile_AttributeDirectUpdate_VersionRangeFromWildCard()
+    {
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Ignored.Dependency" Version="7.0.0" />
+                        <PackageReference Include="Some.Dependency" Version="1.*" />
+                        <PackageReference Include="Some.Other.Dependency" Version="8.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: ["Some.Dependency/1.1.0"],
+            requiredDependencyStrings: ["Some.Dependency/2.0.0"],
+            expectedFiles: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Ignored.Dependency" Version="7.0.0" />
+                        <PackageReference Include="Some.Dependency" Version="2.0.0" />
+                        <PackageReference Include="Some.Other.Dependency" Version="8.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ]
+        );
+    }
+
     [Fact]
     public async Task SingleDependency_SingleFile_UpdateVersionAttribute()
     {
@@ -590,6 +621,33 @@ public class XmlFileWriterTests : FileWriterTestsBase
         );
     }
 
+    [Fact]
+    public async Task SingleDependency_SingleFile_NoChangeForWildCard()
+    {
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.*" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: ["Some.Dependency/1.0.0"],
+            requiredDependencyStrings: ["Some.Dependency/1.0.0"],
+            expectedFiles: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.*" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ]
+        );
+    }
+
     [Fact]
     public async Task MultiDependency_SingleFile_AttributeDirectUpdate()
     {

metadata

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