dependabot-nuget 0.280.0 → 0.282.0

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

@@ -44,13 +44,14 @@ internal static partial class MSBuildHelper
         }
     }
 
-    public static async Task SidelineGlobalJsonAsync(string currentDirectory, string rootDirectory, Func<Task> action, bool retainMSBuildSdks = false)
+    public static async Task SidelineGlobalJsonAsync(string currentDirectory, string rootDirectory, Func<Task> action, ILogger? logger = null, bool retainMSBuildSdks = false)
     {
+        logger ??= new ConsoleLogger();
         var candidateDirectories = PathHelper.GetAllDirectoriesToRoot(currentDirectory, rootDirectory);
         var globalJsonPaths = candidateDirectories.Select(d => Path.Combine(d, "global.json")).Where(File.Exists).Select(p => (p, p + Guid.NewGuid().ToString())).ToArray();
         foreach (var (globalJsonPath, tempGlobalJsonPath) in globalJsonPaths)
         {
-            Console.WriteLine($"Temporarily removing `global.json` from `{Path.GetDirectoryName(globalJsonPath)}`{(retainMSBuildSdks ? " and retaining MSBuild SDK declarations" : string.Empty)}.");
+            logger.Log($"Temporarily removing `global.json` from `{Path.GetDirectoryName(globalJsonPath)}`{(retainMSBuildSdks ? " and retaining MSBuild SDK declarations" : string.Empty)}.");
             File.Move(globalJsonPath, tempGlobalJsonPath);
             if (retainMSBuildSdks)
             {
@@ -78,7 +79,7 @@ internal static partial class MSBuildHelper
         {
             foreach (var (globalJsonpath, tempGlobalJsonPath) in globalJsonPaths)
             {
-                Console.WriteLine($"Restoring `global.json` to `{Path.GetDirectoryName(globalJsonpath)}`.");
+                logger.Log($"Restoring `global.json` to `{Path.GetDirectoryName(globalJsonpath)}`.");
                 File.Move(tempGlobalJsonPath, globalJsonpath, overwrite: retainMSBuildSdks);
             }
         }
@@ -316,7 +317,7 @@ internal static partial class MSBuildHelper
         return false;
     }
 
-    internal static async Task<bool> DependenciesAreCoherentAsync(string repoRoot, string projectPath, string targetFramework, Dependency[] packages, Logger logger)
+    internal static async Task<bool> DependenciesAreCoherentAsync(string repoRoot, string projectPath, string targetFramework, Dependency[] packages, ILogger logger)
     {
         var tempDirectory = Directory.CreateTempSubdirectory("package-dependency-coherence_");
         try
@@ -339,19 +340,7 @@ internal static partial class MSBuildHelper
         return Environment.GetEnvironmentVariable("UseNewNugetPackageResolver") == "true";
     }
 
-    internal static async Task<Dependency[]?> ResolveDependencyConflicts(string repoRoot, string projectPath, string targetFramework, Dependency[] packages, Dependency[] update, Logger logger)
-    {
-        if (UseNewDependencySolver())
-        {
-            return await ResolveDependencyConflictsNew(repoRoot, projectPath, targetFramework, packages, update, logger);
-        }
-        else
-        {
-            return await ResolveDependencyConflictsOld(repoRoot, projectPath, targetFramework, packages, logger);
-        }
-    }
-
-    internal static async Task<Dependency[]?> ResolveDependencyConflictsNew(string repoRoot, string projectPath, string targetFramework, Dependency[] packages, Dependency[] update, Logger logger)
+    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_");
         PackageManager packageManager = new PackageManager(repoRoot, projectPath);
@@ -417,7 +406,7 @@ internal static partial class MSBuildHelper
                 // Update all to new versions
                 foreach (var package in existingDuplicate)
                 {
-                    string updateResult = await packageManager.UpdateVersion(existingDuplicate, package, targetFramework, Path.GetDirectoryName(projectPath));
+                    string updateResult = await packageManager.UpdateVersion(existingDuplicate, package, targetFramework, Path.GetDirectoryName(projectPath), logger);
                 }
             }
 
@@ -433,7 +422,7 @@ internal static partial class MSBuildHelper
                 // Update all to new versions
                 foreach (var package in existingPackages)
                 {
-                    string updateResult = await packageManager.UpdateVersion(existingPackages, package, targetFramework, Path.GetDirectoryName(projectPath));
+                    string updateResult = await packageManager.UpdateVersion(existingPackages, package, targetFramework, Path.GetDirectoryName(projectPath), logger);
                 }
             }
 
@@ -509,7 +498,7 @@ internal static partial class MSBuildHelper
         }
     }
 
-    internal static async Task<Dependency[]?> ResolveDependencyConflictsOld(string repoRoot, string projectPath, string targetFramework, Dependency[] packages, Logger logger)
+    internal static async Task<Dependency[]?> ResolveDependencyConflictsWithBruteForce(string repoRoot, string projectPath, string targetFramework, Dependency[] packages, ILogger logger)
     {
         var tempDirectory = Directory.CreateTempSubdirectory("package-dependency-coherence_");
         try
@@ -712,6 +701,8 @@ internal static partial class MSBuildHelper
                 <GenerateDependencyFile>true</GenerateDependencyFile>
                 <RunAnalyzers>false</RunAnalyzers>
                 <NuGetInteractive>false</NuGetInteractive>
+                <DesignTimeBuild>true</DesignTimeBuild>
+                <TargetPlatformVersion Condition=" $(TargetFramework.Contains('-')) ">1.0</TargetPlatformVersion>
               </PropertyGroup>
               <ItemGroup>
                 {packageReferences}
@@ -762,7 +753,7 @@ internal static partial class MSBuildHelper
         string projectPath,
         string targetFramework,
         IReadOnlyCollection<Dependency> packages,
-        Logger? logger = null)
+        ILogger? logger = null)
     {
         var tempDirectory = Directory.CreateTempSubdirectory("package-dependency-resolution_");
         try
@@ -823,13 +814,24 @@ internal static partial class MSBuildHelper
         }
     }
 
-    internal static void ThrowOnMissingFile(string output)
+    internal static string? GetMissingFile(string output)
     {
         var missingFilePattern = new Regex(@"The imported project \""(?<FilePath>.*)\"" was not found");
         var match = missingFilePattern.Match(output);
         if (match.Success)
         {
-            throw new MissingFileException(match.Groups["FilePath"].Value);
+            return match.Groups["FilePath"].Value;
+        }
+
+        return null;
+    }
+
+    internal static void ThrowOnMissingFile(string output)
+    {
+        var missingFile = GetMissingFile(output);
+        if (missingFile is not null)
+        {
+            throw new MissingFileException(missingFile);
         }
     }
 

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

@@ -20,7 +20,7 @@ internal static class NuGetHelper
         return false;
     }
 
-    internal static async Task<bool> DownloadNuGetPackagesAsync(string repoRoot, string projectPath, IReadOnlyCollection<Dependency> packages, Logger logger)
+    internal static async Task<bool> DownloadNuGetPackagesAsync(string repoRoot, string projectPath, IReadOnlyCollection<Dependency> packages, ILogger logger)
     {
         var tempDirectory = Directory.CreateTempSubdirectory("msbuild_sdk_restore_");
         try

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

@@ -36,7 +36,7 @@ public class AnalyzeWorkerTestBase
             var discoveryPath = Path.GetFullPath(DiscoveryWorker.DiscoveryResultFileName, directoryPath);
             var dependencyPath = Path.GetFullPath(relativeDependencyPath, directoryPath);
 
-            var worker = new AnalyzeWorker(new Logger(verbose: true));
+            var worker = new AnalyzeWorker(new TestLogger());
             var result = await worker.RunWithErrorHandlingAsync(directoryPath, discoveryPath, dependencyPath);
             return result;
         });

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

@@ -739,7 +739,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
             ErrorDetails = "<some package feed>",
             UpdatedVersion = "",
             UpdatedDependencies = [],
-        }, new Logger(false));
+        }, new TestLogger());
         var discoveryContents = await File.ReadAllTextAsync(Path.Combine(temporaryDirectory.DirectoryPath, "Some.Dependency.json"));
 
         // raw result file should look like this:

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

@@ -30,7 +30,7 @@ public class CompatibilityCheckerTests
             projectFrameworks,
             isDevDependency,
             packageFrameworks,
-            new Logger(verbose: false));
+            new TestLogger());
 
         Assert.True(result);
     }
@@ -53,7 +53,7 @@ public class CompatibilityCheckerTests
             projectFrameworks,
             isDevDependency,
             packageFrameworks,
-            new Logger(verbose: false));
+            new TestLogger());
 
         Assert.False(result);
     }
@@ -76,7 +76,7 @@ public class CompatibilityCheckerTests
             projectFrameworks,
             isDevDependency,
             packageFrameworks,
-            new Logger(verbose: false));
+            new TestLogger());
 
         Assert.False(result);
     }
@@ -97,7 +97,7 @@ public class CompatibilityCheckerTests
             projectFrameworks,
             isDevDependency,
             packageFrameworks,
-            new Logger(verbose: false));
+            new TestLogger());
 
         Assert.True(result);
     }
@@ -118,7 +118,7 @@ public class CompatibilityCheckerTests
             projectFrameworks,
             isDevDependency,
             packageFrameworks,
-            new Logger(verbose: false));
+            new TestLogger());
 
         Assert.False(result);
     }
@@ -138,7 +138,7 @@ public class CompatibilityCheckerTests
             projectFrameworks,
             isDevDependency,
             packageFrameworks,
-            new Logger(verbose: false));
+            new TestLogger());
 
         Assert.False(result);
     }
@@ -161,7 +161,7 @@ public class CompatibilityCheckerTests
             projectFrameworks,
             isDevDependency,
             packageFrameworks,
-            new Logger(verbose: false));
+            new TestLogger());
 
         Assert.True(result);
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/DependencySolverEnvironment.cs

@@ -0,0 +1,12 @@
+namespace NuGetUpdater.Core.Test;
+
+/// <summary>
+/// Prepares the environment to use the new dependency solver.
+/// </summary>
+public class DependencySolverEnvironment : TemporaryEnvironment
+{
+    public DependencySolverEnvironment(bool useDependencySolver = true)
+        : base([("UseNewNugetPackageResolver", useDependencySolver ? "true" : "false")])
+    {
+    }
+}

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

@@ -24,7 +24,7 @@ public class DiscoveryWorkerTestBase
         {
             await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, directoryPath);
 
-            var worker = new DiscoveryWorker(new Logger(verbose: true));
+            var worker = new DiscoveryWorker(new TestLogger());
             var result = await worker.RunWithErrorHandlingAsync(directoryPath, workspacePath);
             return result;
         });

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

@@ -32,7 +32,7 @@ public class DotnetToolsJsonBuildFileTests
         basePath: "/",
         path: "/.config/dotnet-tools.json",
         contents: DotnetToolsJson,
-        logger: new Logger(verbose: true));
+        logger: new TestLogger());
 
     [Fact]
     public void GetDependencies_ReturnsDependencies()

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

@@ -30,7 +30,7 @@ public class GlobalJsonBuildFileTests
         basePath: "/",
         path: "/global.json",
         contents: contents,
-        logger: new Logger(verbose: true));
+        logger: new TestLogger());
 
     [Fact]
     public void GlobalJson_Malformed_DoesNotThrow()

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/FrameworkChecker/CompatibilityCheckerFacts.cs

@@ -20,7 +20,7 @@ public class CompatibilityCheckerFacts
     [InlineData("net4.8", "netstandard1.3")]
     public void PackageContainsCompatibleFramework(string projectTfm, string packageTfm)
     {
-        var result = CompatibilityChecker.IsCompatible([projectTfm], [packageTfm], new Logger(verbose: true));
+        var result = CompatibilityChecker.IsCompatible([projectTfm], [packageTfm], new TestLogger());
 
         Assert.True(result);
     }
@@ -37,7 +37,7 @@ public class CompatibilityCheckerFacts
     [InlineData("net7.0", "net48")]
     public void PackageContainsIncompatibleFramework(string projectTfm, string packageTfm)
     {
-        var result = CompatibilityChecker.IsCompatible([projectTfm], [packageTfm], new Logger(verbose: true));
+        var result = CompatibilityChecker.IsCompatible([projectTfm], [packageTfm], new TestLogger());
 
         Assert.False(result);
     }
@@ -48,7 +48,7 @@ public class CompatibilityCheckerFacts
     [InlineData(new[] { "net6.0", "net6.0-windows10.0.19041" }, new[] { "net6.0", ".NETStandard2.0" })]
     public void PackageContainsCompatibleFrameworks(string[] projectTfms, string[] packageTfms)
     {
-        var result = CompatibilityChecker.IsCompatible(projectTfms, packageTfms, new Logger(verbose: true));
+        var result = CompatibilityChecker.IsCompatible(projectTfms, packageTfms, new TestLogger());
 
         Assert.True(result);
     }
@@ -57,7 +57,7 @@ public class CompatibilityCheckerFacts
     [InlineData(new[] { "net7.0", "net472" }, new[] { "net5.0" })]
     public void PackageContainsIncompatibleFrameworks(string[] projectTfms, string[] packageTfms)
     {
-        var result = CompatibilityChecker.IsCompatible(projectTfms, packageTfms, new Logger(verbose: true));
+        var result = CompatibilityChecker.IsCompatible(projectTfms, packageTfms, new TestLogger());
 
         Assert.False(result);
     }

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

@@ -276,7 +276,7 @@ public class RunWorkerTests
 
         // act
         var testApiHandler = new TestApiHandler();
-        var worker = new RunWorker(testApiHandler, new Logger(verbose: false));
+        var worker = new RunWorker(testApiHandler, new TestLogger());
         var repoContentsPath = new DirectoryInfo(tempDirectory.DirectoryPath);
         var actualResult = await worker.RunAsync(job, repoContentsPath, "TEST-COMMIT-SHA");
         var actualApiMessages = testApiHandler.ReceivedMessages.ToArray();

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestLogger.cs

@@ -0,0 +1,11 @@
+using System.Diagnostics;
+
+namespace NuGetUpdater.Core.Test;
+
+public class TestLogger : ILogger
+{
+    public void Log(string message)
+    {
+        Debug.WriteLine(message);
+    }
+}

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

@@ -0,0 +1,8 @@
+using NuGetUpdater.Core.Updater;
+
+namespace NuGetUpdater.Core.Test.Updater;
+
+public record ExpectedUpdateOperationResult : UpdateOperationResult
+{
+    public string? ErrorDetailsRegex { get; init; } = null;
+}

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

@@ -30,7 +30,7 @@ public class PackagesConfigUpdaterTests : TestBase
             """,
             "Newtonsoft.Json",
             "7.0.1",
-            @"..\packages"
+            "../packages"
         ];
 
         // project without namespace
@@ -48,7 +48,7 @@ public class PackagesConfigUpdaterTests : TestBase
             """,
             "Newtonsoft.Json",
             "7.0.1",
-            @"..\packages"
+            "../packages"
         ];
 
         // project with non-standard packages path
@@ -66,7 +66,7 @@ public class PackagesConfigUpdaterTests : TestBase
             """,
             "Newtonsoft.Json",
             "7.0.1",
-            @"..\not-a-path-you-would-expect"
+            "../not-a-path-you-would-expect"
         ];
     }
 }

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

@@ -1,3 +1,4 @@
+using NuGetUpdater.Core.Test.Updater;
 using NuGetUpdater.Core.Updater;
 
 using Xunit;
@@ -91,7 +92,7 @@ public abstract class UpdateWorkerTestBase : TestBase
         TestFile[]? additionalFilesExpected = null,
         MockNuGetPackage[]? packages = null,
         string projectFilePath = "test-project.csproj",
-        UpdateOperationResult? expectedResult = null)
+        ExpectedUpdateOperationResult? expectedResult = null)
         => TestUpdateForProject(
             dependencyName,
             oldVersion,
@@ -114,7 +115,7 @@ public abstract class UpdateWorkerTestBase : TestBase
         TestFile[]? additionalFiles = null,
         TestFile[]? additionalFilesExpected = null,
         MockNuGetPackage[]? packages = null,
-        UpdateOperationResult? expectedResult = null)
+        ExpectedUpdateOperationResult? expectedResult = null)
     {
         additionalFiles ??= [];
         additionalFilesExpected ??= [];
@@ -133,7 +134,7 @@ public abstract class UpdateWorkerTestBase : TestBase
             await MockNuGetPackagesInDirectory(packages, temporaryDirectory);
 
             // run update
-            var worker = new UpdaterWorker(new Logger(verbose: true));
+            var worker = new UpdaterWorker(new TestLogger());
             var projectPath = placeFilesInSrc ? $"src/{projectFilePath}" : projectFilePath;
             var actualResult = await worker.RunWithErrorHandlingAsync(temporaryDirectory, projectPath, dependencyName, oldVersion, newVersion, isTransitive);
             if (expectedResult is { })
@@ -151,10 +152,17 @@ public abstract class UpdateWorkerTestBase : TestBase
         AssertContainsFiles(expectedResultFiles, actualResult);
     }
 
-    protected static void ValidateUpdateOperationResult(UpdateOperationResult expectedResult, UpdateOperationResult actualResult)
+    protected static void ValidateUpdateOperationResult(ExpectedUpdateOperationResult expectedResult, UpdateOperationResult actualResult)
     {
         Assert.Equal(expectedResult.ErrorType, actualResult.ErrorType);
-        Assert.Equivalent(expectedResult.ErrorDetails, actualResult.ErrorDetails);
+        if (expectedResult.ErrorDetailsRegex is not null && actualResult.ErrorDetails is string errorDetails)
+        {
+            Assert.Matches(expectedResult.ErrorDetailsRegex, errorDetails);
+        }
+        else
+        {
+            Assert.Equivalent(expectedResult.ErrorDetails, actualResult.ErrorDetails);
+        }
     }
 
     protected static Task TestNoChangeforSolution(
@@ -229,7 +237,7 @@ public abstract class UpdateWorkerTestBase : TestBase
             await MockNuGetPackagesInDirectory(packages, temporaryDirectory);
 
             var slnPath = Path.Combine(temporaryDirectory, slnName);
-            var worker = new UpdaterWorker(new Logger(verbose: true));
+            var worker = new UpdaterWorker(new TestLogger());
             await worker.RunAsync(temporaryDirectory, slnPath, dependencyName, oldVersion, newVersion, isTransitive);
         });
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.DirsProj.cs

@@ -364,7 +364,7 @@ public partial class UpdateWorkerTests
                 await MockNuGetPackagesInDirectory(packages, temporaryDirectory);
 
                 var projectPath = Path.Combine(temporaryDirectory, projectFileName);
-                var worker = new UpdaterWorker(new Logger(verbose: true));
+                var worker = new UpdaterWorker(new TestLogger());
                 await worker.RunAsync(temporaryDirectory, projectPath, dependencyName, oldVersion, newVersion, isTransitive);
             });
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Mixed.cs

@@ -20,7 +20,7 @@ public partial class UpdateWorkerTests
                 ErrorDetails = "<some package feed>",
             };
             var resultFilePath = Path.Combine(temporaryDirectory.DirectoryPath, "update-result.json");
-            await UpdaterWorker.WriteResultFile(result, resultFilePath, new Logger(false));
+            await UpdaterWorker.WriteResultFile(result, resultFilePath, new TestLogger());
             var resultContent = await File.ReadAllTextAsync(resultFilePath);
 
             // raw result file should look like this: