dependabot-nuget 0.300.0 → 0.301.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 332ca34b57d20f0c5690563f3aeb969fb638fb8a9a5e02e569dc1360ef5ad066
-  data.tar.gz: 7dba4cc1963936c3b0b32dfa845e1285cb3bee679429da04c7cdad13590fc9dc
+  metadata.gz: 1ed2461d30ee17764d58b1b7b664156760ca001e107ffafc1125540ed6acbbfe
+  data.tar.gz: 66a59a3219fd47155367e43c646acbd91ed72e3049c95a3d7655f55ffdaf9c84
 SHA512:
-  metadata.gz: 7b7a1770111410a3a3c9c7281e8e275f485e977e8c57290f7ea1d5e86219588d640bb82bf5c5f6d0a65b8b8a275edb4aadd051c0cc953df3cb62edc8fdf25a8d
-  data.tar.gz: 1b2ed4ce448d6a239c28d3b448fa73096b211a03dbd8083bbc6168c6655c3cb5d3d76d07262c3e0aeb9f7ccd8a58d7372f6dd21dc2ce6dc428160313bb8b653f
+  metadata.gz: 30128ca31d2c0d16805a426f31cee881c7a67a2f33d764ca1055094fe4365fc804d6c0da7558be82ba68e558c7781a866ea7eb7324d35fbc953b6cf1d6afb17b
+  data.tar.gz: 943cef0fa6b587af0a2a93d78b04ce90fd6ba329223cbc9c596ab1f6692dff8904cbde43781e09191631217cbe4a4f311be8a8ef9188b174da9b0f979ec81347

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/DiscoverCommand.cs

@@ -28,6 +28,7 @@ internal static class DiscoverCommand
 
         command.SetHandler(async (jobId, jobPath, repoRoot, workspace, outputPath) =>
         {
+            MSBuildHelper.RegisterMSBuild(repoRoot.FullName, repoRoot.FullName);
             var (experimentsManager, error) = await ExperimentsManager.FromJobFileAsync(jobId, jobPath.FullName);
             if (error is not null)
             {

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

@@ -109,6 +109,8 @@ internal static class SdkProjectDiscovery
                         $"/p:TargetFramework={tfm}",
                         $"/p:CustomAfterMicrosoftCommonCrossTargetingTargets={dependencyDiscoveryTargetsPath}",
                         $"/p:CustomAfterMicrosoftCommonTargets={dependencyDiscoveryTargetsPath}",
+                        "/p:TreatWarningsAsErrors=false", // if using CPM and a project also sets TreatWarningsAsErrors to true, this can cause discovery to fail; explicitly don't allow that
+                        "/p:MSBuildTreatWarningsAsErrors=false",
                         $"/bl:{binLogPath}"
                     };
                     var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(args, startingProjectDirectory, experimentsManager);

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

@@ -3,7 +3,7 @@ using System.Text.Json.Serialization;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
 
-public sealed record ClosePullRequest
+public sealed record ClosePullRequest : MessageBase
 {
     [JsonPropertyName("dependency-names")]
     public required ImmutableArray<string> DependencyNames { get; init; }

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

@@ -1,8 +1,12 @@
+using System.Text.Json.Serialization;
+
 namespace NuGetUpdater.Core.Run.ApiModel;
 
 public record CommitOptions
 {
     public string? Prefix { get; init; } = null;
     public string? PrefixDevelopment { get; init; } = null;
-    public bool? IncludeScope { get; init; } = null;
+
+    [JsonConverter(typeof(CommitOptions_IncludeScopeConverter))]
+    public bool IncludeScope { get; init; } = false;
 }

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

@@ -2,7 +2,7 @@ using System.Text.Json.Serialization;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
 
-public sealed record CreatePullRequest
+public sealed record CreatePullRequest : MessageBase
 {
     public required ReportedDependency[] Dependencies { get; init; }
     [JsonPropertyName("updated-dependency-files")]

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

@@ -5,5 +5,5 @@ namespace NuGetUpdater.Core.Run.ApiModel;
 public record GroupPullRequest
 {
     public required string DependencyGroupName { get; init; }
-    public required ImmutableArray<PullRequest> Dependencies { get; init; }
+    public required ImmutableArray<PullRequestDependency> Dependencies { get; init; }
 }

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

@@ -3,6 +3,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 
 using NuGet.Credentials;
+using NuGet.Versioning;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
 
@@ -16,7 +17,7 @@ public sealed record Job
     public ImmutableArray<DependencyGroup> DependencyGroups { get; init; } = [];
     public ImmutableArray<string>? Dependencies { get; init; } = null;
     public string? DependencyGroupToRefresh { get; init; } = null;
-    public ImmutableArray<ImmutableArray<PullRequest>> ExistingPullRequests { get; init; } = [];
+    public ImmutableArray<PullRequest> ExistingPullRequests { get; init; } = [];
     public ImmutableArray<GroupPullRequest> ExistingGroupPullRequests { get; init; } = [];
     public Dictionary<string, object>? Experiments { get; init; } = null;
     public Condition[] IgnoreConditions { get; init; } = [];
@@ -54,6 +55,40 @@ public sealed record Job
             yield return "/";
         }
     }
+
+    public ImmutableArray<Tuple<string?, ImmutableArray<PullRequestDependency>>> GetAllExistingPullRequests()
+    {
+        var existingPullRequests = ExistingGroupPullRequests
+            .Select(pr => Tuple.Create((string?)pr.DependencyGroupName, pr.Dependencies))
+            .Concat(
+                ExistingPullRequests
+                .Select(pr => Tuple.Create((string?)null, pr.Dependencies)))
+            .ToImmutableArray();
+        return existingPullRequests;
+    }
+
+    public Tuple<string?, ImmutableArray<PullRequestDependency>>? GetExistingPullRequestForDependency(Dependency dependency)
+    {
+        if (dependency.Version is null)
+        {
+            return null;
+        }
+
+        var dependencyVersion = NuGetVersion.Parse(dependency.Version);
+        var existingPullRequests = GetAllExistingPullRequests();
+        var existingPullRequest = existingPullRequests.FirstOrDefault(pr =>
+        {
+            if (pr.Item2.Length == 1 &&
+                pr.Item2[0].DependencyName.Equals(dependency.Name, StringComparison.OrdinalIgnoreCase) &&
+                pr.Item2[0].DependencyVersion == dependencyVersion)
+            {
+                return true;
+            }
+
+            return false;
+        });
+        return existingPullRequest;
+    }
 }
 
 public class NullAsBoolConverter : JsonConverter<bool>

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

@@ -7,7 +7,7 @@ using NuGetUpdater.Core.Analyze;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
 
-public abstract record JobErrorBase
+public abstract record JobErrorBase : MessageBase
 {
     public JobErrorBase(string type)
     {

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

@@ -0,0 +1,5 @@
+namespace NuGetUpdater.Core.Run.ApiModel;
+
+public abstract record MessageBase
+{
+}

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

@@ -1,11 +1,8 @@
-using NuGet.Versioning;
+using System.Collections.Immutable;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
 
 public record PullRequest
 {
-    public required string DependencyName { get; init; }
-    public required NuGetVersion DependencyVersion { get; init; }
-    public bool DependencyRemoved { get; init; } = false;
-    public string? Directory { get; init; } = null;
+    public ImmutableArray<PullRequestDependency> Dependencies { get; init; } = [];
 }

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

@@ -0,0 +1,11 @@
+using NuGet.Versioning;
+
+namespace NuGetUpdater.Core.Run.ApiModel;
+
+public record PullRequestDependency
+{
+    public required string DependencyName { get; init; }
+    public required NuGetVersion DependencyVersion { get; init; }
+    public bool DependencyRemoved { get; init; } = false;
+    public string? Directory { get; init; } = null;
+}

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

@@ -3,7 +3,7 @@ using System.Text.Json.Serialization;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
 
-public sealed record UpdatePullRequest
+public sealed record UpdatePullRequest : MessageBase
 {
     [JsonPropertyName("base-commit-sha")]
     public required string BaseCommitSha { get; init; }

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

@@ -0,0 +1,29 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace NuGetUpdater.Core.Run;
+
+public class CommitOptions_IncludeScopeConverter : JsonConverter<bool>
+{
+    public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        switch (reader.TokenType)
+        {
+            case JsonTokenType.True:
+                return true;
+            case JsonTokenType.False:
+            case JsonTokenType.Null:
+                return false;
+            case JsonTokenType.String:
+                var stringValue = reader.GetString();
+                return bool.Parse(stringValue!);
+            default:
+                throw new JsonException($"Unexpected token type {reader.TokenType}");
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
+    {
+        writer.WriteBooleanValue(value);
+    }
+}

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

@@ -45,6 +45,11 @@ public class HttpApiHandler : IApiHandler
         await PostAsJson("create_pull_request", createPullRequest);
     }
 
+    public async Task ClosePullRequest(ClosePullRequest closePullRequest)
+    {
+        await PostAsJson("close_pull_request", closePullRequest);
+    }
+
     public async Task UpdatePullRequest(UpdatePullRequest updatePullRequest)
     {
         await PostAsJson("update_pull_request", updatePullRequest);

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

@@ -8,6 +8,7 @@ public interface IApiHandler
     Task UpdateDependencyList(UpdatedDependencyList updatedDependencyList);
     Task IncrementMetric(IncrementMetric incrementMetric);
     Task CreatePullRequest(CreatePullRequest createPullRequest);
+    Task ClosePullRequest(ClosePullRequest closePullRequest);
     Task UpdatePullRequest(UpdatePullRequest updatePullRequest);
     Task MarkAsProcessed(MarkAsProcessed markAsProcessed);
 }

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

@@ -0,0 +1,35 @@
+using System.Collections.Immutable;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+using NuGetUpdater.Core.Run.ApiModel;
+
+namespace NuGetUpdater.Core.Analyze;
+
+public class PullRequestConverter : JsonConverter<PullRequest>
+{
+    public override PullRequest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.StartArray)
+        {
+            throw new JsonException("expected array of pull request dependencies");
+        }
+
+        var dependencies = JsonSerializer.Deserialize<ImmutableArray<PullRequestDependency>>(ref reader, options);
+        return new PullRequest()
+        {
+            Dependencies = dependencies
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, PullRequest value, JsonSerializerOptions options)
+    {
+        writer.WriteStartArray();
+        foreach (var dependency in value.Dependencies)
+        {
+            JsonSerializer.Serialize(writer, dependency, options);
+        }
+
+        writer.WriteEndArray();
+    }
+}

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

@@ -0,0 +1,44 @@
+using NuGet.Versioning;
+
+using NuGetUpdater.Core.Run.ApiModel;
+
+namespace NuGetUpdater.Core.Run;
+
+public class PullRequestTextGenerator
+{
+    public static string GetPullRequestTitle(Job job, ReportedDependency[] updatedDependencies, DependencyFile[] updatedFiles, string? dependencyGroupName = null)
+    {
+        // simple version looks like
+        //   Update Some.Package to 1.2.3
+        // if multiple packages are updated to multiple versions, result looks like:
+        //   Update Package.A to 1.0.0, 2.0.0; Package.B to 3.0.0, 4.0.0
+        var dependencySets = updatedDependencies
+            .GroupBy(d => d.Name, StringComparer.OrdinalIgnoreCase)
+            .OrderBy(g => g.Key, StringComparer.OrdinalIgnoreCase)
+            .Select(g => new
+            {
+                Name = g.Key,
+                Versions = g
+                    .Where(d => d.Version is not null)
+                    .Select(d => d.Version!)
+                    .OrderBy(d => NuGetVersion.Parse(d))
+                    .ToArray()
+            })
+            .ToArray();
+        var updatedPartTitles = dependencySets
+            .Select(d => $"{d.Name} to {string.Join(", ", d.Versions)}")
+            .ToArray();
+        var title = $"{job.CommitMessageOptions?.Prefix}Update {string.Join("; ", updatedPartTitles)}";
+        return title;
+    }
+
+    public static string GetPullRequestCommitMessage(Job job, ReportedDependency[] updatedDependencies, DependencyFile[] updatedFiles, string? dependencyGroupName = null)
+    {
+        return GetPullRequestTitle(job, updatedDependencies, updatedFiles, dependencyGroupName);
+    }
+
+    public static string GetPullRequestBody(Job job, ReportedDependency[] updatedDependencies, DependencyFile[] updatedFiles, string? dependencyGroupName = null)
+    {
+        return GetPullRequestTitle(job, updatedDependencies, updatedFiles, dependencyGroupName);
+    }
+}