dependabot-nuget 0.321.3 → 0.322.0

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

@@ -32,13 +32,36 @@ public class FileWriterWorker
     )
     {
         var updateOperations = new List<UpdateOperationBase>();
-        var projectDirectory = Path.GetDirectoryName(projectPath.FullName)!;
-        var projectDirectoryRelativeToRepoRoot = Path.GetRelativePath(repoContentsPath.FullName, projectDirectory).FullyNormalizedRootedPath();
+        var initialProjectDirectory = new DirectoryInfo(Path.GetDirectoryName(projectPath.FullName)!);
 
         // first try non-project updates
+        var nonProjectUpdates = await ProcessNonProjectUpdatesAsync(repoContentsPath, initialProjectDirectory, dependencyName, oldDependencyVersion, newDependencyVersion);
+        updateOperations.AddRange(nonProjectUpdates);
+
+        // then try packages.config updates
+        var packagesConfigUpdates = await ProcessPackagesConfigUpdatesAsync(repoContentsPath, projectPath, dependencyName, oldDependencyVersion, newDependencyVersion);
+        updateOperations.AddRange(packagesConfigUpdates);
+
+        // then try project updates
+        var packageReferenceUpdates = await ProcessPackageReferenceUpdatesAsync(repoContentsPath, initialProjectDirectory, projectPath, dependencyName, newDependencyVersion);
+        updateOperations.AddRange(packageReferenceUpdates);
+
+        var normalizedUpdateOperations = UpdateOperationBase.NormalizeUpdateOperationCollection(repoContentsPath.FullName, updateOperations);
+        return normalizedUpdateOperations;
+    }
+
+    private async Task<ImmutableArray<UpdateOperationBase>> ProcessNonProjectUpdatesAsync(
+        DirectoryInfo repoContentsPath,
+        DirectoryInfo initialProjectDirectory,
+        string dependencyName,
+        NuGetVersion oldDependencyVersion,
+        NuGetVersion newDependencyVersion
+    )
+    {
+        var updateOperations = new List<UpdateOperationBase>();
         var updatedDotNetToolsPath = await DotNetToolsJsonUpdater.UpdateDependencyAsync(
             repoContentsPath.FullName,
-            projectDirectory,
+            initialProjectDirectory.FullName,
             dependencyName,
             oldDependencyVersion.ToString(),
             newDependencyVersion.ToString(),
@@ -57,7 +80,7 @@ public class FileWriterWorker
 
         var updatedGlobalJsonPath = await GlobalJsonUpdater.UpdateDependencyAsync(
             repoContentsPath.FullName,
-            projectDirectory,
+            initialProjectDirectory.FullName,
             dependencyName,
             oldDependencyVersion.ToString(),
             newDependencyVersion.ToString(),
@@ -74,33 +97,54 @@ public class FileWriterWorker
             });
         }
 
-        // then try packages.config updates
+        return [.. updateOperations];
+    }
+
+    private async Task<ImmutableArray<UpdateOperationBase>> ProcessPackagesConfigUpdatesAsync(
+        DirectoryInfo repoContentsPath,
+        FileInfo projectPath,
+        string dependencyName,
+        NuGetVersion oldDependencyVersion,
+        NuGetVersion newDependencyVersion
+    )
+    {
         var additionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(projectPath.FullName, ProjectHelper.PathFormat.Full);
         var packagesConfigFullPath = additionalFiles.Where(p => Path.GetFileName(p).Equals(ProjectHelper.PackagesConfigFileName, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-        if (packagesConfigFullPath is not null)
+        if (packagesConfigFullPath is null)
         {
-            var packagesConfigOperations = await PackagesConfigUpdater.UpdateDependencyAsync(
-                repoContentsPath.FullName,
-                projectPath.FullName,
-                dependencyName,
-                oldDependencyVersion.ToString(),
-                newDependencyVersion.ToString(),
-                packagesConfigFullPath,
-                _logger
-            );
-            var packagesConfigOperationsWithNormalizedPaths = packagesConfigOperations
-                .Select(op => op with { UpdatedFiles = [.. op.UpdatedFiles.Select(f => Path.GetRelativePath(repoContentsPath.FullName, f).FullyNormalizedRootedPath())] })
-                .ToArray();
-            updateOperations.AddRange(packagesConfigOperationsWithNormalizedPaths);
+            return [];
         }
 
-        // then try project updates
-        var initialDiscoveryResult = await _discoveryWorker.RunAsync(repoContentsPath.FullName, projectDirectoryRelativeToRepoRoot);
+        var packagesConfigOperations = await PackagesConfigUpdater.UpdateDependencyAsync(
+            repoContentsPath.FullName,
+            projectPath.FullName,
+            dependencyName,
+            oldDependencyVersion.ToString(),
+            newDependencyVersion.ToString(),
+            packagesConfigFullPath,
+            _logger
+        );
+        var packagesConfigOperationsWithNormalizedPaths = packagesConfigOperations
+            .Select(op => op with { UpdatedFiles = [.. op.UpdatedFiles.Select(f => Path.GetRelativePath(repoContentsPath.FullName, f).FullyNormalizedRootedPath())] })
+            .ToImmutableArray();
+        return packagesConfigOperationsWithNormalizedPaths;
+    }
+
+    private async Task<ImmutableArray<UpdateOperationBase>> ProcessPackageReferenceUpdatesAsync(
+        DirectoryInfo repoContentsPath,
+        DirectoryInfo initialProjectDirectory,
+        FileInfo projectPath,
+        string dependencyName,
+        NuGetVersion newDependencyVersion
+    )
+    {
+        var initialProjectDirectoryRelativeToRepoRoot = Path.GetRelativePath(repoContentsPath.FullName, initialProjectDirectory.FullName).FullyNormalizedRootedPath();
+        var initialDiscoveryResult = await _discoveryWorker.RunAsync(repoContentsPath.FullName, initialProjectDirectoryRelativeToRepoRoot);
         var initialProjectDiscovery = initialDiscoveryResult.GetProjectDiscoveryFromFullPath(repoContentsPath, projectPath);
         if (initialProjectDiscovery is null)
         {
             _logger.Info($"Unable to find project discovery for project {projectPath}.");
-            return [.. updateOperations];
+            return [];
         }
 
         var initialRequestedDependency = initialProjectDiscovery.Dependencies
@@ -108,14 +152,14 @@ public class FileWriterWorker
         if (initialRequestedDependency is null || initialRequestedDependency.Version is null)
         {
             _logger.Info($"Dependency {dependencyName} not found in initial project discovery.");
-            return [.. updateOperations];
+            return [];
         }
 
         var initialDependencyVersion = NuGetVersion.Parse(initialRequestedDependency.Version);
         if (initialDependencyVersion >= newDependencyVersion)
         {
             _logger.Info($"Dependency {dependencyName} is already at version {initialDependencyVersion}, no update needed.");
-            return [.. updateOperations];
+            return [];
         }
 
         var initialTopLevelDependencies = initialProjectDiscovery.Dependencies
@@ -126,6 +170,7 @@ public class FileWriterWorker
             ? initialTopLevelDependencies.Select(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase) ? newDependency : d).ToImmutableArray()
             : initialTopLevelDependencies.Concat([newDependency]).ToImmutableArray();
 
+        var updateOperations = new List<UpdateOperationBase>();
         foreach (var targetFramework in initialProjectDiscovery.TargetFrameworks)
         {
             var resolvedDependencies = await _dependencySolver.SolveAsync(initialTopLevelDependencies, desiredDependencies, targetFramework);
@@ -154,13 +199,13 @@ public class FileWriterWorker
             var orderedProjectDiscovery = GetProjectDiscoveryEvaluationOrder(repoContentsPath, initialDiscoveryResult, projectPath, _logger);
 
             // track original contents
-            var originalFileContents = await GetOriginalFileContentsAsync(repoContentsPath, new DirectoryInfo(projectDirectory), orderedProjectDiscovery);
+            var originalFileContents = await GetOriginalFileContentsAsync(repoContentsPath, initialProjectDirectory, orderedProjectDiscovery);
 
             var allUpdatedFiles = new List<string>();
             foreach (var projectDiscovery in orderedProjectDiscovery)
             {
                 var projectFullPath = Path.Join(repoContentsPath.FullName, initialDiscoveryResult.Path, projectDiscovery.FilePath).FullyNormalizedRootedPath();
-                var updatedFiles = await TryPerformFileWritesAsync(repoContentsPath, new FileInfo(projectFullPath), projectDiscovery, resolvedDependencies.Value);
+                var updatedFiles = await TryPerformFileWritesAsync(_fileWriter, repoContentsPath, initialProjectDirectory, projectDiscovery, resolvedDependencies.Value);
                 allUpdatedFiles.AddRange(updatedFiles);
             }
 
@@ -172,7 +217,7 @@ public class FileWriterWorker
             }
 
             // this final call to discover has the benefit of also updating the lock file if it exists
-            var finalDiscoveryResult = await _discoveryWorker.RunAsync(repoContentsPath.FullName, projectDirectoryRelativeToRepoRoot);
+            var finalDiscoveryResult = await _discoveryWorker.RunAsync(repoContentsPath.FullName, initialProjectDirectoryRelativeToRepoRoot);
             var finalProjectDiscovery = finalDiscoveryResult.GetProjectDiscoveryFromFullPath(repoContentsPath, projectPath);
             if (finalProjectDiscovery is null)
             {
@@ -222,8 +267,7 @@ public class FileWriterWorker
             updateOperations.AddRange(computedOperationsWithUpdatedFiles);
         }
 
-        var normalizedUpdateOperations = UpdateOperationBase.NormalizeUpdateOperationCollection(repoContentsPath.FullName, updateOperations);
-        return normalizedUpdateOperations;
+        return [.. updateOperations];
     }
 
     internal static async Task<Dictionary<string, string>> GetOriginalFileContentsAsync(DirectoryInfo repoContentsPath, DirectoryInfo initialStartingDirectory, IEnumerable<ProjectDiscoveryResult> projectDiscoveryResults)
@@ -292,16 +336,22 @@ public class FileWriterWorker
         return projectDiscoveryOrder;
     }
 
-    private async Task<ImmutableArray<string>> TryPerformFileWritesAsync(DirectoryInfo repoContentsPath, FileInfo projectPath, ProjectDiscoveryResult projectDiscovery, ImmutableArray<Dependency> requiredPackageVersions)
+    internal static async Task<ImmutableArray<string>> TryPerformFileWritesAsync(
+        IFileWriter fileWriter,
+        DirectoryInfo repoContentsPath,
+        DirectoryInfo originalDiscoveryDirectory,
+        ProjectDiscoveryResult projectDiscovery,
+        ImmutableArray<Dependency> requiredPackageVersions
+    )
     {
-        var originalFileContents = await GetOriginalFileContentsAsync(repoContentsPath, projectPath.Directory!, [projectDiscovery]);
+        var originalFileContents = await GetOriginalFileContentsAsync(repoContentsPath, originalDiscoveryDirectory, [projectDiscovery]);
         var relativeFilePaths = originalFileContents.Keys
             .Select(p => Path.GetRelativePath(repoContentsPath.FullName, p).FullyNormalizedRootedPath())
             .ToImmutableArray();
 
         // try update
         var addPackageReferenceElementForPinnedPackages = !projectDiscovery.CentralPackageTransitivePinningEnabled;
-        var success = await _fileWriter.UpdatePackageVersionsAsync(repoContentsPath, [.. relativeFilePaths], projectDiscovery.Dependencies, requiredPackageVersions, addPackageReferenceElementForPinnedPackages);
+        var success = await fileWriter.UpdatePackageVersionsAsync(repoContentsPath, relativeFilePaths, projectDiscovery.Dependencies, requiredPackageVersions, addPackageReferenceElementForPinnedPackages);
         var updatedFiles = new List<string>();
         foreach (var (filePath, originalContents) in originalFileContents)
         {
@@ -320,7 +370,7 @@ public class FileWriterWorker
             await RestoreOriginalFileContentsAsync(originalFileContents);
         }
 
-        var sortedUpdatedFiles = updatedFiles.OrderBy(p => p, StringComparer.Ordinal);
-        return [.. sortedUpdatedFiles];
+        var sortedUpdatedFiles = updatedFiles.OrderBy(p => p, StringComparer.Ordinal).ToImmutableArray();
+        return sortedUpdatedFiles;
     }
 }

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

@@ -23,15 +23,20 @@ public class XmlFileWriter : IFileWriter
 
     private readonly ILogger _logger;
 
-    // these file extensions are XML and can be updated; everything else is ignored
-    private static readonly HashSet<string> SupportedFileExtensions =
-    [
+    // these file extensions are valid project entrypoints; everything else is ignored
+    private static readonly HashSet<string> SupportedProjectFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+    {
         ".csproj",
         ".vbproj",
         ".fsproj",
+    };
+
+    // these file extensions are valid additional files and can be updated; everything else is ignored
+    private static readonly HashSet<string> SupportedAdditionalFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+    {
         ".props",
         ".targets",
-    ];
+    };
 
     public XmlFileWriter(ILogger logger)
     {
@@ -54,8 +59,15 @@ public class XmlFileWriter : IFileWriter
 
         var updatesPerformed = requiredPackageVersions.ToDictionary(d => d.Name, _ => false, StringComparer.OrdinalIgnoreCase);
         var projectRelativePath = relativeFilePaths[0];
+        var projectExtension = Path.GetExtension(projectRelativePath);
+        if (!SupportedProjectFileExtensions.Contains(projectExtension))
+        {
+            _logger.Warn($"Project extension '{projectExtension}' not supported; skipping XML update.");
+            return false;
+        }
+
         var filesAndContentsTasks = relativeFilePaths
-            .Where(path => SupportedFileExtensions.Contains(Path.GetExtension(path)))
+            .Where(path => SupportedProjectFileExtensions.Contains(Path.GetExtension(path)) || SupportedAdditionalFileExtensions.Contains(Path.GetExtension(path)))
             .Select(async path =>
             {
                 var content = await ReadFileContentsAsync(repoContentsPath, path);

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

@@ -21,7 +21,18 @@ public abstract record UpdateOperationBase
     public required NuGetVersion NewVersion { get; init; }
     public required ImmutableArray<string> UpdatedFiles { get; init; }
 
-    public abstract string GetReport();
+    protected abstract string GetReportText();
+
+    public string GetReport(bool includeFileNames)
+    {
+        var report = GetReportText();
+        if (includeFileNames)
+        {
+            report += $" in {string.Join(", ", UpdatedFiles)}";
+        }
+
+        return report;
+    }
 
     public ReportedDependency ToReportedDependency(string projectPath, IEnumerable<ReportedDependency> previouslyReportedDependencies, IEnumerable<Dependency> updatedDependencies)
     {
@@ -49,9 +60,9 @@ public abstract record UpdateOperationBase
         };
     }
 
-    internal static string GenerateUpdateOperationReport(IEnumerable<UpdateOperationBase> updateOperations)
+    internal static string GenerateUpdateOperationReport(IEnumerable<UpdateOperationBase> updateOperations, bool includeFileNames = true)
     {
-        var updateMessages = updateOperations.Select(u => u.GetReport()).ToImmutableArray();
+        var updateMessages = updateOperations.Select(u => u.GetReport(includeFileNames)).Distinct(StringComparer.OrdinalIgnoreCase).ToImmutableArray();
         if (updateMessages.Length == 0)
         {
             return string.Empty;
@@ -144,12 +155,12 @@ public abstract record UpdateOperationBase
 public record DirectUpdate : UpdateOperationBase
 {
     public override string Type => nameof(DirectUpdate);
-    public override string GetReport()
+    protected override string GetReportText()
     {
         var fromText = OldVersion is null
             ? string.Empty
             : $"from {OldVersion} ";
-        return $"Updated {DependencyName} {fromText}to {NewVersion} in {string.Join(", ", UpdatedFiles)}";
+        return $"Updated {DependencyName} {fromText}to {NewVersion}";
     }
 
     public sealed override string ToString() => GetString();
@@ -158,7 +169,7 @@ public record DirectUpdate : UpdateOperationBase
 public record PinnedUpdate : UpdateOperationBase
 {
     public override string Type => nameof(PinnedUpdate);
-    public override string GetReport() => $"Pinned {DependencyName} at {NewVersion} in {string.Join(", ", UpdatedFiles)}";
+    protected override string GetReportText() => $"Pinned {DependencyName} at {NewVersion}";
     public sealed override string ToString() => GetString();
 }
 
@@ -168,7 +179,7 @@ public record ParentUpdate : UpdateOperationBase, IEquatable<UpdateOperationBase
     public required string ParentDependencyName { get; init; }
     public required NuGetVersion ParentNewVersion { get; init; }
 
-    public override string GetReport() => $"Updated {DependencyName} to {NewVersion} indirectly via {ParentDependencyName}/{ParentNewVersion} in {string.Join(", ", UpdatedFiles)}";
+    protected override string GetReportText() => $"Updated {DependencyName} to {NewVersion} indirectly via {ParentDependencyName}/{ParentNewVersion}";
 
     bool IEquatable<UpdateOperationBase>.Equals(UpdateOperationBase? other)
     {

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

@@ -976,6 +976,7 @@ internal static partial class MSBuildHelper
         ThrowOnMissingPackages(output);
         ThrowOnUpdateNotPossible(output);
         ThrowOnRateLimitExceeded(output);
+        ThrowOnTimeout(output);
         ThrowOnBadResponse(output);
         ThrowOnUnparseableFile(output);
     }
@@ -1009,6 +1010,19 @@ internal static partial class MSBuildHelper
         }
     }
 
+    private static void ThrowOnTimeout(string stdout)
+    {
+        var patterns = new[]
+        {
+            new Regex(@"The HTTP request to 'GET (?<Source>[^']+)' has timed out after \d+ms"),
+        };
+        var match = patterns.Select(p => p.Match(stdout)).Where(m => m.Success).FirstOrDefault();
+        if (match is not null)
+        {
+            throw new PrivateSourceTimedOutException(match.Groups["Source"].Value);
+        }
+    }
+
     private static void ThrowOnBadResponse(string stdout)
     {
         var patterns = new[]
@@ -1043,6 +1057,7 @@ internal static partial class MSBuildHelper
             new Regex(@"Unable to find package (?<PackageName>[^ ]+)\. No packages exist with this id in source\(s\): (?<PackageSource>.*)$", RegexOptions.Multiline),
             new Regex(@"Unable to find package (?<PackageName>[^ ]+) with version \((?<PackageVersion>[^)]+)\)"),
             new Regex(@"Unable to find package '(?<PackageName>[^ ]+)'\."),
+            new Regex(@"Unable to resolve dependency '(?<PackageName>[^']+)'\. Source\(s\) used"),
             new Regex(@"Could not resolve SDK ""(?<PackageName>[^ ]+)""\."),
             new Regex(@"Failed to fetch results from V2 feed at '.*FindPackagesById\(\)\?id='(?<PackageName>[^']+)'&semVerLevel=2\.0\.0' with following message : Response status code does not indicate success: 404\."),
         };

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

@@ -31,7 +31,6 @@ public partial class DiscoveryWorkerTests
                     {
                         FilePath = "global.json",
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", "2.2.104", DependencyType.MSBuildSdk),
                             new("Microsoft.Build.Traversal", "1.0.45", DependencyType.MSBuildSdk),
                         ]
                     },
@@ -65,7 +64,6 @@ public partial class DiscoveryWorkerTests
                     {
                         FilePath = "global.json",
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", "2.2.104", DependencyType.MSBuildSdk),
                             new("Microsoft.Build.Traversal", "1.0.45", DependencyType.MSBuildSdk),
                         ]
                     },

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

@@ -690,7 +690,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 {
                     FilePath = "global.json",
                     Dependencies = [
-                        new("Microsoft.NET.Sdk", "6.0.405", DependencyType.MSBuildSdk),
                         new("My.Custom.Sdk", "5.0.0", DependencyType.MSBuildSdk),
                         new("My.Other.Sdk", "1.0.0-beta", DependencyType.MSBuildSdk),
                     ]
@@ -1044,7 +1043,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 {
                     FilePath = "global.json",
                     Dependencies = [
-                        new("Microsoft.NET.Sdk", "6.0.405", DependencyType.MSBuildSdk),
                         new("My.Custom.Sdk", "5.0.0", DependencyType.MSBuildSdk),
                         new("My.Other.Sdk", "1.0.0-beta", DependencyType.MSBuildSdk),
                     ]

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Files/GlobalJsonBuildFileTests.cs

@@ -53,7 +53,6 @@ public class GlobalJsonBuildFileTests
     {
         var expectedDependencies = new List<Dependency>
         {
-            new("Microsoft.NET.Sdk", "6.0.405", DependencyType.MSBuildSdk),
             new("My.Custom.Sdk", "5.0.0", DependencyType.MSBuildSdk),
             new("My.Other.Sdk", "1.0.0-beta", DependencyType.MSBuildSdk)
         };

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

@@ -149,6 +149,7 @@ public class HttpApiHandlerTests
         yield return [new JobRepoNotFound("unused"), "record_update_job_error"];
         yield return [new PrivateSourceAuthenticationFailure(["unused"]), "record_update_job_error"];
         yield return [new PrivateSourceBadResponse(["unused"]), "record_update_job_error"];
+        yield return [new PrivateSourceTimedOut("unused"), "record_update_job_error"];
         yield return [new PullRequestExistsForLatestVersion("unused", "unused"), "record_update_job_error"];
         yield return [new PullRequestExistsForSecurityUpdate([]), "record_update_job_error"];
         yield return [new SecurityUpdateDependencyNotFound(), "record_update_job_error"];

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

@@ -61,6 +61,13 @@ public class JobErrorBaseTests : TestBase
             new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"]),
         ];
 
+        // service returned corrupt package
+        yield return
+        [
+            new InvalidDataException("Central Directory corrupt."),
+            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"]),
+        ];
+
         // top-level exception turns into private_source_authentication_failure
         yield return
         [

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

@@ -160,6 +160,17 @@ public class MessageReportTests
             """
         ];
 
+        yield return
+        [
+            // message
+            new PrivateSourceTimedOut("url"),
+            // expected
+            """
+            Error type: private_source_timed_out
+            - source: url
+            """
+        ];
+
         yield return
         [
             // message

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

@@ -79,7 +79,7 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Some.Package from 1.0.0 to 1.2.3 in a.txt
+            - Updated Some.Package from 1.0.0 to 1.2.3
             """
         ];
 
@@ -108,7 +108,7 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Some.Package from 1.0.0 to 1.2.3 in a.txt
+            - Updated Some.Package from 1.0.0 to 1.2.3
             """
         ];
 
@@ -137,7 +137,7 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Some.Package from 1.0.0 to 1.2.3 in a.txt
+            - Updated Some.Package from 1.0.0 to 1.2.3
             """
         ];
 
@@ -173,8 +173,8 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Some.Package from 1.0.0 to 1.2.3 in a.txt
-            - Updated Some.Package from 4.0.0 to 4.5.6 in b.txt
+            - Updated Some.Package from 1.0.0 to 1.2.3
+            - Updated Some.Package from 4.0.0 to 4.5.6
             """
         ];
 
@@ -229,10 +229,10 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Package.A from 0.1.0 to 1.0.0 in a1.txt
-            - Updated Package.A from 0.2.0 to 2.0.0 in a2.txt
-            - Updated Package.B from 0.3.0 to 3.0.0 in b1.txt
-            - Updated Package.B from 0.4.0 to 4.0.0 in b2.txt
+            - Updated Package.A from 0.1.0 to 1.0.0
+            - Updated Package.A from 0.2.0 to 2.0.0
+            - Updated Package.B from 0.3.0 to 3.0.0
+            - Updated Package.B from 0.4.0 to 4.0.0
             """
         ];
 
@@ -317,14 +317,14 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Package.A from 0.1.0 to 1.0.0 in a1.txt
-            - Updated Package.A from 0.2.0 to 2.0.0 in a2.txt
-            - Updated Package.B from 0.3.0 to 3.0.0 in b1.txt
-            - Updated Package.B from 0.4.0 to 4.0.0 in b2.txt
-            - Updated Package.C from 0.5.0 to 5.0.0 in c1.txt
-            - Updated Package.C from 0.6.0 to 6.0.0 in c2.txt
-            - Updated Package.D from 0.7.0 to 7.0.0 in d1.txt
-            - Updated Package.D from 0.8.0 to 8.0.0 in d2.txt
+            - Updated Package.A from 0.1.0 to 1.0.0
+            - Updated Package.A from 0.2.0 to 2.0.0
+            - Updated Package.B from 0.3.0 to 3.0.0
+            - Updated Package.B from 0.4.0 to 4.0.0
+            - Updated Package.C from 0.5.0 to 5.0.0
+            - Updated Package.C from 0.6.0 to 6.0.0
+            - Updated Package.D from 0.7.0 to 7.0.0
+            - Updated Package.D from 0.8.0 to 8.0.0
             """
         ];
 
@@ -357,7 +357,7 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Some.Package from 1.0.0 to 1.2.3 in a.txt
+            - Updated Some.Package from 1.0.0 to 1.2.3
             """
         ];
 
@@ -398,8 +398,8 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Package.A from 1.0.0 to 1.2.3 in a.txt
-            - Updated Package.B from 4.0.0 to 4.5.6 in a.txt
+            - Updated Package.A from 1.0.0 to 1.2.3
+            - Updated Package.B from 4.0.0 to 4.5.6
             """
         ];
 
@@ -437,8 +437,7 @@ public class PullRequestTextTests
             // expectedBody
             """
             Performed the following updates:
-            - Updated Some.Package from 1.0.0 to 1.2.3 in a.txt
-            - Updated Some.Package from 1.0.0 to 1.2.3 in b.txt
+            - Updated Some.Package from 1.0.0 to 1.2.3
             """
         ];
     }

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

@@ -3522,7 +3522,7 @@ public class RunWorkerTests
         updaterWorker ??= new UpdaterWorker(jobId, experimentsManager, logger);
 
         var worker = new RunWorker(jobId, testApiHandler, discoveryWorker, analyzeWorker, updaterWorker, logger);
-        var repoContentsPathDirectoryInfo = new DirectoryInfo(tempDirectory.DirectoryPath);
+        var repoContentsPathDirectoryInfo = new DirectoryInfo(repoContentsPath);
         var actualResult = await worker.RunAsync(job, repoContentsPathDirectoryInfo, repoContentsPathDirectoryInfo, "TEST-COMMIT-SHA", experimentsManager);
         var actualApiMessages = testApiHandler.ReceivedMessages
             .Select(m =>

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

@@ -707,6 +707,14 @@ public class SerializationTests : TestBase
             """
         ];
 
+        yield return
+        [
+            new PrivateSourceTimedOut("url"),
+            """
+            {"data":{"error-type":"private_source_timed_out","error-details":{"source":"url"}}}
+            """
+        ];
+
         yield return
         [
             new PullRequestExistsForLatestVersion("dep", "ver"),

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/FileWriterWorkerTests.cs

@@ -415,7 +415,7 @@ public class FileWriterWorkerTests : TestBase
                     """)
             ],
             expectedOperations: [
-                new DirectUpdate() { DependencyName = "Some.Dependency", NewVersion = NuGetVersion.Parse("2.0.0"), UpdatedFiles = ["/project.csproj", "/packages.config"] }
+                new DirectUpdate() { DependencyName = "Some.Dependency", NewVersion = NuGetVersion.Parse("2.0.0"), UpdatedFiles = ["/packages.config", "/project.csproj"] }
             ]
         );
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/FileWriterWorkerTests_MiscellaneousTests.cs

@@ -106,4 +106,49 @@ public class FileWriterWorkerTests_MiscellaneousTests
         Assert.Equal("initial client content", await File.ReadAllTextAsync(Path.Join(repoContentsPath.FullName, "client/client.csproj"), TestContext.Current.CancellationToken));
         Assert.Equal("initial packages config content", await File.ReadAllTextAsync(Path.Join(repoContentsPath.FullName, "client/packages.config"), TestContext.Current.CancellationToken));
     }
+
+    [Fact]
+    public async Task TryPerformFileWrites_ReportsAppropriateUpdatedFilePaths_WhenStartingFromDifferentProjectDirectory()
+    {
+        // discovery was initiated from the "tests" directory, but we're now evaluating the "client" project for file writes
+        // arrange
+        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
+            ("tests/tests.csproj", """
+                <Project>
+                  <ItemGroup>
+                    <PackageReference Include="Some.Package" Version="1.0.0" />
+                  </ItemGroup>
+                </Project>
+                """),
+            ("client/client.csproj", """
+                <Project>
+                  <ItemGroup>
+                    <PackageReference Include="Some.Package" Version="1.0.0" />
+                  </ItemGroup>
+                </Project>
+                """)
+        );
+        var logger = new TestLogger();
+        var fileWriter = new XmlFileWriter(logger);
+        var originalDiscoveryDirectory = new DirectoryInfo(Path.Join(tempDir.DirectoryPath, "tests"));
+        var projectDiscovery = new ProjectDiscoveryResult()
+        {
+            FilePath = "../client/client.csproj",
+            Dependencies = [new("Some.Package", "1.0.0", DependencyType.PackageReference)],
+            ImportedFiles = [],
+            AdditionalFiles = [],
+        };
+
+        // act
+        var updatedFilePaths = await FileWriterWorker.TryPerformFileWritesAsync(
+            fileWriter,
+            new DirectoryInfo(tempDir.DirectoryPath),
+            originalDiscoveryDirectory,
+            projectDiscovery,
+            [new("Some.Package", "1.0.1", DependencyType.PackageReference)]
+        );
+
+        // assert
+        AssertEx.Equal(["/client/client.csproj"], updatedFilePaths);
+    }
 }