dependabot-nuget 0.285.0 → 0.286.0

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

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
@@ -213,8 +214,8 @@ internal static class PackagesConfigUpdater
         var hintPathSubString = $"{dependencyName}.{dependencyVersion}";
 
         string? partialPathMatch = null;
-        var hintPathNodes = projectBuildFile.Contents.Descendants().Where(e => e.IsHintPathNodeForDependency(dependencyName));
-        foreach (var hintPathNode in hintPathNodes)
+        var specificHintPathNodes = projectBuildFile.Contents.Descendants().Where(e => e.IsHintPathNodeForDependency(dependencyName)).ToArray();
+        foreach (var hintPathNode in specificHintPathNodes)
         {
             var hintPath = hintPathNode.GetContentValue();
             var hintPathSubStringLocation = hintPath.IndexOf(hintPathSubString, StringComparison.OrdinalIgnoreCase);
@@ -255,18 +256,49 @@ internal static class PackagesConfigUpdater
             if (hasPackage)
             {
                 // the dependency exists in the packages.config file, so it must be the second case
-                // the vast majority of projects found in the wild use this, and since we have nothing to look for, we'll just have to hope
-                partialPathMatch = "../packages";
+                // at this point there's no perfect way to determine what the packages path is, but there's a really good chance that
+                // for any given package it looks something like this:
+                //   ..\..\packages\Package.Name.[version]\lib\Tfm\Package.Name.dll
+                var genericHintPathNodes = projectBuildFile.Contents.Descendants().Where(IsHintPathNode).ToArray();
+                if (genericHintPathNodes.Length > 0)
+                {
+                    foreach (var hintPathNode in genericHintPathNodes)
+                    {
+                        var hintPath = hintPathNode.GetContentValue();
+                        var match = Regex.Match(hintPath, @"^(?<PackagesPath>.*)[/\\](?<PackageNameAndVersion>[^/\\]+)[/\\]lib[/\\](?<Tfm>[^/\\]+)[/\\](?<AssemblyName>[^/\\]+)$");
+                        // e.g.,                              ..\..\packages     \    Some.Package.1.2.3              \    lib\     net45          \   Some.Package.dll
+                        if (match.Success)
+                        {
+                            partialPathMatch = match.Groups["PackagesPath"].Value;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    // we know the dependency is used, but we have absolutely no idea where the packages path is, so we'll default to something reasonable
+                    partialPathMatch = "../packages";
+                }
             }
         }
 
         return partialPathMatch?.NormalizePathToUnix();
     }
 
-    private static bool IsHintPathNodeForDependency(this IXmlElementSyntax element, string dependencyName)
+    private static bool IsHintPathNode(this IXmlElementSyntax element)
     {
         if (element.Name.Equals("HintPath", StringComparison.OrdinalIgnoreCase) &&
             element.Parent.Name.Equals("Reference", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsHintPathNodeForDependency(this IXmlElementSyntax element, string dependencyName)
+    {
+        if (element.IsHintPathNode())
         {
             // the include attribute will look like one of the following:
             //   <Reference Include="Some.Dependency, Version=1.0.0.0, Culture=neutral, PublicKeyToken=abcd">

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

@@ -7,8 +7,9 @@ using NuGetUpdater.Core.Updater;
 
 namespace NuGetUpdater.Core;
 
-public class UpdaterWorker
+public class UpdaterWorker : IUpdaterWorker
 {
+    private readonly ExperimentsManager _experimentsManager;
     private readonly ILogger _logger;
     private readonly HashSet<string> _processedProjectPaths = new(StringComparer.OrdinalIgnoreCase);
 
@@ -18,8 +19,9 @@ public class UpdaterWorker
         Converters = { new JsonStringEnumConverter() },
     };
 
-    public UpdaterWorker(ILogger logger)
+    public UpdaterWorker(ExperimentsManager experimentsManager, ILogger logger)
     {
+        _experimentsManager = experimentsManager;
         _logger = logger;
     }
 
@@ -221,7 +223,7 @@ public class UpdaterWorker
         }
 
         // Some repos use a mix of packages.config and PackageReference
-        await PackageReferenceUpdater.UpdateDependencyAsync(repoRootPath, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive, _logger);
+        await PackageReferenceUpdater.UpdateDependencyAsync(repoRootPath, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive, _experimentsManager, _logger);
 
         // Update lock file if exists
         if (File.Exists(Path.Combine(Path.GetDirectoryName(projectPath), "packages.lock.json")))

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

@@ -335,11 +335,6 @@ internal static partial class MSBuildHelper
         }
     }
 
-    internal static bool UseNewDependencySolver()
-    {
-        return Environment.GetEnvironmentVariable("UseNewNugetPackageResolver") == "true";
-    }
-
     internal static async Task<Dependency[]?> ResolveDependencyConflicts(string repoRoot, string projectPath, string targetFramework, Dependency[] packages, Dependency[] update, ILogger logger)
     {
         var tempDirectory = Directory.CreateTempSubdirectory("package-dependency-coherence_");

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

@@ -63,6 +63,8 @@ internal static class PathHelper
         return result;
     }
 
+    public static string FullyNormalizedRootedPath(this string path) => path.NormalizePathToUnix().NormalizeUnixPathParts().EnsurePrefix("/");
+
     public static string GetFullPathFromRelative(string rootPath, string relativePath)
         => Path.GetFullPath(JoinPath(rootPath, relativePath.NormalizePathToUnix()));
 

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

@@ -1,10 +1,14 @@
+using System.Net;
 using System.Text;
 using System.Text.Json;
 using System.Xml.Linq;
 
+using NuGetUpdater.Core.Analyze;
+using NuGetUpdater.Core.Discover;
 using NuGetUpdater.Core.Run;
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Test.Update;
+using NuGetUpdater.Core.Updater;
 
 using Xunit;
 
@@ -17,13 +21,8 @@ public class RunWorkerTests
     [Fact]
     public async Task UpdateSinglePackageProducedExpectedAPIMessages()
     {
-        var repoMetadata = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package" />""");
         await RunAsync(
-            packages:
-            [
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0", additionalMetadata: [repoMetadata]),
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.1", "net8.0", additionalMetadata: [repoMetadata]),
-            ],
+            packages: [],
             job: new Job()
             {
                 Source = new()
@@ -50,6 +49,55 @@ public class RunWorkerTests
                     </Project>
                     """)
             ],
+            discoveryWorker: new TestDiscoveryWorker(_input =>
+            {
+                return Task.FromResult(new WorkspaceDiscoveryResult()
+                {
+                    Path = "some-dir",
+                    Projects =
+                    [
+                        new()
+                        {
+                            FilePath = "project.csproj",
+                            TargetFrameworks = ["net8.0"],
+                            Dependencies =
+                            [
+                                new("Some.Package", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
+                            ]
+                        }
+                    ]
+                });
+            }),
+            analyzeWorker: new TestAnalyzeWorker(input =>
+            {
+                return Task.FromResult(new AnalysisResult()
+                {
+                    UpdatedVersion = "1.0.1",
+                    CanUpdate = true,
+                    UpdatedDependencies =
+                    [
+                        new("Some.Package", "1.0.2", DependencyType.Unknown, TargetFrameworks: ["net8.0"], InfoUrl: "https://nuget.example.com/some-package"),
+                    ]
+                });
+            }),
+            updaterWorker: new TestUpdaterWorker(async input =>
+            {
+                Assert.Equal("Some.Package", input.Item3);
+                Assert.Equal("1.0.0", input.Item4);
+                Assert.Equal("1.0.1", input.Item5);
+                var projectPath = input.Item1 + input.Item2;
+                await File.WriteAllTextAsync(projectPath, """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.1" />
+                      </ItemGroup>
+                    </Project>
+                    """);
+                return new UpdateOperationResult();
+            }),
             expectedResult: new RunResult()
             {
                 Base64DependencyFiles =
@@ -168,37 +216,6 @@ public class RunWorkerTests
     [Fact]
     public async Task PrivateSourceAuthenticationFailureIsForwaredToApiHandler()
     {
-        static (int, string) TestHttpHandler(string uriString)
-        {
-            var uri = new Uri(uriString, UriKind.Absolute);
-            var baseUrl = $"{uri.Scheme}://{uri.Host}:{uri.Port}";
-            return uri.PathAndQuery switch
-            {
-                // initial request is good
-                "/index.json" => (200, $$"""
-                    {
-                        "version": "3.0.0",
-                        "resources": [
-                            {
-                                "@id": "{{baseUrl}}/download",
-                                "@type": "PackageBaseAddress/3.0.0"
-                            },
-                            {
-                                "@id": "{{baseUrl}}/query",
-                                "@type": "SearchQueryService"
-                            },
-                            {
-                                "@id": "{{baseUrl}}/registrations",
-                                "@type": "RegistrationsBaseUrl"
-                            }
-                        ]
-                    }
-                    """),
-                // all other requests are unauthorized
-                _ => (401, "{}"),
-            };
-        }
-        using var http = TestHttpServer.CreateTestStringServer(TestHttpHandler);
         await RunAsync(
             packages:
             [
@@ -218,11 +235,11 @@ public class RunWorkerTests
             },
             files:
             [
-                ("NuGet.Config", $"""
+                ("NuGet.Config", """
                     <configuration>
                       <packageSources>
                         <clear />
-                        <add key="private_feed" value="{http.BaseUrl.TrimEnd('/')}/index.json" allowInsecureConnections="true" />
+                        <add key="private_feed" value="http://example.com/nuget/index.json" allowInsecureConnections="true" />
                       </packageSources>
                     </configuration>
                     """),
@@ -237,6 +254,12 @@ public class RunWorkerTests
                     </Project>
                     """)
             ],
+            discoveryWorker: new TestDiscoveryWorker((_input) =>
+            {
+                throw new HttpRequestException(message: null, inner: null, statusCode: HttpStatusCode.Unauthorized);
+            }),
+            analyzeWorker: TestAnalyzeWorker.FromResults(),
+            updaterWorker: TestUpdaterWorker.FromResults(),
             expectedResult: new RunResult()
             {
                 Base64DependencyFiles = [],
@@ -244,7 +267,7 @@ public class RunWorkerTests
             },
             expectedApiMessages:
             [
-                new PrivateSourceAuthenticationFailure([$"{http.BaseUrl.TrimEnd('/')}/index.json"]),
+                new PrivateSourceAuthenticationFailure(["http://example.com/nuget/index.json"]),
                 new MarkAsProcessed("TEST-COMMIT-SHA")
             ]
         );
@@ -296,6 +319,107 @@ public class RunWorkerTests
                     </packages>
                     """),
             ],
+            discoveryWorker: new TestDiscoveryWorker(_input =>
+            {
+                return Task.FromResult(new WorkspaceDiscoveryResult()
+                {
+                    Path = "some-dir",
+                    Projects =
+                    [
+                        new()
+                        {
+                            FilePath = "project.csproj",
+                            TargetFrameworks = ["net8.0"],
+                            Dependencies =
+                            [
+                                new("Some.Package", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
+                                new("Some.Package2", "2.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net8.0"]),
+                            ]
+                        }
+                    ]
+                });
+            }),
+            analyzeWorker: new TestAnalyzeWorker(input =>
+            {
+                var result = input.Item3.Name switch
+                {
+                    "Some.Package" => new AnalysisResult()
+                    {
+                        CanUpdate = true,
+                        UpdatedVersion = "1.0.1",
+                        UpdatedDependencies =
+                            [
+                                new("Some.Package", "1.0.1", DependencyType.Unknown, TargetFrameworks: ["net8.0"], InfoUrl: "https://nuget.example.com/some-package"),
+                            ]
+                    },
+                    "Some.Package2" => new AnalysisResult()
+                    {
+                        CanUpdate = true,
+                        UpdatedVersion = "2.0.1",
+                        UpdatedDependencies =
+                                [
+                                    new("Some.Package2", "2.0.1", DependencyType.Unknown, TargetFrameworks: ["net8.0"], InfoUrl: "https://nuget.example.com/some-package2"),
+                                ]
+                    },
+                    _ => throw new NotSupportedException(),
+                };
+                return Task.FromResult(result);
+            }),
+            updaterWorker: new TestUpdaterWorker(async input =>
+            {
+                var repoRootPath = input.Item1;
+                var filePath = input.Item2;
+                var packageName = input.Item3;
+                var previousVersion = input.Item4;
+                var newVersion = input.Item5;
+                var _isTransitive = input.Item6;
+
+                var projectPath = Path.Join(repoRootPath, filePath);
+                switch (packageName)
+                {
+                    case "Some.Package":
+                        await File.WriteAllTextAsync(projectPath, """
+                            <Project Sdk="Microsoft.NET.Sdk">
+                              <PropertyGroup>
+                                <TargetFramework>net8.0</TargetFramework>
+                              </PropertyGroup>
+                              <ItemGroup>
+                                <PackageReference Include="Some.Package" Version="1.0.1" />
+                              </ItemGroup>
+                             </Project>
+                            """);
+                        break;
+                    case "Some.Package2":
+                        await File.WriteAllTextAsync(projectPath, """
+                            <Project Sdk="Microsoft.NET.Sdk">
+                              <PropertyGroup>
+                                <TargetFramework>net8.0</TargetFramework>
+                              </PropertyGroup>
+                              <ItemGroup>
+                                <PackageReference Include="Some.Package" Version="1.0.1" />
+                              </ItemGroup>
+                              <ItemGroup>
+                                <Reference Include="Some.Package2">
+                                  <HintPath>..\packages\Some.Package2.2.0.1\lib\net8.0\Some.Package2.dll</HintPath>
+                                  <Private>True</Private>
+                                </Reference>
+                              </ItemGroup>
+                            </Project>
+                            """);
+                        var packagesConfigPath = Path.Join(Path.GetDirectoryName(projectPath)!, "packages.config");
+                        await File.WriteAllTextAsync(packagesConfigPath, """
+                            <?xml version="1.0" encoding="utf-8"?>
+                            <packages>
+                              <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
+                            </packages>
+                            """);
+                        break;
+                    default:
+                        throw new NotSupportedException();
+                }
+
+                return new UpdateOperationResult();
+            }),
             expectedResult: new RunResult()
             {
                 Base64DependencyFiles =
@@ -547,6 +671,160 @@ public class RunWorkerTests
                     </packages>
                     """),
             ],
+            discoveryWorker: new TestDiscoveryWorker(_input =>
+            {
+                return Task.FromResult(new WorkspaceDiscoveryResult()
+                {
+                    Path = "some-dir/ProjectA",
+                    Projects =
+                    [
+                        new()
+                        {
+                            FilePath = "../ProjectB/ProjectB.csproj",
+                            TargetFrameworks = ["net8.0"],
+                            Dependencies =
+                            [
+                                new("Some.Package", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
+                                new("Some.Package2", "2.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net8.0"]),
+                            ]
+                        },
+                        new()
+                        {
+                            FilePath = "ProjectA.csproj",
+                            TargetFrameworks = ["net8.0"],
+                            Dependencies =
+                            [
+                                new("Some.Package", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
+                                new("Some.Package2", "2.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net8.0"]),
+                            ]
+                        }
+                    ]
+                });
+            }),
+            analyzeWorker: new TestAnalyzeWorker(input =>
+            {
+                var result = input.Item3.Name switch
+                {
+                    "Some.Package" => new AnalysisResult()
+                    {
+                        CanUpdate = true,
+                        UpdatedVersion = "1.0.1",
+                        UpdatedDependencies =
+                            [
+                                new("Some.Package", "1.0.1", DependencyType.Unknown, TargetFrameworks: ["net8.0"], InfoUrl: "https://nuget.example.com/some-package"),
+                            ]
+                    },
+                    "Some.Package2" => new AnalysisResult()
+                    {
+                        CanUpdate = true,
+                        UpdatedVersion = "2.0.1",
+                        UpdatedDependencies =
+                                [
+                                    new("Some.Package2", "2.0.1", DependencyType.Unknown, TargetFrameworks: ["net8.0"], InfoUrl: "https://nuget.example.com/some-package2"),
+                                ]
+                    },
+                    _ => throw new NotSupportedException(),
+                };
+                return Task.FromResult(result);
+            }),
+            updaterWorker: new TestUpdaterWorker(async input =>
+            {
+                var repoRootPath = input.Item1;
+                var filePath = input.Item2;
+                var packageName = input.Item3;
+                var previousVersion = input.Item4;
+                var newVersion = input.Item5;
+                var _isTransitive = input.Item6;
+
+                var projectPath = Path.Join(repoRootPath, filePath);
+                var projectName = Path.GetFileName(projectPath);
+                var packagesConfigPath = Path.Join(Path.GetDirectoryName(projectPath)!, "packages.config");
+                switch ((projectName, packageName))
+                {
+                    case ("ProjectA.csproj", "Some.Package"):
+                        await File.WriteAllTextAsync(projectPath, """
+                            <Project Sdk="Microsoft.NET.Sdk">
+                              <PropertyGroup>
+                                <TargetFramework>net8.0</TargetFramework>
+                              </PropertyGroup>
+                              <ItemGroup>
+                                <PackageReference Include="Some.Package" Version="1.0.1" />
+                              </ItemGroup>
+                              <ItemGroup>
+                                <ProjectReference Include="../ProjectB/ProjectB.csproj" />
+                              </ItemGroup>
+                            </Project>
+                            """);
+                        break;
+                    case ("ProjectA.csproj", "Some.Package2"):
+                        await File.WriteAllTextAsync(projectPath, """
+                            <Project Sdk="Microsoft.NET.Sdk">
+                              <PropertyGroup>
+                                <TargetFramework>net8.0</TargetFramework>
+                              </PropertyGroup>
+                              <ItemGroup>
+                                <PackageReference Include="Some.Package" Version="1.0.1" />
+                              </ItemGroup>
+                              <ItemGroup>
+                                <ProjectReference Include="../ProjectB/ProjectB.csproj" />
+                              </ItemGroup>
+                              <ItemGroup>
+                                <Reference Include="Some.Package2">
+                                  <HintPath>..\packages\Some.Package2.2.0.1\lib\net8.0\Some.Package2.dll</HintPath>
+                                  <Private>True</Private>
+                                </Reference>
+                              </ItemGroup>
+                            </Project>
+                            """);
+                        await File.WriteAllTextAsync(packagesConfigPath, """
+                            <?xml version="1.0" encoding="utf-8"?>
+                            <packages>
+                              <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
+                            </packages>
+                            """);
+                        break;
+                    case ("ProjectB.csproj", "Some.Package"):
+                        await File.WriteAllTextAsync(projectPath, """
+                            <Project Sdk="Microsoft.NET.Sdk">
+                              <PropertyGroup>
+                                <TargetFramework>net8.0</TargetFramework>
+                              </PropertyGroup>
+                              <ItemGroup>
+                                <PackageReference Include="Some.Package" Version="1.0.1" />
+                              </ItemGroup>
+                            </Project>
+                            """);
+                        break;
+                    case ("ProjectB.csproj", "Some.Package2"):
+                        await File.WriteAllTextAsync(projectPath, """
+                            <Project Sdk="Microsoft.NET.Sdk">
+                              <PropertyGroup>
+                                <TargetFramework>net8.0</TargetFramework>
+                              </PropertyGroup>
+                              <ItemGroup>
+                                <PackageReference Include="Some.Package" Version="1.0.1" />
+                              </ItemGroup>
+                              <ItemGroup>
+                                <Reference Include="Some.Package2">
+                                  <HintPath>..\packages\Some.Package2.2.0.1\lib\net8.0\Some.Package2.dll</HintPath>
+                                  <Private>True</Private>
+                                </Reference>
+                              </ItemGroup>
+                            </Project>
+                            """);
+                        await File.WriteAllTextAsync(packagesConfigPath, """
+                            <?xml version="1.0" encoding="utf-8"?>
+                            <packages>
+                              <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
+                            </packages>
+                            """);
+                        break;
+                    default:
+                        throw new NotSupportedException();
+                }
+
+                return new UpdateOperationResult();
+            }),
             expectedResult: new RunResult()
             {
                 Base64DependencyFiles =
@@ -807,7 +1085,7 @@ public class RunWorkerTests
                     [
                         new DependencyFile()
                         {
-                            Name = "../ProjectB/ProjectB.csproj",
+                            Name = "ProjectB.csproj",
                             Directory = "/some-dir/ProjectB",
                             Content = """
                                 <Project Sdk="Microsoft.NET.Sdk">
@@ -828,7 +1106,7 @@ public class RunWorkerTests
                         },
                         new DependencyFile()
                         {
-                            Name = "../ProjectB/packages.config",
+                            Name = "packages.config",
                             Directory = "/some-dir/ProjectB",
                             Content = """
                                 <?xml version="1.0" encoding="utf-8"?>
@@ -883,7 +1161,7 @@ public class RunWorkerTests
         );
     }
 
-    private static async Task RunAsync(Job job, TestFile[] files, RunResult? expectedResult, object[] expectedApiMessages, MockNuGetPackage[]? packages = null, string? repoContentsPath = null)
+    private static async Task RunAsync(Job job, TestFile[] files, IDiscoveryWorker? discoveryWorker, IAnalyzeWorker? analyzeWorker, IUpdaterWorker? updaterWorker, RunResult expectedResult, object[] expectedApiMessages, MockNuGetPackage[]? packages = null, ExperimentsManager? experimentsManager = null, string? repoContentsPath = null)
     {
         // arrange
         using var tempDirectory = new TemporaryDirectory();
@@ -898,9 +1176,15 @@ public class RunWorkerTests
         }
 
         // act
+        experimentsManager ??= new ExperimentsManager();
         var testApiHandler = new TestApiHandler();
-        var worker = new RunWorker(testApiHandler, new TestLogger());
-        var repoContentsPathDirectoryInfo = new DirectoryInfo(repoContentsPath);
+        var logger = new TestLogger();
+        discoveryWorker ??= new DiscoveryWorker(logger);
+        analyzeWorker ??= new AnalyzeWorker(logger);
+        updaterWorker ??= new UpdaterWorker(experimentsManager, logger);
+
+        var worker = new RunWorker(testApiHandler, discoveryWorker, analyzeWorker, updaterWorker, logger);
+        var repoContentsPathDirectoryInfo = new DirectoryInfo(tempDirectory.DirectoryPath);
         var actualResult = await worker.RunAsync(job, repoContentsPathDirectoryInfo, "TEST-COMMIT-SHA");
         var actualApiMessages = testApiHandler.ReceivedMessages.ToArray();