dependabot-nuget 0.355.0 → 0.356.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f94f2f647351a7fe7639f186061833a938b2215300babaa9c6243c1d39c1ca
-  data.tar.gz: 6b983c64fbd42200d023004d03f039a68ca8a4b8dace9a63efaea0328f9dd572
+  metadata.gz: 56027ed62ebd863237630c55bc289bd083c5606979410af2925657c88dcbcf75
+  data.tar.gz: bb8377eb0d13add9bc1c6b8240c1d832ac5b2d641b817f19feaa6762b81cb90b
 SHA512:
-  metadata.gz: d646abcf6378faa5aad0be537b8aefab9797daae86a2234efa3eeff1c37ffc275129990f1fc84c2ef8a81b734c376b7be36554f3cf1f1a6e11e9f7d5a1f9f89e
-  data.tar.gz: d4bbc768c4c02cc017a4e066d885fb66b5c7dd00fa5c60b22605a5bf078cfceac52bfa98cc798018aa5a5fe0e3a290b7c38f6fc72d9718527da8b9409967d6d4
+  metadata.gz: 85d78b0b4d3535e570193ea3e19b8ffec884377d46eb1400ad5d6ac2f69d69fd9e9ab883f2f185360f40506500212bcdc4cf9044a2317a4359bee2e4b7942662
+  data.tar.gz: e51b2ff7c2cba64483a1f941c2707b4d2d8dfc7dee7221b1c13aa6cce4766e3b30816858711a7812a0a99e55d4e2a7abd7fb207af4ac2231030a3b4be388f255

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

@@ -9,8 +9,8 @@ internal static class PackagesConfigDiscovery
     public static async Task<PackagesConfigDiscoveryResult?> Discover(string repoRootPath, string workspacePath, string projectPath, ILogger logger)
     {
         var projectDirectory = Path.GetDirectoryName(projectPath)!;
-        var additionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(projectPath, ProjectHelper.PathFormat.Full);
-        var packagesConfigPath = additionalFiles.FirstOrDefault(p => Path.GetFileName(p).Equals(ProjectHelper.PackagesConfigFileName, StringComparison.Ordinal));
+        var additionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(repoRootPath, projectPath, ProjectHelper.PathFormat.Full);
+        var packagesConfigPath = additionalFiles.FirstOrDefault(p => Path.GetFileName(p).Equals(ProjectHelper.PackagesConfigFileName, StringComparison.OrdinalIgnoreCase));
 
         if (packagesConfigPath is null)
         {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/UpdateHandlers/RefreshGroupUpdatePullRequestHandler.cs

@@ -1,3 +1,5 @@
+using System.Collections.Immutable;
+
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Updater;
 
@@ -59,9 +61,13 @@ internal class RefreshGroupUpdatePullRequestHandler : IUpdateHandler
         }
 
         logger.Info($"Starting update for group {group.Name}");
+        await this.ReportUpdaterStarted(apiHandler);
 
         var groupMatcher = group.GetGroupMatcher();
         var jobDependencies = job.Dependencies.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        var updateOperationsPerformed = new List<UpdateOperationBase>();
+        var updatedDependencies = new List<ReportedDependency>();
+        var allUpdatedDependencyFiles = ImmutableArray.Create<DependencyFile>();
         foreach (var directory in job.GetAllDirectories(repoContentsPath.FullName))
         {
             var discoveryResult = await discoveryWorker.RunAsync(repoContentsPath.FullName, directory);
@@ -74,10 +80,7 @@ internal class RefreshGroupUpdatePullRequestHandler : IUpdateHandler
 
             var updatedDependencyList = RunWorker.GetUpdatedDependencyListFromDiscovery(discoveryResult, originalRepoContentsPath.FullName, logger);
             await apiHandler.UpdateDependencyList(updatedDependencyList);
-            await this.ReportUpdaterStarted(apiHandler);
 
-            var updateOperationsPerformed = new List<UpdateOperationBase>();
-            var updatedDependencies = new List<ReportedDependency>();
             var updateOperationsToPerform = RunWorker.GetUpdateOperations(discoveryResult).ToArray();
             var groupedUpdateOperationsToPerform = updateOperationsToPerform
                 .GroupBy(o => o.Dependency.Name, StringComparer.OrdinalIgnoreCase)
@@ -143,53 +146,53 @@ internal class RefreshGroupUpdatePullRequestHandler : IUpdateHandler
             }
 
             var updatedDependencyFiles = await tracker.StopTrackingAsync();
-            var rawDependencies = updatedDependencies.Select(d => new Dependency(d.Name, d.Version, DependencyType.Unknown)).ToArray();
-            if (rawDependencies.Length == 0)
-            {
-                var close = ClosePullRequest.WithUpdateNoLongerPossible(job);
-                logger.Info(close.GetReport());
-                await apiHandler.ClosePullRequest(close);
-                continue;
-            }
+            allUpdatedDependencyFiles = ModifiedFilesTracker.MergeUpdatedFileSet(allUpdatedDependencyFiles, updatedDependencyFiles);
+        }
 
-            var commitMessage = PullRequestTextGenerator.GetPullRequestCommitMessage(job, [.. updateOperationsPerformed], null);
-            var prTitle = PullRequestTextGenerator.GetPullRequestTitle(job, [.. updateOperationsPerformed], null);
-            var prBody = await PullRequestTextGenerator.GetPullRequestBodyAsync(job, [.. updateOperationsPerformed], [.. updatedDependencies], experimentsManager);
-            var existingPullRequest = job.GetExistingPullRequestForDependencies(rawDependencies, considerVersions: true);
-            if (existingPullRequest is not null)
+        var rawDependencies = updatedDependencies.Select(d => new Dependency(d.Name, d.Version, DependencyType.Unknown)).ToArray();
+        if (rawDependencies.Length == 0)
+        {
+            var close = ClosePullRequest.WithUpdateNoLongerPossible(job);
+            logger.Info(close.GetReport());
+            await apiHandler.ClosePullRequest(close);
+            return;
+        }
+
+        var commitMessage = PullRequestTextGenerator.GetPullRequestCommitMessage(job, [.. updateOperationsPerformed], null);
+        var prTitle = PullRequestTextGenerator.GetPullRequestTitle(job, [.. updateOperationsPerformed], null);
+        var prBody = await PullRequestTextGenerator.GetPullRequestBodyAsync(job, [.. updateOperationsPerformed], [.. updatedDependencies], experimentsManager);
+        var existingPullRequest = job.GetExistingPullRequestForDependencies(rawDependencies, considerVersions: true);
+        if (existingPullRequest is not null)
+        {
+            await apiHandler.UpdatePullRequest(new UpdatePullRequest()
             {
-                await apiHandler.UpdatePullRequest(new UpdatePullRequest()
-                {
-                    DependencyNames = [.. jobDependencies.OrderBy(n => n, StringComparer.OrdinalIgnoreCase)],
-                    DependencyGroup = group.Name,
-                    UpdatedDependencyFiles = [.. updatedDependencyFiles],
-                    BaseCommitSha = baseCommitSha,
-                    CommitMessage = commitMessage,
-                    PrTitle = prTitle,
-                    PrBody = prBody,
-                });
-                continue;
-            }
-            else
+                DependencyNames = [.. jobDependencies.OrderBy(n => n, StringComparer.OrdinalIgnoreCase)],
+                DependencyGroup = group.Name,
+                UpdatedDependencyFiles = [.. allUpdatedDependencyFiles],
+                BaseCommitSha = baseCommitSha,
+                CommitMessage = commitMessage,
+                PrTitle = prTitle,
+                PrBody = prBody,
+            });
+        }
+        else
+        {
+            var existingPrButDifferent = job.GetExistingPullRequestForDependencies(rawDependencies, considerVersions: false);
+            if (existingPrButDifferent is not null)
             {
-                var existingPrButDifferent = job.GetExistingPullRequestForDependencies(rawDependencies, considerVersions: false);
-                if (existingPrButDifferent is not null)
-                {
-                    await apiHandler.ClosePullRequest(ClosePullRequest.WithDependenciesChanged(job));
-                }
-
-                await apiHandler.CreatePullRequest(new CreatePullRequest()
-                {
-                    Dependencies = [.. updatedDependencies],
-                    UpdatedDependencyFiles = [.. updatedDependencyFiles],
-                    BaseCommitSha = baseCommitSha,
-                    CommitMessage = commitMessage,
-                    PrTitle = prTitle,
-                    PrBody = prBody,
-                    DependencyGroup = group.Name,
-                });
-                continue;
+                await apiHandler.ClosePullRequest(ClosePullRequest.WithDependenciesChanged(job));
             }
+
+            await apiHandler.CreatePullRequest(new CreatePullRequest()
+            {
+                Dependencies = [.. updatedDependencies],
+                UpdatedDependencyFiles = [.. allUpdatedDependencyFiles],
+                BaseCommitSha = baseCommitSha,
+                CommitMessage = commitMessage,
+                PrTitle = prTitle,
+                PrBody = prBody,
+                DependencyGroup = group.Name,
+            });
         }
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/BindingRedirectManager.cs

@@ -31,13 +31,14 @@ internal static class BindingRedirectManager
     /// See: https://learn.microsoft.com/en-us/dotnet/framework/configure-apps/redirect-assembly-versions
     ///      https://learn.microsoft.com/en-us/nuget/resources/check-project-format
     /// </remarks>
+    /// <param name="repoRootPath">The root of the cloned repository</param>
     /// <param name="projectBuildFile">The project build file (*.xproj) to be updated</param>
     /// <param name="updatedPackageName"/>The name of the package that was updated</param>
     /// <param name="updatedPackageVersion">The version of the package that was updated</param>
     /// <returns>The updated files.</returns>
-    public static async ValueTask<ImmutableArray<string>> UpdateBindingRedirectsAsync(ProjectBuildFile projectBuildFile, string updatedPackageName, string updatedPackageVersion)
+    public static async ValueTask<ImmutableArray<string>> UpdateBindingRedirectsAsync(string repoRootPath, ProjectBuildFile projectBuildFile, string updatedPackageName, string updatedPackageVersion)
     {
-        var configFile = await TryGetRuntimeConfigurationFile(projectBuildFile.Path);
+        var configFile = await TryGetRuntimeConfigurationFile(repoRootPath, projectBuildFile.Path);
         if (configFile is null)
         {
             // no runtime config file so no need to add binding redirects
@@ -63,7 +64,7 @@ internal static class BindingRedirectManager
         // finally we pull out the assembly `HintPath` values for _all_ references relative to the project file in a unix-style value
         //    e.g., ../packages/Some.Other.Package/4.5.6/lib/net45/Some.Other.Package.dll
         // all of that is passed to `AddBindingRedirects()` so we can ensure binding redirects for the relevant assemblies
-        var packagesConfigPath = ProjectHelper.GetPackagesConfigPathFromProject(projectBuildFile.Path, ProjectHelper.PathFormat.Full);
+        var packagesConfigPath = ProjectHelper.GetPackagesConfigPathFromProject(repoRootPath, projectBuildFile.Path, ProjectHelper.PathFormat.Full);
         var packagesDirectory = PackagesConfigUpdater.GetPathToPackagesDirectory(projectBuildFile, updatedPackageName, updatedPackageVersion, packagesConfigPath)!;
         var assemblyPathPrefix = Path.Combine(packagesDirectory, $"{updatedPackageName}.{updatedPackageVersion}").NormalizePathToUnix().EnsureSuffix("/");
         var assemblyPaths = references.Select(static x => x.HintPath).Select(x => Path.GetRelativePath(Path.GetDirectoryName(projectBuildFile.Path)!, x).NormalizePathToUnix()).ToList();
@@ -130,9 +131,9 @@ internal static class BindingRedirectManager
         }
     }
 
-    private static async ValueTask<ConfigurationFile?> TryGetRuntimeConfigurationFile(string fullProjectPath)
+    private static async ValueTask<ConfigurationFile?> TryGetRuntimeConfigurationFile(string repoRootPath, string fullProjectPath)
     {
-        var additionalFiles = ProjectHelper.GetAdditionalFilesFromProjectContent(fullProjectPath, ProjectHelper.PathFormat.Full);
+        var additionalFiles = ProjectHelper.GetAdditionalFilesFromProjectContent(repoRootPath, fullProjectPath, ProjectHelper.PathFormat.Full);
         var configFilePath = additionalFiles
             .FirstOrDefault(p =>
             {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/FileWriters/FileWriterWorker.cs

@@ -112,7 +112,7 @@ public class FileWriterWorker
         NuGetVersion newDependencyVersion
     )
     {
-        var additionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(projectPath.FullName, ProjectHelper.PathFormat.Full);
+        var additionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(repoContentsPath.FullName, projectPath.FullName, ProjectHelper.PathFormat.Full);
         var packagesConfigFullPath = additionalFiles.Where(p => Path.GetFileName(p).Equals(ProjectHelper.PackagesConfigFileName, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
         if (packagesConfigFullPath is null)
         {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/PackagesConfigUpdater.cs

@@ -96,7 +96,7 @@ internal static partial class PackagesConfigUpdater
         projectBuildFile.NormalizeDirectorySeparatorsInProject();
 
         // Update binding redirects
-        var updatedConfigFiles = await BindingRedirectManager.UpdateBindingRedirectsAsync(projectBuildFile, dependencyName, newDependencyVersion);
+        var updatedConfigFiles = await BindingRedirectManager.UpdateBindingRedirectsAsync(repoRootPath, projectBuildFile, dependencyName, newDependencyVersion);
 
         logger.Info("    Writing project file back to disk");
         await projectBuildFile.SaveAsync();

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

@@ -256,6 +256,7 @@ internal static class PathHelper
         // translate pattern to regex
         searchPattern = searchPattern.Replace("\\", "/"); // unix-style paths make things easier
         searchPattern = searchPattern.TrimStart('/'); // pattern shouldn't be rooted
+        searchPattern = searchPattern.TrimEnd('/'); // trailing slash is meaningless for directory matching
         if (searchPattern == string.Empty)
         {
             searchPattern = "/"; // special case repo root

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

@@ -17,20 +17,22 @@ internal static class ProjectHelper
         Full,
     }
 
-    public static ImmutableArray<string> GetAllAdditionalFilesFromProject(string fullProjectPath, PathFormat pathFormat)
+    public static ImmutableArray<string> GetAllAdditionalFilesFromProject(string repoRootPath, string fullProjectPath, PathFormat pathFormat)
     {
-        return GetAdditionalFilesFromProjectContent(fullProjectPath, pathFormat)
-            .AddRange(GetAdditionalFilesFromProjectLocation(fullProjectPath, pathFormat));
+        return GetAdditionalFilesFromProjectContent(repoRootPath, fullProjectPath, pathFormat)
+            .Concat(GetAdditionalFilesFromProjectLocation(fullProjectPath, pathFormat))
+            .OrderBy(p => p, StringComparer.Ordinal)
+            .ToImmutableArray();
     }
 
-    public static ImmutableArray<string> GetAdditionalFilesFromProjectContent(string fullProjectPath, PathFormat pathFormat)
+    public static ImmutableArray<string> GetAdditionalFilesFromProjectContent(string repoRootPath, string fullProjectPath, PathFormat pathFormat)
     {
         var projectRootElement = ProjectRootElement.Open(fullProjectPath);
         var additionalFilesWithFullPaths = new[]
         {
-            projectRootElement.GetItemPathWithFileName(PackagesConfigFileName),
-            projectRootElement.GetItemPathWithFileName(AppConfigFileName),
-            projectRootElement.GetItemPathWithFileName(WebConfigFileName),
+            projectRootElement.GetItemPathWithFileName(repoRootPath, PackagesConfigFileName),
+            projectRootElement.GetItemPathWithFileName(repoRootPath, AppConfigFileName),
+            projectRootElement.GetItemPathWithFileName(repoRootPath, WebConfigFileName),
         }.Where(p => p is not null).Cast<string>().ToImmutableArray();
 
         var additionalFiles = additionalFilesWithFullPaths
@@ -52,10 +54,10 @@ internal static class ProjectHelper
         return additionalFiles;
     }
 
-    public static string? GetPackagesConfigPathFromProject(string fullProjectPath, PathFormat pathFormat)
+    public static string? GetPackagesConfigPathFromProject(string repoRootPath, string fullProjectPath, PathFormat pathFormat)
     {
-        var additionalFiles = GetAdditionalFilesFromProjectContent(fullProjectPath, pathFormat);
-        var packagesConfigFile = additionalFiles.FirstOrDefault(p => Path.GetFileName(p).Equals(PackagesConfigFileName, StringComparison.Ordinal));
+        var additionalFiles = GetAdditionalFilesFromProjectContent(repoRootPath, fullProjectPath, pathFormat);
+        var packagesConfigFile = additionalFiles.FirstOrDefault(p => Path.GetFileName(p).Equals(PackagesConfigFileName, StringComparison.OrdinalIgnoreCase));
         return packagesConfigFile;
     }
 
@@ -71,7 +73,7 @@ internal static class ProjectHelper
         return updatedPath.NormalizePathToUnix();
     }
 
-    private static string? GetItemPathWithFileName(this ProjectRootElement projectRootElement, string itemFileName)
+    private static string? GetItemPathWithFileName(this ProjectRootElement projectRootElement, string repoRootPath, string itemFileName)
     {
         var projectDirectory = Path.GetDirectoryName(projectRootElement.FullPath)!;
         var itemPath = projectRootElement.Items
@@ -80,7 +82,17 @@ internal static class ProjectHelper
             .Where(i => !string.IsNullOrEmpty(i.Include))
             .Select(i => Path.GetFullPath(Path.Combine(projectDirectory, i.Include.NormalizePathToUnix())))
             .Where(p => Path.GetFileName(p).Equals(itemFileName, StringComparison.OrdinalIgnoreCase))
-            .Where(File.Exists)
+            .Select(p =>
+            {
+                var candidateFiles = PathHelper.ResolveCaseInsensitivePathsInsideRepoRoot(p, repoRootPath) ?? []; // case correct
+                if (candidateFiles.Count == 1)
+                {
+                    return candidateFiles[0];
+                }
+
+                return null;
+            })
+            .Where(p => p is not null)
             .FirstOrDefault();
         return itemPath;
     }
@@ -89,7 +101,7 @@ internal static class ProjectHelper
     {
         var projectDirectory = Path.GetDirectoryName(fullProjectPath)!;
         var filePath = Directory.EnumerateFiles(projectDirectory)
-            .Where(p => Path.GetFileName(p).Equals(fileName, StringComparison.Ordinal))
+            .Where(p => Path.GetFileName(p).Equals(fileName, StringComparison.OrdinalIgnoreCase))
             .FirstOrDefault();
         return filePath;
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/UpdateHandlers/RefreshGroupUpdatePullRequestHandlerTests.cs

@@ -24,20 +24,37 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                 DependencyGroups = [new() { Name = "test_group" }],
                 DependencyGroupToRefresh = "test_group",
                 ExistingPullRequests = [new() { Dependencies = [new() { DependencyName = "Some.Dependency", DependencyVersion = NuGetVersion.Parse("2.0.0") }] }],
-                Source = CreateJobSource("/src"),
+                Source = CreateJobSource("/src1", "/src2"),
                 UpdatingAPullRequest = true,
             },
             files: [
-                ("src/project.csproj", "initial contents"),
+                ("src1/project1.csproj", "initial contents"),
+                ("src2/project2.csproj", "initial contents"),
             ],
             discoveryWorker: TestDiscoveryWorker.FromResults(
-                ("/src", new WorkspaceDiscoveryResult()
+                ("/src1", new WorkspaceDiscoveryResult()
                 {
-                    Path = "/src",
+                    Path = "/src1",
                     Projects = [
                         new()
                         {
-                            FilePath = "project.csproj",
+                            FilePath = "project1.csproj",
+                            Dependencies = [
+                                new("Some.Dependency", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net9.0"]),
+                                new("Unrelated.Dependency", "3.0.0", DependencyType.PackageReference, TargetFrameworks: ["net9.0"]),
+                            ],
+                            ImportedFiles = [],
+                            AdditionalFiles = [],
+                        }
+                    ],
+                }),
+                ("/src2", new WorkspaceDiscoveryResult()
+                {
+                    Path = "/src2",
+                    Projects = [
+                        new()
+                        {
+                            FilePath = "project2.csproj",
                             Dependencies = [
                                 new("Some.Dependency", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net9.0"]),
                                 new("Unrelated.Dependency", "3.0.0", DependencyType.PackageReference, TargetFrameworks: ["net9.0"]),
@@ -78,11 +95,20 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
 
                 return new UpdateOperationResult()
                 {
-                    UpdateOperations = [new DirectUpdate() { DependencyName = "Some.Dependency", NewVersion = NuGetVersion.Parse("2.0.0"), UpdatedFiles = ["/src/project.csproj"] }],
+                    UpdateOperations = [new DirectUpdate() { DependencyName = "Some.Dependency", NewVersion = NuGetVersion.Parse("2.0.0"), UpdatedFiles = [workspacePath] }],
                 };
             }),
             expectedUpdateHandler: RefreshGroupUpdatePullRequestHandler.Instance,
             expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "update_version_group_pr",
+                    }
+                },
+                // for `/src1`
                 new UpdatedDependencyList()
                 {
                     Dependencies = [
@@ -91,7 +117,7 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                             Name = "Some.Dependency",
                             Version = "1.0.0",
                             Requirements = [
-                                new() { Requirement = "1.0.0", File = "/src/project.csproj", Groups = ["dependencies"] },
+                                new() { Requirement = "1.0.0", File = "/src1/project1.csproj", Groups = ["dependencies"] },
                             ],
                         },
                         new()
@@ -99,19 +125,34 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                             Name = "Unrelated.Dependency",
                             Version = "3.0.0",
                             Requirements = [
-                                new() { Requirement = "3.0.0", File = "/src/project.csproj", Groups = ["dependencies"] },
+                                new() { Requirement = "3.0.0", File = "/src1/project1.csproj", Groups = ["dependencies"] },
                             ],
                         },
                     ],
-                    DependencyFiles = ["/src/project.csproj"],
+                    DependencyFiles = ["/src1/project1.csproj"],
                 },
-                new IncrementMetric()
+                // for `/src2`
+                new UpdatedDependencyList()
                 {
-                    Metric = "updater.started",
-                    Tags = new()
-                    {
-                        ["operation"] = "update_version_group_pr",
-                    }
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Dependency",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new() { Requirement = "1.0.0", File = "/src2/project2.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                        new()
+                        {
+                            Name = "Unrelated.Dependency",
+                            Version = "3.0.0",
+                            Requirements = [
+                                new() { Requirement = "3.0.0", File = "/src2/project2.csproj", Groups = ["dependencies"] },
+                            ],
+                        },
+                    ],
+                    DependencyFiles = ["/src2/project2.csproj"],
                 },
                 new UpdatePullRequest()
                 {
@@ -120,8 +161,14 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                     UpdatedDependencyFiles = [
                         new()
                         {
-                            Directory = "/src",
-                            Name = "project.csproj",
+                            Directory = "/src1",
+                            Name = "project1.csproj",
+                            Content = "updated contents",
+                        },
+                        new()
+                        {
+                            Directory = "/src2",
+                            Name = "project2.csproj",
                             Content = "updated contents",
                         }
                     ],
@@ -221,6 +268,14 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
             }),
             expectedUpdateHandler: RefreshGroupUpdatePullRequestHandler.Instance,
             expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "update_version_group_pr",
+                    }
+                },
                 new UpdatedDependencyList()
                 {
                     Dependencies = [
@@ -259,14 +314,6 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                     ],
                     DependencyFiles = ["/src/project1.csproj", "/src/project2.csproj"],
                 },
-                new IncrementMetric()
-                {
-                    Metric = "updater.started",
-                    Tags = new()
-                    {
-                        ["operation"] = "update_version_group_pr",
-                    }
-                },
                 new UpdatePullRequest()
                 {
                     DependencyNames = ["Some.Dependency"],
@@ -376,6 +423,14 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
             }),
             expectedUpdateHandler: RefreshGroupUpdatePullRequestHandler.Instance,
             expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "update_version_group_pr",
+                    }
+                },
                 new UpdatedDependencyList()
                 {
                     Dependencies = [
@@ -414,14 +469,6 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                     ],
                     DependencyFiles = ["/src/project1.csproj", "/src/project2.csproj"],
                 },
-                new IncrementMetric()
-                {
-                    Metric = "updater.started",
-                    Tags = new()
-                    {
-                        ["operation"] = "update_version_group_pr",
-                    }
-                },
                 new UpdatePullRequest()
                 {
                     DependencyNames = ["Some.Dependency"],
@@ -497,6 +544,14 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
             updaterWorker: new TestUpdaterWorker(input => throw new NotImplementedException("test shouldn't get this far")),
             expectedUpdateHandler: RefreshGroupUpdatePullRequestHandler.Instance,
             expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "update_version_group_pr",
+                    }
+                },
                 new UpdatedDependencyList()
                 {
                     Dependencies = [
@@ -511,14 +566,6 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                     ],
                     DependencyFiles = ["/src/project.csproj"],
                 },
-                new IncrementMetric()
-                {
-                    Metric = "updater.started",
-                    Tags = new()
-                    {
-                        ["operation"] = "update_version_group_pr",
-                    }
-                },
                 new ClosePullRequest() { DependencyNames = ["Some.Dependency"], Reason = "update_no_longer_possible" },
                 new MarkAsProcessed("TEST-COMMIT-SHA"),
             ]
@@ -604,6 +651,14 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
             }),
             expectedUpdateHandler: RefreshGroupUpdatePullRequestHandler.Instance,
             expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "update_version_group_pr",
+                    }
+                },
                 new UpdatedDependencyList()
                 {
                     Dependencies = [
@@ -626,14 +681,6 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                     ],
                     DependencyFiles = ["/src/project.csproj"],
                 },
-                new IncrementMetric()
-                {
-                    Metric = "updater.started",
-                    Tags = new()
-                    {
-                        ["operation"] = "update_version_group_pr",
-                    }
-                },
                 new ClosePullRequest() { DependencyNames = ["Some.Dependency", "Some.Other.Dependency"], Reason = "dependencies_changed" },
                 new CreatePullRequest()
                 {
@@ -759,6 +806,14 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
             }),
             expectedUpdateHandler: RefreshGroupUpdatePullRequestHandler.Instance,
             expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "update_version_group_pr",
+                    }
+                },
                 new UpdatedDependencyList()
                 {
                     Dependencies = [
@@ -773,14 +828,6 @@ public class RefreshGroupUpdatePullRequestHandlerTests : UpdateHandlersTestsBase
                     ],
                     DependencyFiles = ["/src/project.csproj"],
                 },
-                new IncrementMetric()
-                {
-                    Metric = "updater.started",
-                    Tags = new()
-                    {
-                        ["operation"] = "update_version_group_pr",
-                    }
-                },
                 new CreatePullRequest()
                 {
                     Dependencies = [

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/BindingRedirectsTests.cs

@@ -216,7 +216,7 @@ public class BindingRedirectsTests : TestBase
         await File.WriteAllTextAsync(configFilePath, configContents);
 
         var projectBuildFile = ProjectBuildFile.Open(tempDir.DirectoryPath, projectFilePath);
-        await BindingRedirectManager.UpdateBindingRedirectsAsync(projectBuildFile, updatedPackageName, updatedPackageVersion);
+        await BindingRedirectManager.UpdateBindingRedirectsAsync(tempDir.DirectoryPath, projectBuildFile, updatedPackageName, updatedPackageVersion);
 
         var actualConfigContents = (await File.ReadAllTextAsync(configFilePath)).Replace("\r", "");
         expectedConfigContents = expectedConfigContents.Replace("\r", "");

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

@@ -283,6 +283,24 @@ public class PathHelperTests
                 "/src/client/ios/ui"
             }
         ];
+
+        // leading and trailing slashes
+        yield return
+        [
+            // searchPattern
+            "/src/",
+            // directoriesOnDisk
+            new[]
+            {
+                "src",
+                "tests"
+            },
+            // expectedDirectories
+            new[]
+            {
+                "/src"
+            }
+        ];
     }
 
     [LinuxOnlyFact]

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

@@ -13,7 +13,7 @@ public class ProjectHelperTests : TestBase
         using var tempDirectory = await TemporaryDirectory.CreateWithContentsAsync(files);
         var fullProjectPath = Path.Join(tempDirectory.DirectoryPath, projectPath);
 
-        var actualAdditionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(fullProjectPath, ProjectHelper.PathFormat.Relative);
+        var actualAdditionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(tempDirectory.DirectoryPath, fullProjectPath, ProjectHelper.PathFormat.Relative);
         AssertEx.Equal(expectedAdditionalFiles, actualAdditionalFiles);
     }
 
@@ -61,5 +61,32 @@ public class ProjectHelperTests : TestBase
                 "../unexpected-path/packages.config"
             }
         ];
+
+        // files with different casing
+        yield return
+        [
+            // project path
+            "src/project.csproj",
+            // files
+            new[]
+            {
+                ("src/project.csproj", """
+                    <Project>
+                      <ItemGroup>
+                        <None Include="PACKAGES.CONFIG" />
+                        <None Include="APP.CONFIG" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("src/app.config", "contents irrelevant"),
+                ("src/packages.config", "contents irrelevant"),
+            },
+            // expected additional files
+            new[]
+            {
+                "app.config",
+                "packages.config"
+            }
+        ];
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.355.0
+  version: 0.356.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.355.0
+        version: 0.356.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.355.0
+        version: 0.356.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -553,7 +553,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.355.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.356.0
 rdoc_options: []
 require_paths:
 - lib