dependabot-nuget 0.288.0 → 0.290.0

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

@@ -9,7 +9,6 @@ public record ExpectedWorkspaceDiscoveryResult : NativeResult
     public required string Path { get; init; }
     public bool IsSuccess { get; init; } = true;
     public ImmutableArray<ExpectedSdkProjectDiscoveryResult> Projects { get; init; }
-    public ImmutableArray<string> ImportedFiles { get; init; } = [];
     public int? ExpectedProjectCount { get; init; }
     public ExpectedDependencyDiscoveryResult? GlobalJson { get; init; }
     public ExpectedDependencyDiscoveryResult? DotNetToolsJson { get; init; }
@@ -17,10 +16,11 @@ public record ExpectedWorkspaceDiscoveryResult : NativeResult
 
 public record ExpectedSdkProjectDiscoveryResult : ExpectedDependencyDiscoveryResult
 {
-    public ImmutableArray<Property> Properties { get; init; } = [];
-    public ImmutableArray<string> TargetFrameworks { get; init; } = [];
-    public ImmutableArray<string> ReferencedProjectPaths { get; init; } = [];
-    public ImmutableArray<string>? ImportedFiles { get; init; } = null;
+    public required ImmutableArray<Property> Properties { get; init; }
+    public required ImmutableArray<string> TargetFrameworks { get; init; }
+    public required ImmutableArray<string> ReferencedProjectPaths { get; init; }
+    public required ImmutableArray<string> ImportedFiles { get; init; }
+    public required ImmutableArray<string> AdditionalFiles { get; init; }
 }
 
 public record ExpectedDependencyDiscoveryResult : IDiscoveryResultWithDependencies

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

@@ -50,7 +50,9 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFramework", "net8.0", "src/library.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    ReferencedProjectPaths = [],
+                    AdditionalFiles = [],
                 }
             ]
         );
@@ -99,7 +101,12 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFramework", "net8.0", "src/library.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    ReferencedProjectPaths = [],
+                    ImportedFiles = [
+                        "../Directory.Build.targets"
+                    ],
+                    AdditionalFiles = [],
                 }
             ]
         );
@@ -160,7 +167,8 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFramework", "net8.0", "src/library1/library1.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    AdditionalFiles = [],
                 },
                 new()
                 {
@@ -173,7 +181,10 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFramework", "net8.0", "src/library2/library2.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    ReferencedProjectPaths = [],
+                    ImportedFiles = [],
+                    AdditionalFiles = [],
                 }
             ]
         );
@@ -232,7 +243,8 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFramework", "net8.0", "src/library1/library1.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    AdditionalFiles = [],
                 },
                 new()
                 {
@@ -247,7 +259,9 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFramework", "net8.0", "src/library2/library2.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    ReferencedProjectPaths = [],
+                    AdditionalFiles = [],
                 }
             ]
         );
@@ -291,7 +305,9 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFrameworks", "net7.0;net8.0", "src/library.csproj"),
                     ],
-                    TargetFrameworks = ["net7.0", "net8.0"]
+                    TargetFrameworks = ["net7.0", "net8.0"],
+                    ReferencedProjectPaths = [],
+                    AdditionalFiles = [],
                 },
             ]
         );
@@ -334,7 +350,9 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                     [
                         new("TargetFramework", "netstandard2.0", "src/library.csproj"),
                     ],
-                    TargetFrameworks = ["netstandard2.0"]
+                    TargetFrameworks = ["netstandard2.0"],
+                    ReferencedProjectPaths = [],
+                    AdditionalFiles = [],
                 },
             ]
         );
@@ -386,7 +404,9 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                         new("ManagePackageVersionsCentrally", "true", "src/library.csproj"),
                         new("TargetFramework", "net8.0", "src/library.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    ReferencedProjectPaths = [],
+                    AdditionalFiles = [],
                 },
             ]
         );
@@ -451,7 +471,9 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
                         new("ManagePackageVersionsCentrally", "true", "src/library.csproj"),
                         new("TargetFramework", "net8.0", "src/library.csproj"),
                     ],
-                    TargetFrameworks = ["net8.0"]
+                    TargetFrameworks = ["net8.0"],
+                    ReferencedProjectPaths = [],
+                    AdditionalFiles = [],
                 },
             ]
         );

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

@@ -0,0 +1,85 @@
+using NuGet.Versioning;
+
+using NuGetUpdater.Core.Analyze;
+using NuGetUpdater.Core.Run;
+using NuGetUpdater.Core.Run.ApiModel;
+
+using Xunit;
+
+namespace NuGetUpdater.Core.Test.Run;
+
+public class MiscellaneousTests
+{
+    [Theory]
+    [MemberData(nameof(RequirementsFromIgnoredVersionsData))]
+    public void RequirementsFromIgnoredVersions(string dependencyName, Condition[] ignoreConditions, Requirement[] expectedRequirements)
+    {
+        var job = new Job()
+        {
+            Source = new()
+            {
+                Provider = "github",
+                Repo = "some/repo"
+            },
+            IgnoreConditions = ignoreConditions
+        };
+        var actualRequirements = RunWorker.GetIgnoredRequirementsForDependency(job, dependencyName);
+        var actualRequirementsStrings = string.Join("|", actualRequirements.Select(r => r.ToString()));
+        var expectedRequirementsStrings = string.Join("|", expectedRequirements.Select(r => r.ToString()));
+        Assert.Equal(expectedRequirementsStrings, actualRequirementsStrings);
+    }
+
+    public static IEnumerable<object?[]> RequirementsFromIgnoredVersionsData()
+    {
+        yield return
+        [
+            // dependencyName
+            "Some.Package",
+            // ignoredConditions
+            new Condition[]
+            {
+                new()
+                {
+                    DependencyName = "SOME.PACKAGE",
+                    VersionRequirement = Requirement.Parse("> 1.2.3")
+                },
+                new()
+                {
+                    DependencyName = "some.package",
+                    VersionRequirement = Requirement.Parse("<= 2.0.0")
+                },
+                new()
+                {
+                    DependencyName = "Unrelated.Package",
+                    VersionRequirement = Requirement.Parse("= 3.4.5")
+                }
+            },
+            // expectedRequirements
+            new Requirement[]
+            {
+                new IndividualRequirement(">", NuGetVersion.Parse("1.2.3")),
+                new IndividualRequirement("<=", NuGetVersion.Parse("2.0.0")),
+            }
+        ];
+
+        // version requirement is null => ignore all
+        yield return
+        [
+            // dependencyName
+            "Some.Package",
+            // ignoredConditions
+            new Condition[]
+            {
+                new()
+                {
+                    DependencyName = "Some.Package"
+                }
+            },
+            // expectedRequirements
+            new Requirement[]
+            {
+                new IndividualRequirement(">", NuGetVersion.Parse("0.0.0"))
+            }
+        ];
+    }
+}