dependabot-nuget 0.390.0 → 0.392.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dea266e0435bd95a73db843ff9091584a781e763cdfa5e4af2fb2ecedc9043d
-  data.tar.gz: 785af3809b07b9e07628389cfe491b8bfa1509f7a438cd512b25b78650bab691
+  metadata.gz: d1c860537bd6a457769abe727cca7534d55c740e24b64aa310187f0740c68ad2
+  data.tar.gz: e21573e419953d0fec2d53f55663f02f5dba6d1d27de9b706ba4382cc4e42294
 SHA512:
-  metadata.gz: 3701f40176861870e1cc1d613377c5dcf8e8d7f9a58776749e7ecb0c36e80dd6fa24376708174aa7d546f727e46b4d6ebd9f0d053c4f7aa7f79dc2edf53bc7aa
-  data.tar.gz: 35adfa4d731c4cc3c72279531b44bf5ce00eb5c06bf0e83c263ed1509c276ec742d3932718d0e01f800bd702233b419d43f97a36ba6b3d0fd38fc7382c754b95
+  metadata.gz: 1d3cea77956ca9291560f34c25537828c19a1f567eb13bfa4fbf4818b15543108734fa5910105c132492ec04b59468388b7bfa869534bf6416665f9cc108f65d
+  data.tar.gz: a9c89cbd91626974ae21dab5897d8c62d14efe9ca9f5af54bfe900b723b91d6b45f57048345df16672dfafb069309a33683a793e5c33b7ca795c749494996e7b

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs

@@ -178,6 +178,9 @@ internal static class SdkProjectDiscovery
                     args.Add($"/p:InnerTargets=\"{string.Join(";", requiredTargets)}\"");
                 }
 
+                // only execute the desired targets on transitive project references
+                args.Add($"/p:ProjectReferenceBuildTargets=\"{string.Join(";", requiredTargets)}\"");
+
                 // inject various props and targets to help with discovery
                 var dependencyDiscoveryTargetingPacksPropsPath = MSBuildHelper.GetFileFromRuntimeDirectory("DependencyDiscoveryTargetingPacks.props");
                 var dependencyDiscoveryTargetsPath = MSBuildHelper.GetFileFromRuntimeDirectory("DependencyDiscovery.targets");

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

@@ -43,7 +43,6 @@ public sealed record Job
     public bool RepoPrivate { get; init; } = false;
     public CommitOptions? CommitMessageOptions { get; init; } = null;
     public ImmutableArray<Dictionary<string, object>>? CredentialsMetadata { get; init; } = null;
-    public int MaxUpdaterRunTime { get; init; } = 0;
     public Cooldown? Cooldown { get; init; } = null;
 
     public ImmutableArray<string> GetRawDirectories()

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/PullRequestBodyGenerator/IHttpFetcher.cs

@@ -11,18 +11,18 @@ internal static class IHttpFetcherExtensions
 {
     public static async Task<JsonElement?> GetJsonElementAsync(this IHttpFetcher fetcher, string url)
     {
-        var jsonString = await fetcher.GetStringAsync(url);
-        if (jsonString is null)
-        {
-            return null;
-        }
-
         try
         {
+            var jsonString = await fetcher.GetStringAsync(url);
+            if (jsonString is null)
+            {
+                return null;
+            }
+
             var json = JsonSerializer.Deserialize<JsonElement>(jsonString);
             return json;
         }
-        catch (JsonException)
+        catch (Exception)
         {
             return null;
         }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs

@@ -557,7 +557,6 @@ internal static partial class MSBuildHelper
         }
 
         var targets = stdOut.Split('\n')
-            .Skip(1) // first line is msbuild info
             .Select(l => l.Trim())
             .Where(l => !string.IsNullOrEmpty(l))
             .ToHashSet(StringComparer.OrdinalIgnoreCase);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs

@@ -150,14 +150,22 @@ public class DiscoveryWorkerTestBase : TestBase
             }).ToArray();
             Assert.True(matchingDependencies.Length == 1, $"""
                 Unable to find 1 dependency matching; found {matchingDependencies.Length}:
-                    Name: {expectedDependency.Name}
-                    Type: {expectedDependency.Type}
-                    Version: {expectedDependency.Version}
-                    IsTopLevel: {expectedDependency.IsTopLevel}
-                    TargetFrameworks: {string.Join(", ", expectedDependency.TargetFrameworks ?? [])}
-                Found:{"\n\t"}{string.Join("\n\t", actualDependencies)}
+                {DependencyDisplayString(expectedDependency)}
+                Found:
+                {string.Join("\n    ----\n", actualDependencies.Select(DependencyDisplayString))}
                 """);
         }
+
+        static string DependencyDisplayString(Dependency d)
+        {
+            return $"""
+                    Name: {d.Name}
+                    Type: {d.Type}
+                    Version: {d.Version}
+                    IsTopLevel: {d.IsTopLevel}
+                    TargetFrameworks: {string.Join(", ", d.TargetFrameworks ?? [])}
+                """;
+        }
     }
 
     protected static async Task<WorkspaceDiscoveryResult> RunDiscoveryAsync(TestFile[] files, Func<string, Task<WorkspaceDiscoveryResult>> action)

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs

@@ -73,6 +73,7 @@ public partial class DiscoveryWorkerTests
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
                     MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net8.0"),
+                    MockNuGetPackage.WellKnownHostPackage("Microsoft.NETCore.App", "net8.0"),
                 ],
                 workspacePath: "",
                 files: [
@@ -955,5 +956,104 @@ public partial class DiscoveryWorkerTests
                 }
             );
         }
+
+        [Fact]
+        public async Task RestoreDoesNotCallBuildOnTransitiveProjectReference()
+        {
+            // Ensure the `Build` target isn't invoked in transitive project references.
+
+            // To test this a custom target is added with `BeforeTargets="Build"` which writes a sentinel file to disk
+            // so we have to ensure that file doesn't get created.
+            using var tempDir = new TemporaryDirectory();
+            var sentinelFile1 = Path.Combine(tempDir.DirectoryPath, "sentinel1.txt");
+            var sentinelFile2 = Path.Combine(tempDir.DirectoryPath, "sentinel2.txt");
+
+            await TestDiscoveryAsync(
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net10.0"),
+                ],
+                workspacePath: "src/client",
+                files: [
+                    ("Directory.Build.props", "<Project />"),
+                    ("Directory.Build.targets", "<Project />"),
+                    ("Directory.Packages.props", """
+                        <Project>
+                          <PropertyGroup>
+                            <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+                          </PropertyGroup>
+                        </Project>
+                        """),
+                    ("src/client/client.csproj", $$"""
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>net10.0</TargetFramework>
+                          </PropertyGroup>
+                          <ItemGroup>
+                            <ProjectReference Include="..\common\common.csproj" />
+                          </ItemGroup>
+                          <Target Name="BuildSentinel" BeforeTargets="Build">
+                            <WriteLinesToFile File="{{sentinelFile1}}" Lines="Build target was called" Overwrite="true" />
+                          </Target>
+                        </Project>
+                        """),
+                    ("src/common/common.csproj", $$"""
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>net10.0</TargetFramework>
+                          </PropertyGroup>
+                          <ItemGroup>
+                            <PackageReference Include="Some.Package" Version="1.0.0" />
+                          </ItemGroup>
+                          <Target Name="BuildSentinel" BeforeTargets="Build">
+                            <WriteLinesToFile File="{{sentinelFile2}}" Lines="Build target was called" Overwrite="true" />
+                          </Target>
+                        </Project>
+                        """),
+                ],
+                expectedResult: new()
+                {
+                    Path = "src/client",
+                    Projects = [
+                        new()
+                        {
+                            FilePath = "client.csproj",
+                            TargetFrameworks = ["net10.0"],
+                            Dependencies = [
+                                new("Some.Package", "1.0.0", DependencyType.Unknown, TargetFrameworks: ["net10.0"], IsTopLevel: false),
+                            ],
+                            ReferencedProjectPaths = [
+                                "../common/common.csproj"
+                            ],
+                            ImportedFiles = [
+                                "../../Directory.Build.props",
+                                "../../Directory.Build.targets",
+                                "../../Directory.Packages.props"
+                            ],
+                            AdditionalFiles = [],
+                        },
+                        new()
+                        {
+                            FilePath = "../common/common.csproj",
+                            TargetFrameworks = ["net10.0"],
+                            Dependencies = [
+                                new("Some.Package", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net10.0"], IsTopLevel: true),
+                            ],
+                            ReferencedProjectPaths = [],
+                            ImportedFiles = [
+                                "../../Directory.Build.props",
+                                "../../Directory.Build.targets",
+                                "../../Directory.Packages.props"
+                            ],
+                            AdditionalFiles = [],
+                        }
+                    ],
+                }
+            );
+
+            // Verify that the Build target was not called (and BeforeTargets="Build") by checking that the sentinel file was not created
+            Assert.False(File.Exists(sentinelFile1), "Build target should not have been called on primary project");
+            Assert.False(File.Exists(sentinelFile2), "Build target should not have been called on referenced project");
+        }
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/MockNuGetPackage.cs

@@ -409,7 +409,7 @@ namespace NuGetUpdater.Core.Test
 
         public static MockNuGetPackage WellKnownHostPackage(string packageName, string targetFramework, (string Path, byte[] Content)[]? files = null)
         {
-            string key = $"{packageName}/{targetFramework}";
+            string key = $"{packageName}.Host/{targetFramework}";
             if (!WellKnownPackages.ContainsKey(key))
             {
                 // for the current SDK, the file `Microsoft.NETCoreSdk.BundledVersions.props` contains the version of the
@@ -438,7 +438,7 @@ namespace NuGetUpdater.Core.Test
                 }
 
                 string expectedVersion = matchingAppHostPack.Attribute("AppHostPackVersion")!.Value;
-                return new(
+                WellKnownPackages[key] = new(
                     $"{packageName}.Host.{expectedRid}",
                     expectedVersion,
                     Files: files

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestBodyGenerator/DetailedPullRequestBodyGeneratorTests.cs

@@ -1088,6 +1088,56 @@ public class DetailedPullRequestBodyGeneratorTests
         );
     }
 
+    [Fact]
+    public async Task ExceptionDuringDetailFetchDoesNotAbortDetailsBuilding()
+    {
+        // arrange
+        var throwingHttpFetcher = new TestHttpFetcher(_ => throw new HttpRequestException("this endpoint cannot be queried"));
+        var prGenerator = new DetailedPullRequestBodyGenerator(throwingHttpFetcher);
+        var job = new Job()
+        {
+            Source = new()
+            {
+                Provider = "github",
+                Repo = "test/repo"
+            },
+        };
+        var updateOperationsPerformed = ImmutableArray.Create<UpdateOperationBase>(
+            new DirectUpdate()
+            {
+                DependencyName = "Some.Dependency",
+                OldVersion = NuGetVersion.Parse("1.0.0"),
+                NewVersion = NuGetVersion.Parse("2.0.0"),
+                UpdatedFiles = []
+            }
+        );
+        var updatedDependencies = ImmutableArray.Create(
+            new ReportedDependency()
+            {
+                Name = "Some.Dependency",
+                PreviousVersion = "1.0.0",
+                Version = "2.0.0",
+                Requirements = [
+                    new ReportedRequirement()
+                    {
+                        File = "",
+                        Requirement = "2.0.0",
+                        Source = new()
+                        {
+                            SourceUrl = "https://github.com/Some.Owner/Some.Dependency",
+                        },
+                    }
+                ]
+            }
+        );
+
+        // act
+        var prBody = await prGenerator.GeneratePullRequestBodyTextAsync(job, updateOperationsPerformed, updatedDependencies);
+
+        // assert
+        Assert.Contains("No release notes found for this version range.", prBody);
+    }
+
     private static async Task TestAsync(
         ImmutableArray<UpdateOperationBase> updateOperationsPerformed,
         ImmutableArray<ReportedDependency> updatedDependencies,
@@ -1108,7 +1158,7 @@ public class DetailedPullRequestBodyGeneratorTests
 
         // act
         var responses = httpResponses.ToDictionary(x => x.Url, x => x.Body);
-        var httpFetcher = new TestHttpFetcher(responses);
+        var httpFetcher = new TestStringResponseHttpFetcher(responses);
         var generator = new DetailedPullRequestBodyGenerator(httpFetcher);
         var actualBody = await generator.GeneratePullRequestBodyTextAsync(job, updateOperationsPerformed, updatedDependencies);
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestBodyGenerator/TestHttpFetcher.cs

@@ -4,11 +4,11 @@ namespace NuGetUpdater.Core.Test.Run.PullRequestBodyGenerator;
 
 internal class TestHttpFetcher : IHttpFetcher
 {
-    private readonly Dictionary<string, string> _responses;
+    private readonly Func<string, string?> _responseHandler;
 
-    public TestHttpFetcher(Dictionary<string, string> responses)
+    public TestHttpFetcher(Func<string, string?> responseHandler)
     {
-        _responses = responses;
+        _responseHandler = responseHandler;
     }
 
     public void Dispose()
@@ -17,7 +17,7 @@ internal class TestHttpFetcher : IHttpFetcher
 
     public Task<string?> GetStringAsync(string url)
     {
-        _responses.TryGetValue(url, out var response);
+        var response = _responseHandler(url);
         return Task.FromResult(response);
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestBodyGenerator/TestStringResponseHttpFetcher.cs

@@ -0,0 +1,22 @@
+namespace NuGetUpdater.Core.Test.Run.PullRequestBodyGenerator;
+
+internal class TestStringResponseHttpFetcher : TestHttpFetcher
+{
+    public TestStringResponseHttpFetcher(Dictionary<string, string> responses)
+        : base(BuildResponseGenerator(responses))
+    {
+    }
+
+    private static Func<string, string?> BuildResponseGenerator(Dictionary<string, string> responses)
+    {
+        return new Func<string, string?>(url =>
+        {
+            if (responses.TryGetValue(url, out var response))
+            {
+                return response;
+            }
+
+            return null;
+        });
+    }
+}

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

@@ -55,8 +55,7 @@ public class SerializationTests : TestBase
                     "type": "git_source",
                     "replaces-base": false
                   }
-                ],
-                "max-updater-run-time": 0
+                                ]
               }
             }
             """);

data/helpers/lib/NuGetUpdater/global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
     "// comment": "this version should be kept in sync with the files `.devcontainer/devcontainer.json` and `nuget/Dockerfile`",
-    "version": "10.0.103",
+    "version": "10.0.400",
     "rollForward": "latestMinor"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.390.0
+  version: 0.392.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.390.0
+        version: 0.392.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.390.0
+        version: 0.392.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -343,6 +343,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestBodyGenerator/DetailedPullRequestBodyGeneratorTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestBodyGenerator/IPackageDetailFinderTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestBodyGenerator/TestHttpFetcher.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestBodyGenerator/TestStringResponseHttpFetcher.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/PullRequestTextTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/RunWorkerTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/SerializationTests.cs
@@ -581,7 +582,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.390.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.392.0
 rdoc_options: []
 require_paths:
 - lib