dependabot-nuget 0.295.0 → 0.296.1

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

@@ -227,6 +227,36 @@ public class SerializationTests
         Assert.False(experimentsManager.UseDirectDiscovery);
     }
 
+    [Fact]
+    public void DeserializeExperimentsManager_AlternateNames()
+    {
+        // experiment names can be either snake case or kebab case
+        var jobWrapper = RunWorker.Deserialize("""
+            {
+              "job": {
+                "package-manager": "nuget",
+                "allowed-updates": [
+                  {
+                    "update-type": "all"
+                  }
+                ],
+                "source": {
+                  "provider": "github",
+                  "repo": "some-org/some-repo",
+                  "directory": "some-dir"
+                },
+                "experiments": {
+                  "nuget-legacy-dependency-solver": true,
+                  "nuget-use-direct-discovery": true
+                }
+              }
+            }
+            """);
+        var experimentsManager = ExperimentsManager.GetExperimentsManager(jobWrapper.Job.Experiments);
+        Assert.True(experimentsManager.UseLegacyDependencySolver);
+        Assert.True(experimentsManager.UseDirectDiscovery);
+    }
+
     [Theory]
     [MemberData(nameof(DeserializeErrorTypesData))]
     public void SerializeError(JobErrorBase error, string expectedSerialization)
@@ -511,6 +541,59 @@ public class SerializationTests
         Assert.True(jobWrapper.Job.CommitMessageOptions!.IncludeScope);
     }
 
+    [Fact]
+    public void SerializeClosePullRequest()
+    {
+        var close = new ClosePullRequest()
+        {
+            DependencyNames = ["dep"],
+        };
+        var actual = HttpApiHandler.Serialize(close);
+        var expected = """
+            {"data":{"dependency-names":["dep"],"reason":"up_to_date"}}
+            """;
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public void SerializeCreatePullRequest()
+    {
+        var create = new CreatePullRequest()
+        {
+            Dependencies = [new() { Name = "dep", Version = "ver2", PreviousVersion = "ver1", Requirements = [new() { Requirement = "ver2", File = "project.csproj" }], PreviousRequirements = [new() { Requirement = "ver1", File = "project.csproj" }] }],
+            UpdatedDependencyFiles = [new() { Name = "project.csproj", Directory = "/", Content = "updated content" }],
+            BaseCommitSha = "TEST-COMMIT-SHA",
+            CommitMessage = "commit message",
+            PrTitle = "pr title",
+            PrBody = "pr body"
+        };
+        var actual = HttpApiHandler.Serialize(create);
+        var expected = """
+            {"data":{"dependencies":[{"name":"dep","version":"ver2","requirements":[{"requirement":"ver2","file":"project.csproj","groups":[],"source":null}],"previous-version":"ver1","previous-requirements":[{"requirement":"ver1","file":"project.csproj","groups":[],"source":null}]}],"updated-dependency-files":[{"name":"project.csproj","content":"updated content","directory":"/","type":"file","support_file":false,"content_encoding":"utf-8","deleted":false,"operation":"update","mode":null}],"base-commit-sha":"TEST-COMMIT-SHA","commit-message":"commit message","pr-title":"pr title","pr-body":"pr body"}}
+            """;
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public void SerializeUpdatePullRequest()
+    {
+        var update = new UpdatePullRequest()
+        {
+            BaseCommitSha = "TEST-COMMIT-SHA",
+            DependencyNames = ["dep"],
+            UpdatedDependencyFiles = [new() { Name = "project.csproj", Directory = "/", Content = "updated content" }],
+            PrTitle = "pr title",
+            PrBody = "pr body",
+            CommitMessage = "commit message",
+            DependencyGroup = null,
+        };
+        var actual = HttpApiHandler.Serialize(update);
+        var expected = """
+            {"data":{"base-commit-sha":"TEST-COMMIT-SHA","dependency-names":["dep"],"updated-dependency-files":[{"name":"project.csproj","content":"updated content","directory":"/","type":"file","support_file":false,"content_encoding":"utf-8","deleted":false,"operation":"update","mode":null}],"pr-title":"pr title","pr-body":"pr body","commit-message":"commit message","dependency-group":null}}
+            """;
+        Assert.Equal(expected, actual);
+    }
+
     public static IEnumerable<object?[]> DeserializeErrorTypesData()
     {
         yield return
@@ -553,6 +636,22 @@ public class SerializationTests
             """
         ];
 
+        yield return
+        [
+            new PullRequestExistsForLatestVersion("dep", "ver"),
+            """
+            {"data":{"error-type":"pull_request_exists_for_latest_version","error-details":{"dependency-name":"dep","dependency-version":"ver"}}}
+            """
+        ];
+
+        yield return
+        [
+            new SecurityUpdateNotNeeded("dep"),
+            """
+            {"data":{"error-type":"security_update_not_needed","error-details":{"dependency-name":"dep"}}}
+            """
+        ];
+
         yield return
         [
             new UnknownError(new Exception("some message"), "JOB-ID"),

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

@@ -33,6 +33,12 @@ internal class TestApiHandler : IApiHandler
         return Task.CompletedTask;
     }
 
+    public Task UpdatePullRequest(UpdatePullRequest updatePullRequest)
+    {
+        _receivedMessages.Add((updatePullRequest.GetType(), updatePullRequest));
+        return Task.CompletedTask;
+    }
+
     public Task MarkAsProcessed(MarkAsProcessed markAsProcessed)
     {
         _receivedMessages.Add((markAsProcessed.GetType(), markAsProcessed));

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

@@ -92,31 +92,31 @@ public class UpdatedDependencyListTests
                 },
                 new ReportedDependency()
                 {
-                    Name = "System.Text.Json",
-                    Version = "6.0.0",
+                    Name = "Newtonsoft.Json",
+                    Version = "13.0.1",
                     Requirements =
                     [
                         new ReportedRequirement()
                         {
-                            Requirement = "6.0.0",
+                            Requirement = "13.0.1",
                             File = "/src/c/project.csproj",
                             Groups = ["dependencies"],
-                        }
-                    ],
+                        },
+                    ]
                 },
                 new ReportedDependency()
                 {
-                    Name = "Newtonsoft.Json",
-                    Version = "13.0.1",
+                    Name = "System.Text.Json",
+                    Version = "6.0.0",
                     Requirements =
                     [
                         new ReportedRequirement()
                         {
-                            Requirement = "13.0.1",
+                            Requirement = "6.0.0",
                             File = "/src/c/project.csproj",
                             Groups = ["dependencies"],
-                        },
-                    ]
+                        }
+                    ],
                 },
             ],
             DependencyFiles = ["/src/a/packages.config", "/src/a/project.csproj", "/src/b/packages.config", "/src/b/project.csproj", "/src/c/packages.config", "/src/c/project.csproj"],

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

@@ -538,6 +538,89 @@ public class MSBuildHelperTests : TestBase
             """, evaluatedValue);
     }
 
+    [Theory]
+    [MemberData(nameof(GetTargetFrameworkValuesFromProjectData))]
+    public async Task GetTargetFrameworkValuesFromProject(string projectContents, string[] expectedTfms)
+    {
+        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
+        [
+            ("Directory.Build.props", "<Project />"),
+            ("Directory.Build.targets", "<Project />"),
+            ("project.csproj", projectContents)
+        ]);
+        var projectPath = Path.Combine(tempDir.DirectoryPath, "project.csproj");
+        var experimentsManager = new ExperimentsManager();
+        var logger = new TestLogger();
+        var actualTfms = await MSBuildHelper.GetTargetFrameworkValuesFromProject(tempDir.DirectoryPath, projectPath, experimentsManager, logger);
+        AssertEx.Equal(expectedTfms, actualTfms);
+    }
+
+    public static IEnumerable<object[]> GetTargetFrameworkValuesFromProjectData()
+    {
+        // SDK-style projects
+        yield return
+        [
+            """
+            <Project Sdk="Microsoft.NET.Sdk">
+              <PropertyGroup>
+                <TargetFramework>net8.0</TargetFramework>
+              </PropertyGroup>
+            </Project>
+            """,
+            new[] { "net8.0" }
+        ];
+
+        yield return
+        [
+            """
+            <Project Sdk="Microsoft.NET.Sdk">
+              <PropertyGroup>
+                <TargetFrameworks> ; net8.0 ; </TargetFrameworks>
+              </PropertyGroup>
+            </Project>
+            """,
+            new[] { "net8.0" }
+        ];
+
+        yield return
+        [
+            """
+            <Project Sdk="Microsoft.NET.Sdk">
+              <PropertyGroup>
+                <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+              </PropertyGroup>
+            </Project>
+            """,
+            new[] { "net8.0", "net9.0" }
+        ];
+
+        yield return
+        [
+            """
+            <Project Sdk="Microsoft.NET.Sdk">
+              <PropertyGroup>
+                <TargetFramework>net8.0-windows7.0</TargetFramework>
+              </PropertyGroup>
+            </Project>
+            """,
+            new[] { "net8.0-windows7.0" }
+        ];
+
+        // legacy projects
+        yield return
+        [
+            """
+            <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+              <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+              <PropertyGroup>
+                <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+              </PropertyGroup>
+              <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+            </Project>
+            """,
+            new[] { "net45" }
+        ];
+    }
 
     #region
     // Updating root package
@@ -1450,6 +1533,30 @@ public class MSBuildHelperTests : TestBase
             // expectedError
             new UpdateNotPossible(["Some.Package.1.2.3"]),
         ];
+
+        yield return
+        [
+            // output
+            "Could not install package 'Some.Package 1.2.3'. You are trying to install this package into a project that targets 'SomeFramework'",
+            // expectedError
+            new UpdateNotPossible(["Some.Package.1.2.3"]),
+        ];
+
+        yield return
+        [
+            // output
+            "Unable to find a version of 'Some.Package' that is compatible with 'Some.Other.Package 4.5.6 constraint: Some.Package (>= 1.2.3)'",
+            // expectedError
+            new UpdateNotPossible(["Some.Package.1.2.3"]),
+        ];
+
+        yield return
+        [
+            // output
+            "the following error(s) may be blocking the current package operation: 'Some.Package 1.2.3 constraint: Some.Other.Package (>= 4.5.6)'",
+            // expectedError
+            new UpdateNotPossible(["Some.Package.1.2.3"]),
+        ];
     }
 
     public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.295.0
+  version: 0.296.1
 platform: ruby
 authors:
 - Dependabot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.295.0
+        version: 0.296.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.295.0
+        version: 0.296.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -438,6 +438,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/Advisory.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/AllowedUpdate.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/BadRequirement.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/ClosePullRequest.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/CommitOptions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/Condition.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/CreatePullRequest.cs
@@ -455,12 +456,15 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/MarkAsProcessed.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/PrivateSourceAuthenticationFailure.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/PullRequest.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/PullRequestExistsForLatestVersion.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/ReportedDependency.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/ReportedRequirement.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/RequirementSource.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/RequirementsUpdateStrategy.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/SecurityUpdateNotNeeded.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UnknownError.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UpdateNotPossible.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UpdatePullRequest.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UpdatedDependencyList.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/HttpApiHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/IApiHandler.cs
@@ -529,7 +533,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.295.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.296.1
 post_install_message:
 rdoc_options: []
 require_paths: