dependabot-nuget 0.295.0 → 0.296.1

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

@@ -801,40 +801,51 @@ internal static partial class MSBuildHelper
             logger.Warn($"Error determining target frameworks.\nSTDOUT:\n{stdOut}\nSTDERR:\n{stdErr}");
         }
 
-        // There are 3 return values, all uses slightly differently.  Only one will be set, the others will be blank
-        //   ProjectData::TargetFrameworkVersion=.NETFramework,Version=v4.5     // non-SDK projects, commonly with `packages.config`
-        //   ProjectData::TargetFramework=net7.0                                // SDK-style projects
-        //   ProjectData::TargetFrameworks=net7.0;net8.0
-        var tfmPatterns = new Regex[]
+        // There are 2 possible return values:
+        //   1. For SDK-style projects with a single TFM and legacy projects the output will look like:
+        //      ProjectData::TargetFrameworkMoniker=.NETCoreApp,Version=8.0;ProjectData::TargetPlatformMoniker=Windows,Version=7.0
+        //   2. For SDK-style projects with multiple TFMs the output will look like:
+        //      ProjectData::TargetFrameworks=net8.0;net9.0
+        var listedTargetFrameworks = new List<ValueTuple<string, string>>();
+        var listedTfmMatch = Regex.Match(stdOut, "ProjectData::TargetFrameworks=(?<TargetFrameworks>.*)$", RegexOptions.Multiline);
+        if (listedTfmMatch.Success)
         {
-            new Regex("ProjectData::TargetFrameworkVersion=(?<Value>.*)$", RegexOptions.Multiline),
-            new Regex("ProjectData::TargetFramework=(?<Value>.*)$", RegexOptions.Multiline),
-            new Regex("ProjectData::TargetFrameworks=(?<Value>.*)$", RegexOptions.Multiline),
-        };
-        var tfms = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        foreach (var tfmPattern in tfmPatterns)
+            var value = listedTfmMatch.Groups["TargetFrameworks"].Value;
+            var foundTfms = value.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+                .Select(tfm => ValueTuple.Create(tfm, string.Empty))
+                .ToArray();
+            listedTargetFrameworks.AddRange(foundTfms);
+        }
+
+        var individualTfmMatch = Regex.Match(stdOut, "ProjectData::TargetFrameworkMoniker=(?<TargetFrameworkMoniker>[^;]*);ProjectData::TargetPlatformMoniker=(?<TargetPlatformMoniker>.*)$", RegexOptions.Multiline);
+        if (individualTfmMatch.Success)
         {
-            var candidateTfms = tfmPattern.Matches(stdOut)
-                .Select(m => m.Groups["Value"].Value)
-                .SelectMany(v => v.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
-                .Where(v => !string.IsNullOrWhiteSpace(v))
-                .Select(v =>
-                {
-                    try
-                    {
-                        var framework = NuGetFramework.Parse(v);
-                        return framework.GetShortFolderName();
-                    }
-                    catch
-                    {
-                        return string.Empty;
-                    }
-                })
-                .Where(tfm => !string.IsNullOrEmpty(tfm));
-            tfms.AddRange(candidateTfms);
+            var tfm = individualTfmMatch.Groups["TargetFrameworkMoniker"].Value;
+            var tpm = individualTfmMatch.Groups["TargetPlatformMoniker"].Value;
+            listedTargetFrameworks.Add(ValueTuple.Create(tfm, tpm));
         }
 
-        return tfms.ToImmutableArray();
+        var tfms = listedTargetFrameworks.Select(tfpm =>
+            {
+                try
+                {
+                    // Item2 is an optional component that looks like: "Windows,Version=7.0"
+                    var framework = string.IsNullOrWhiteSpace(tfpm.Item2)
+                        ? NuGetFramework.Parse(tfpm.Item1)
+                        : NuGetFramework.ParseComponents(tfpm.Item1, tfpm.Item2);
+                    return framework;
+                }
+                catch
+                {
+                    return null;
+                }
+            })
+            .Where(tfm => tfm is not null)
+            .Select(tfm => tfm!.GetShortFolderName())
+            .OrderBy(tfm => tfm)
+            .ToImmutableArray();
+
+        return tfms;
     }
 
     internal static async Task<Dependency[]> GetAllPackageDependenciesAsync(
@@ -924,7 +935,7 @@ internal static partial class MSBuildHelper
         ThrowOnUnauthenticatedFeed(output);
         ThrowOnMissingFile(output);
         ThrowOnMissingPackages(output);
-        ThrowOnUnresolvableDependencies(output);
+        ThrowOnUpdateNotPossible(output);
     }
 
     private static void ThrowOnUnauthenticatedFeed(string stdout)
@@ -962,13 +973,20 @@ internal static partial class MSBuildHelper
         }
     }
 
-    private static void ThrowOnUnresolvableDependencies(string output)
+    private static void ThrowOnUpdateNotPossible(string output)
     {
-        var unresolvablePackagePattern = new Regex(@"Unable to resolve dependencies\. '(?<PackageName>[^ ]+) (?<PackageVersion>[^']+)'");
-        var match = unresolvablePackagePattern.Match(output);
-        if (match.Success)
+        var patterns = new[]
+        {
+            new Regex(@"Unable to resolve dependencies\. '(?<PackageName>[^ ]+) (?<PackageVersion>[^']+)'"),
+            new Regex(@"Could not install package '(?<PackageName>[^ ]+) (?<PackageVersion>[^']+)'. You are trying to install this package"),
+            new Regex(@"Unable to find a version of '[^']+' that is compatible with '[^ ]+ [^ ]+ constraint: (?<PackageName>[^ ]+) \([^ ]+ (?<PackageVersion>[^)]+)\)'"),
+            new Regex(@"the following error\(s\) may be blocking the current package operation: '(?<PackageName>[^ ]+) (?<PackageVersion>[^ ]+) constraint:"),
+        };
+        var matches = patterns.Select(p => p.Match(output)).Where(m => m.Success);
+        if (matches.Any())
         {
-            throw new UpdateNotPossibleException([$"{match.Groups["PackageName"].Value}.{match.Groups["PackageVersion"].Value}"]);
+            var packages = matches.Select(m => $"{m.Groups["PackageName"].Value}.{m.Groups["PackageVersion"].Value}").Distinct().ToArray();
+            throw new UpdateNotPossibleException(packages);
         }
     }
 

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

@@ -2,28 +2,35 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace NuGetUpdater.Core.Utilities;
 
-public class PathComparer : IEqualityComparer<string>
+public class PathComparer : IComparer<string>, IEqualityComparer<string>
 {
     public static PathComparer Instance { get; } = new PathComparer();
 
-    public bool Equals(string? x, string? y)
+    public int Compare(string? x, string? y)
     {
         x = x?.NormalizePathToUnix();
         y = y?.NormalizePathToUnix();
 
         if (x is null && y is null)
         {
-            return true;
+            return 0;
         }
 
-        if (x is null || y is null)
+        if (x is null)
         {
-            return false;
+            return -1;
         }
 
-        return x.Equals(y, StringComparison.OrdinalIgnoreCase);
+        if (y is null)
+        {
+            return 1;
+        }
+
+        return x.CompareTo(y);
     }
 
+    public bool Equals(string? x, string? y) => Compare(x, y) == 0;
+
     public int GetHashCode([DisallowNull] string obj)
     {
         return obj.NormalizePathToUnix().GetHashCode();

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/VersionFinderTests.cs

@@ -1,6 +1,11 @@
+using System.Collections.Immutable;
+
+using NuGet.Frameworks;
 using NuGet.Versioning;
 
 using NuGetUpdater.Core.Analyze;
+using NuGetUpdater.Core.Test.Update;
+using NuGetUpdater.Core.Test.Utilities;
 
 using Xunit;
 
@@ -190,4 +195,32 @@ public class VersionFinderTests
 
         Assert.True(result);
     }
+
+    [Fact]
+    public async Task TargetFrameworkIsConsideredForUpdatedVersions()
+    {
+        // arrange
+        using var tempDir = new TemporaryDirectory();
+        await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(
+            [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net8.0"), // can only update to this version because of the tfm
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "3.0.0", "net9.0"),
+            ],
+            tempDir.DirectoryPath);
+
+        // act
+        var projectTfms = new[] { "net8.0" }.Select(NuGetFramework.Parse).ToImmutableArray();
+        var packageId = "Some.Package";
+        var currentVersion = NuGetVersion.Parse("1.0.0");
+        var logger = new TestLogger();
+        var nugetContext = new NuGetContext(tempDir.DirectoryPath);
+        var versionResult = await VersionFinder.GetVersionsAsync(projectTfms, packageId, currentVersion, nugetContext, logger, CancellationToken.None);
+        var versions = versionResult.GetVersions();
+
+        // assert
+        var actual = versions.Select(v => v.ToString()).ToArray();
+        var expected = new[] { "2.0.0" };
+        AssertEx.Equal(expected, actual);
+    }
 }

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

@@ -1131,7 +1131,7 @@ public partial class DiscoveryWorkerTests
                     ("src/project.csproj", """
                         <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
-                            <TargetFrameworks>net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst</TargetFrameworks>
+                            <TargetFrameworks>net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst;net8.0-windows</TargetFrameworks>
                           </PropertyGroup>
                           <ItemGroup>
                             <PackageReference Include="Some.Package" Version="1.2.3" />
@@ -1151,11 +1151,12 @@ public partial class DiscoveryWorkerTests
                                 new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0-ios"], IsDirect: true),
                                 new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0-maccatalyst"], IsDirect: true),
                                 new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0-macos"], IsDirect: true),
+                                new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0-windows"], IsDirect: true),
                             ],
                             Properties = [
-                                new("TargetFrameworks", "net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst", @"src/project.csproj"),
+                                new("TargetFrameworks", "net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst;net8.0-windows", @"src/project.csproj"),
                             ],
-                            TargetFrameworks = ["net8.0-android", "net8.0-ios", "net8.0-maccatalyst", "net8.0-macos"],
+                            TargetFrameworks = ["net8.0-android", "net8.0-ios", "net8.0-maccatalyst", "net8.0-macos", "net8.0-windows"],
                             ReferencedProjectPaths = [],
                             ImportedFiles = [],
                             AdditionalFiles = [],
@@ -1310,6 +1311,8 @@ public partial class DiscoveryWorkerTests
 
                           <PropertyGroup>
                             <TargetFramework>net8.0</TargetFramework>
+                            <!-- the SDK turns `<TargetFramework>net8.0</TargetFramework>` into the following -->
+                            <TargetFrameworkMoniker>.NETCoreApp,Version=8.0</TargetFrameworkMoniker>
                           </PropertyGroup>
 
                           <ItemGroup>
@@ -1360,7 +1363,8 @@ public partial class DiscoveryWorkerTests
                                 new("Test.Only.Package", "1.0.99", DependencyType.Unknown, TargetFrameworks: ["net8.0"], IsTransitive: true)
                             ],
                             Properties = [
-                                new("TargetFramework", "net8.0", "project.csproj")
+                                new("TargetFramework", "net8.0", "project.csproj"),
+                                new("TargetFrameworkMoniker", ".NETCoreApp,Version=8.0", "project.csproj"),
                             ],
                             TargetFrameworks = ["net8.0"],
                             ReferencedProjectPaths = [],

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

@@ -1,8 +1,10 @@
+using System.Collections.Immutable;
 using System.Text.Json;
 
 using NuGet.Versioning;
 
 using NuGetUpdater.Core.Analyze;
+using NuGetUpdater.Core.Discover;
 using NuGetUpdater.Core.Run;
 using NuGetUpdater.Core.Run.ApiModel;
 
@@ -41,6 +43,59 @@ public class MiscellaneousTests
         Assert.Equal(expectedString, actualString);
     }
 
+    [Theory]
+    [MemberData(nameof(GetIncrementMetricData))]
+    public void GetIncrementMetric(Job job, IncrementMetric expected)
+    {
+        var actual = RunWorker.GetIncrementMetric(job);
+        var actualJson = HttpApiHandler.Serialize(actual);
+        var expectedJson = HttpApiHandler.Serialize(expected);
+        Assert.Equal(expectedJson, actualJson);
+    }
+
+    [Theory]
+    [MemberData(nameof(GetUpdateOperationsData))]
+    public void GetUpdateOperations(WorkspaceDiscoveryResult discovery, (string ProjectPath, string DependencyName)[] expectedUpdateOperations)
+    {
+        var updateOperations = RunWorker.GetUpdateOperations(discovery).ToArray();
+        var actualUpdateOperations = updateOperations.Select(uo => (uo.ProjectPath, uo.Dependency.Name)).ToArray();
+        Assert.Equal(expectedUpdateOperations, actualUpdateOperations);
+    }
+
+    public static IEnumerable<object[]> GetUpdateOperationsData()
+    {
+        static ProjectDiscoveryResult GetProjectDiscovery(string filePath, params string[] dependencyNames)
+        {
+            return new()
+            {
+                FilePath = filePath,
+                Dependencies = dependencyNames.Select(d => new Dependency(d, "1.0.0", DependencyType.PackageReference)).ToImmutableArray(),
+                ImportedFiles = [],
+                AdditionalFiles = [],
+            };
+        }
+
+        yield return
+        [
+            new WorkspaceDiscoveryResult()
+            {
+                Path = "",
+                Projects = [
+                    GetProjectDiscovery("src/Library.csproj", "Package.B", "Package.C"),
+                    GetProjectDiscovery("src/Common.csproj", "Package.A", "Package.C", "Package.D"),
+                ]
+            },
+            new (string, string)[]
+            {
+                ("/src/Common.csproj", "Package.A"),
+                ("/src/Library.csproj", "Package.B"),
+                ("/src/Common.csproj", "Package.C"),
+                ("/src/Library.csproj", "Package.C"),
+                ("/src/Common.csproj", "Package.D"),
+            },
+        ];
+    }
+
     public static IEnumerable<object?[]> RequirementsFromIgnoredVersionsData()
     {
         yield return
@@ -143,4 +198,124 @@ public class MiscellaneousTests
             }
         ];
     }
+
+    public static IEnumerable<object?[]> GetIncrementMetricData()
+    {
+        static Job GetJob(AllowedUpdate[] allowed, bool securityUpdatesOnly, bool updatingAPullRequest)
+        {
+            return new Job()
+            {
+                AllowedUpdates = allowed.ToImmutableArray(),
+                Source = new()
+                {
+                    Provider = "github",
+                    Repo = "some/repo"
+                },
+                SecurityUpdatesOnly = securityUpdatesOnly,
+                UpdatingAPullRequest = updatingAPullRequest,
+            };
+        }
+
+        // version update
+        yield return
+        [
+            GetJob(
+                allowed: [new AllowedUpdate() { UpdateType = UpdateType.All }],
+                securityUpdatesOnly: false,
+                updatingAPullRequest: false),
+            new IncrementMetric()
+            {
+                Metric = "updater.started",
+                Tags =
+                {
+                    ["operation"] = "group_update_all_versions"
+                }
+            }
+        ];
+
+        // version update - existing pr
+        yield return
+        [
+            GetJob(
+                allowed: [new AllowedUpdate() { UpdateType = UpdateType.All }],
+                securityUpdatesOnly: false,
+                updatingAPullRequest: true),
+            new IncrementMetric()
+            {
+                Metric = "updater.started",
+                Tags =
+                {
+                    ["operation"] = "update_version_pr"
+                }
+            }
+        ];
+
+        // create security pr - allowed security update
+        yield return
+        [
+            GetJob(
+                allowed: [new AllowedUpdate() { UpdateType = UpdateType.All }, new AllowedUpdate() { UpdateType = UpdateType.Security }],
+                securityUpdatesOnly: false,
+                updatingAPullRequest: false),
+            new IncrementMetric()
+            {
+                Metric = "updater.started",
+                Tags =
+                {
+                    ["operation"] = "create_security_pr"
+                }
+            }
+        ];
+
+        // create security pr - security only
+        yield return
+        [
+            GetJob(
+                allowed: [new AllowedUpdate() { UpdateType = UpdateType.All } ],
+                securityUpdatesOnly: true,
+                updatingAPullRequest: false),
+            new IncrementMetric()
+            {
+                Metric = "updater.started",
+                Tags =
+                {
+                    ["operation"] = "create_security_pr"
+                }
+            }
+        ];
+
+        // update security pr - allowed security update
+        yield return
+        [
+            GetJob(
+                allowed: [new AllowedUpdate() { UpdateType = UpdateType.All }, new AllowedUpdate() { UpdateType = UpdateType.Security } ],
+                securityUpdatesOnly: false,
+                updatingAPullRequest: true),
+            new IncrementMetric()
+            {
+                Metric = "updater.started",
+                Tags =
+                {
+                    ["operation"] = "update_security_pr"
+                }
+            }
+        ];
+
+        // update security pr - security only
+        yield return
+        [
+            GetJob(
+                allowed: [new AllowedUpdate() { UpdateType = UpdateType.All } ],
+                securityUpdatesOnly: true,
+                updatingAPullRequest: true),
+            new IncrementMetric()
+            {
+                Metric = "updater.started",
+                Tags =
+                {
+                    ["operation"] = "update_security_pr"
+                }
+            }
+        ];
+    }
 }

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

@@ -1147,7 +1147,7 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "1.0.0",
-                                    File = "/some-dir/ProjectB/ProjectB.csproj",
+                                    File = "/some-dir/ProjectA/ProjectA.csproj",
                                     Groups = ["dependencies"],
                                 }
                             ]
@@ -1161,7 +1161,7 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "2.0.0",
-                                    File = "/some-dir/ProjectB/ProjectB.csproj",
+                                    File = "/some-dir/ProjectA/ProjectA.csproj",
                                     Groups = ["dependencies"],
                                 }
                             ]
@@ -1175,7 +1175,7 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "1.0.0",
-                                    File = "/some-dir/ProjectA/ProjectA.csproj",
+                                    File = "/some-dir/ProjectB/ProjectB.csproj",
                                     Groups = ["dependencies"],
                                 }
                             ]
@@ -1189,7 +1189,7 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "2.0.0",
-                                    File = "/some-dir/ProjectA/ProjectA.csproj",
+                                    File = "/some-dir/ProjectB/ProjectB.csproj",
                                     Groups = ["dependencies"],
                                 }
                             ]
@@ -1218,7 +1218,7 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "1.0.1",
-                                    File = "/some-dir/ProjectB/ProjectB.csproj",
+                                    File = "/some-dir/ProjectA/ProjectA.csproj",
                                     Groups = ["dependencies"],
                                     Source = new()
                                     {
@@ -1233,35 +1233,35 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "1.0.0",
-                                    File = "/some-dir/ProjectB/ProjectB.csproj",
+                                    File = "/some-dir/ProjectA/ProjectA.csproj",
                                     Groups = ["dependencies"],
                                 }
                             ],
                         },
                         new ReportedDependency()
                         {
-                            Name = "Some.Package2",
-                            Version = "2.0.1",
+                            Name = "Some.Package",
+                            Version = "1.0.1",
                             Requirements =
                             [
                                 new ReportedRequirement()
                                 {
-                                    Requirement = "2.0.1",
+                                    Requirement = "1.0.1",
                                     File = "/some-dir/ProjectB/ProjectB.csproj",
                                     Groups = ["dependencies"],
                                     Source = new()
                                     {
-                                        SourceUrl = "https://nuget.example.com/some-package2",
+                                        SourceUrl = "https://nuget.example.com/some-package",
                                         Type = "nuget_repo",
                                     }
                                 }
                             ],
-                            PreviousVersion = "2.0.0",
+                            PreviousVersion = "1.0.0",
                             PreviousRequirements =
                             [
                                 new ReportedRequirement()
                                 {
-                                    Requirement = "2.0.0",
+                                    Requirement = "1.0.0",
                                     File = "/some-dir/ProjectB/ProjectB.csproj",
                                     Groups = ["dependencies"],
                                 }
@@ -1269,28 +1269,28 @@ public class RunWorkerTests
                         },
                         new ReportedDependency()
                         {
-                            Name = "Some.Package",
-                            Version = "1.0.1",
+                            Name = "Some.Package2",
+                            Version = "2.0.1",
                             Requirements =
                             [
                                 new ReportedRequirement()
                                 {
-                                    Requirement = "1.0.1",
+                                    Requirement = "2.0.1",
                                     File = "/some-dir/ProjectA/ProjectA.csproj",
                                     Groups = ["dependencies"],
                                     Source = new()
                                     {
-                                        SourceUrl = "https://nuget.example.com/some-package",
+                                        SourceUrl = "https://nuget.example.com/some-package2",
                                         Type = "nuget_repo",
                                     }
                                 }
                             ],
-                            PreviousVersion = "1.0.0",
+                            PreviousVersion = "2.0.0",
                             PreviousRequirements =
                             [
                                 new ReportedRequirement()
                                 {
-                                    Requirement = "1.0.0",
+                                    Requirement = "2.0.0",
                                     File = "/some-dir/ProjectA/ProjectA.csproj",
                                     Groups = ["dependencies"],
                                 }
@@ -1305,7 +1305,7 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "2.0.1",
-                                    File = "/some-dir/ProjectA/ProjectA.csproj",
+                                    File = "/some-dir/ProjectB/ProjectB.csproj",
                                     Groups = ["dependencies"],
                                     Source = new()
                                     {
@@ -1320,7 +1320,7 @@ public class RunWorkerTests
                                 new ReportedRequirement()
                                 {
                                     Requirement = "2.0.0",
-                                    File = "/some-dir/ProjectA/ProjectA.csproj",
+                                    File = "/some-dir/ProjectB/ProjectB.csproj",
                                     Groups = ["dependencies"],
                                 }
                             ],
@@ -1945,7 +1945,7 @@ public class RunWorkerTests
                     Metric = "updater.started",
                     Tags = new()
                     {
-                        ["operation"] = "group_update_all_versions"
+                        ["operation"] = "create_security_pr"
                     }
                 },
                 new CreatePullRequest()