dependabot-nuget 0.287.0 → 0.289.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bb2d903f08322511a7917fba47df7b66208dbbaca42e52d30a1954f9ef3eaa2
-  data.tar.gz: f19cfed3ad2939c93812727546b53ecec603c712641a6c1d0581469cce72d584
+  metadata.gz: 36551f131fff2d82f525e8eb3bd17f26da2d435f4c44484f2b91e0253f041e8f
+  data.tar.gz: c97b1b5899bfac76abd674bf58f8853b7790b5e90d74089f2f663dd12f82fd89
 SHA512:
-  metadata.gz: a3fdc15bd985678106cf45f57c6af6dd4be57858f54b50abea6f4521a8aed3ab66b7ca67cb54f9e73dabe536d8c012619bbf049662207211bc92cbb5e938c321
-  data.tar.gz: 3542f489f10b67fe78b3bd55703cc420a58279bf5fb131da4a99be0d99a20fcd7430b124c4b49100929b74f39178b3c7e108e7bb0170baef5f5a91a16dfbd63f
+  metadata.gz: '09e24d02174892b6d10f70bd7e26a200ff0f5d352ba3a69d826598a891d52990c3fd1e839088e4d797df0af6edb53fdb9f3ef9205352c2641cc818b3d603fb97'
+  data.tar.gz: 3d9b2b81fee8ff8791796f9d7453f82cdd72a79d2ba3a103303475378fd387d9fb6caedb57688b322dffdb019172ca03910ae6256f79c392d99a233f110e585e

data/helpers/lib/NuGetUpdater/.gitignore

@@ -4,3 +4,4 @@ bin/
 obj/
 Properties/launchSettings.json
 NuGetUpdater.sln.DotSettings.user
+*.binlog

data/helpers/lib/NuGetUpdater/Directory.Build.targets

@@ -0,0 +1,17 @@
+<Project>
+  <ItemGroup>
+    <!--
+    The NuGetUpdater.Core project needs to reference `Microsoft.Build.*`, et al. packages, but they require some
+    special handling. The documentation explains that:
+
+    https://learn.microsoft.com/en-us/visualstudio/msbuild/find-and-use-msbuild-versions?view=vs-2022#use-nuget-packages-preferred
+
+    The `ExcludeAssets` attribute doesn't do what we'd like through a <ProjectReference> element, so to get around that
+    we're adding the packages to _all_ projects so they all get the `ExcludeAssets` behavior.  For more information see
+    this: https://github.com/dotnet/sdk/issues/42708
+    -->
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" PrivateAssets="all" />
+  </ItemGroup>
+</Project>

data/helpers/lib/NuGetUpdater/Directory.Packages.props

@@ -4,30 +4,39 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageVersion Include="DiffPlex" Version="1.7.1" />
+  <PropertyGroup>
+    <MSBuildPackageVersion>17.12.6</MSBuildPackageVersion>
+  </PropertyGroup>
 
+  <ItemGroup>
+    <PackageVersion Include="DiffPlex" Version="1.7.2" />
     <PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.93" />
-
-    <PackageVersion Include="Microsoft.Build.Locator" Version="1.6.1" />
-    <PackageVersion Include="Microsoft.Build" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
-
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-
-    <PackageVersion Include="NuGet.Core" Version="2.14.0-rtm-832" Aliases="CoreV2" />
-
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
+    <PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" />
+    <PackageVersion Include="Microsoft.Web.Xdt" Version="3.1.0" />
+    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NuGet.Core" Version="2.14.0" Aliases="CoreV2" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
-    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="9.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.0" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 
 </Project>

data/helpers/lib/NuGetUpdater/NuGetProjects/NuGet.Packaging/NuGet.Packaging.csproj

@@ -14,7 +14,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
-    <PackageReference Include="System.Security.Cryptography.Cng" />
   </ItemGroup>
 
   <ItemGroup>

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/DiscoverCommand.cs

@@ -7,6 +7,7 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class DiscoverCommand
 {
+    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { IsRequired = true };
     internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root") { IsRequired = true };
     internal static readonly Option<string> WorkspaceOption = new("--workspace") { IsRequired = true };
     internal static readonly Option<FileInfo> OutputOption = new("--output") { IsRequired = true };
@@ -15,6 +16,7 @@ internal static class DiscoverCommand
     {
         Command command = new("discover", "Generates a report of the workspace dependencies and where they are located.")
         {
+            JobPathOption,
             RepoRootOption,
             WorkspaceOption,
             OutputOption
@@ -22,11 +24,13 @@ internal static class DiscoverCommand
 
         command.TreatUnmatchedTokensAsErrors = true;
 
-        command.SetHandler(async (repoRoot, workspace, outputPath) =>
+        command.SetHandler(async (jobPath, repoRoot, workspace, outputPath) =>
         {
-            var worker = new DiscoveryWorker(new ConsoleLogger());
+            var logger = new ConsoleLogger();
+            var experimentsManager = await ExperimentsManager.FromJobFileAsync(jobPath.FullName, logger);
+            var worker = new DiscoveryWorker(experimentsManager, logger);
             await worker.RunAsync(repoRoot.FullName, workspace, outputPath.FullName);
-        }, RepoRootOption, WorkspaceOption, OutputOption);
+        }, JobPathOption, RepoRootOption, WorkspaceOption, OutputOption);
 
         return command;
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/RunCommand.cs

@@ -35,7 +35,7 @@ internal static class RunCommand
             var apiHandler = new HttpApiHandler(apiUrl.ToString(), jobId);
             var logger = new ConsoleLogger();
             var experimentsManager = await ExperimentsManager.FromJobFileAsync(jobPath.FullName, logger);
-            var discoverWorker = new DiscoveryWorker(logger);
+            var discoverWorker = new DiscoveryWorker(experimentsManager, logger);
             var analyzeWorker = new AnalyzeWorker(logger);
             var updateWorker = new UpdaterWorker(experimentsManager, logger);
             var worker = new RunWorker(apiHandler, discoverWorker, analyzeWorker, updateWorker, logger);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Analyze.cs

@@ -94,7 +94,9 @@ public partial class EntryPointTests
                               "TargetFrameworks": [
                                 "net8.0"
                               ],
-                              "ReferencedProjectPaths": []
+                              "ReferencedProjectPaths": [],
+                              "ImportedFiles": [],
+                              "AdditionalFiles": []
                             }
                           ],
                           "DirectoryPackagesProps": null,

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Discover.cs

@@ -17,12 +17,16 @@ public partial class EntryPointTests
 {
     public class Discover : DiscoveryWorkerTestBase
     {
-        [Fact]
-        public async Task PathWithSpaces()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task PathWithSpaces(bool useDirectDiscovery)
         {
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -30,11 +34,15 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
-                packages: [],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
+                ],
                 initialFiles:
                 [
                     ("path/to/some directory with spaces/project.csproj", """
-                        <Project Sdk="Microsoft.NETSdk">
+                        <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
                             <TargetFramework>net8.0</TargetFramework>
                           </PropertyGroup>
@@ -52,26 +60,31 @@ public partial class EntryPointTests
                         {
                             FilePath = "project.csproj",
                             TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                             ],
                             Properties = [
                                 new("TargetFramework", "net8.0", "path/to/some directory with spaces/project.csproj"),
                             ],
+                            ReferencedProjectPaths = [],
+                            ImportedFiles = [],
+                            AdditionalFiles = [],
                         }
                     ]
                 }
             );
         }
 
-        [Fact]
-        public async Task WithSolution()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WithSolution(bool useDirectDiscovery)
         {
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -79,6 +92,7 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -141,13 +155,14 @@ public partial class EntryPointTests
                         {
                             FilePath = "path/to/my.csproj",
                             TargetFrameworks = ["net45"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "7.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net45"]),
                             ],
-                            Properties = [
-                                new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
+                            Properties = [],
+                            ReferencedProjectPaths = [],
+                            ImportedFiles = [],
+                            AdditionalFiles = [
+                                "packages.config"
                             ],
                         }
                     ]
@@ -155,12 +170,16 @@ public partial class EntryPointTests
             );
         }
 
-        [Fact]
-        public async Task WithProject()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WithProject(bool useDirectDiscovery)
         {
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -168,6 +187,7 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -207,13 +227,14 @@ public partial class EntryPointTests
                         {
                             FilePath = "my.csproj",
                             TargetFrameworks = ["net45"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "7.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net45"])
                             ],
-                            Properties = [
-                                new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
+                            Properties = [],
+                            ReferencedProjectPaths = [],
+                            ImportedFiles = [],
+                            AdditionalFiles = [
+                                "packages.config"
                             ],
                         }
                     ]
@@ -221,13 +242,17 @@ public partial class EntryPointTests
             );
         }
 
-        [Fact]
-        public async Task WithDirectory()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WithDirectory(bool useDirectDiscovery)
         {
             var workspacePath = "path/to/";
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -235,6 +260,7 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -274,13 +300,14 @@ public partial class EntryPointTests
                         {
                             FilePath = "my.csproj",
                             TargetFrameworks = ["net45"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "7.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net45"])
                             ],
-                            Properties = [
-                                new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
+                            Properties = [],
+                            ReferencedProjectPaths = [],
+                            ImportedFiles = [],
+                            AdditionalFiles = [
+                                "packages.config"
                             ],
                         }
                     ]
@@ -294,6 +321,8 @@ public partial class EntryPointTests
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -304,27 +333,33 @@ public partial class EntryPointTests
                 new[]
                 {
                     ("path/to/my.csproj", """
-                        <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                        <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
                             <TargetFramework>net8.0</TargetFramework>
+                            <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
                           </PropertyGroup>
                           <ItemGroup>
-                            <PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
+                            <PackageReference Include="Package.A" Version="1.2.3" />
                           </ItemGroup>
-                          <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
                         </Project>
                         """),
                     ("path/Directory.Build.props", """
                         <Project>
-                            <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
-                              <GlobalPackageReference Include="System.Text.Json" Version="8.0.3" />
-                            </ItemGroup>
                             <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' != 'true'">
-                              <PackageReference Include="System.Text.Json" Version="8.0.3" />
+                              <PackageReference Include="Package.B" Version="4.5.6" />
+                            </ItemGroup>
+                            <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
+                              <GlobalPackageReference Include="Package.B" Version="7.8.9" />
                             </ItemGroup>
                         </Project>
                         """)
                 },
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net8.0"),
+                ],
                 expectedResult: new()
                 {
                     Path = "path/to",
@@ -333,29 +368,22 @@ public partial class EntryPointTests
                         {
                             FilePath = "my.csproj",
                             TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
                             ExpectedDependencyCount = 2,
                             Dependencies = [
-                                new("Newtonsoft.Json", "7.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
-                                // $(ManagePackageVersionsCentrally) evaluates false by default, we only get a PackageReference
-                                new("System.Text.Json", "8.0.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"])
+                                new("Package.A", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                                new("Package.B", "4.5.6", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                             ],
                             Properties = [
+                                new("ManagePackageVersionsCentrally", "false", "path/to/my.csproj"),
                                 new("TargetFramework", "net8.0", "path/to/my.csproj"),
                             ],
-                        },
-                        new()
-                        {
-                            FilePath = "../Directory.Build.props",
                             ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
-                            Dependencies = [
-                                new("System.Text.Json", "8.0.3", DependencyType.PackageReference, IsDirect: true),
-                                new("System.Text.Json", "8.0.3", DependencyType.GlobalPackageReference, IsDirect: true)
+                            ImportedFiles = [
+                                "../Directory.Build.props"
                             ],
-                            Properties = [],
+                            AdditionalFiles = [],
                         }
-                    ]
+                    ],
                 }
             );
         }
@@ -364,8 +392,10 @@ public partial class EntryPointTests
             Func<string, string[]> getArgs,
             TestFile[] initialFiles,
             ExpectedWorkspaceDiscoveryResult expectedResult,
-            MockNuGetPackage[]? packages = null)
+            MockNuGetPackage[]? packages = null,
+            ExperimentsManager? experimentsManager = null)
         {
+            experimentsManager ??= new ExperimentsManager();
             var actualResult = await RunDiscoveryAsync(initialFiles, async path =>
             {
                 var sb = new StringBuilder();
@@ -378,8 +408,19 @@ public partial class EntryPointTests
 
                 try
                 {
+                    await UpdateWorkerTestBase.MockJobFileInDirectory(path, experimentsManager);
                     await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, path);
                     var args = getArgs(path);
+
+                    // manually pull out the experiments manager for the validate step below
+                    for (int i = 0; i < args.Length - 1; i++)
+                    {
+                        if (args[i] == "--job-path")
+                        {
+                            experimentsManager = await ExperimentsManager.FromJobFileAsync(args[i + 1], new TestLogger());
+                        }
+                    }
+
                     var result = await Program.Main(args);
                     if (result != 0)
                     {
@@ -398,7 +439,7 @@ public partial class EntryPointTests
                 return resultObject!;
             });
 
-            ValidateWorkspaceResult(expectedResult, actualResult);
+            ValidateWorkspaceResult(expectedResult, actualResult, experimentsManager);
         }
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/AnalyzeWorker.cs

@@ -21,7 +21,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
     internal static readonly JsonSerializerOptions SerializerOptions = new()
     {
         WriteIndented = true,
-        Converters = { new JsonStringEnumConverter(), new RequirementConverter() },
+        Converters = { new JsonStringEnumConverter(), new RequirementArrayConverter() },
     };
 
     public AnalyzeWorker(ILogger logger)
@@ -32,15 +32,15 @@ public partial class AnalyzeWorker : IAnalyzeWorker
     public async Task RunAsync(string repoRoot, string discoveryPath, string dependencyPath, string analysisDirectory)
     {
         var analysisResult = await RunWithErrorHandlingAsync(repoRoot, discoveryPath, dependencyPath);
-        var dependencyInfo = await DeserializeJsonFileAsync<DependencyInfo>(dependencyPath, nameof(DependencyInfo));
+        var dependencyInfo = await DeserializeDependencyInfoFileAsync(dependencyPath);
         await WriteResultsAsync(analysisDirectory, dependencyInfo.Name, analysisResult, _logger);
     }
 
     internal async Task<AnalysisResult> RunWithErrorHandlingAsync(string repoRoot, string discoveryPath, string dependencyPath)
     {
         AnalysisResult analysisResult;
-        var discovery = await DeserializeJsonFileAsync<WorkspaceDiscoveryResult>(discoveryPath, nameof(WorkspaceDiscoveryResult));
-        var dependencyInfo = await DeserializeJsonFileAsync<DependencyInfo>(dependencyPath, nameof(DependencyInfo));
+        var discovery = await DeserializeWorkspaceDiscoveryResultFileAsync(discoveryPath);
+        var dependencyInfo = await DeserializeDependencyInfoFileAsync(dependencyPath);
 
         try
         {
@@ -68,7 +68,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
     {
         var startingDirectory = PathHelper.JoinPath(repoRoot, discovery.Path);
 
-        _logger.Log($"Starting analysis of {dependencyInfo.Name}...");
+        _logger.Info($"Starting analysis of {dependencyInfo.Name}...");
 
         // We need to find all projects which have the given dependency. Even in cases that they
         // have it transitively may require that peer dependencies be updated in the project.
@@ -97,7 +97,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
         AnalysisResult analysisResult;
         if (isUpdateNecessary)
         {
-            _logger.Log($"  Determining multi-dependency property.");
+            _logger.Info($"  Determining multi-dependency property.");
             var multiDependencies = DetermineMultiDependencyDetails(
                 discovery,
                 dependencyInfo.Name,
@@ -117,7 +117,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
                     .ToImmutableArray()
                 : projectFrameworks;
 
-            _logger.Log($"  Finding updated version.");
+            _logger.Info($"  Finding updated version.");
             updatedVersion = await FindUpdatedVersionAsync(
                 startingDirectory,
                 dependencyInfo,
@@ -127,7 +127,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
                 _logger,
                 CancellationToken.None);
 
-            _logger.Log($"  Finding updated peer dependencies.");
+            _logger.Info($"  Finding updated peer dependencies.");
             if (updatedVersion is null)
             {
                 updatedDependencies = [];
@@ -173,7 +173,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
             UpdatedDependencies = updatedDependencies,
         };
 
-        _logger.Log($"Analysis complete.");
+        _logger.Info($"Analysis complete.");
         return analysisResult;
     }
 
@@ -197,13 +197,28 @@ public partial class AnalyzeWorker : IAnalyzeWorker
                 !d.IsTransitive));
     }
 
-    internal static async Task<T> DeserializeJsonFileAsync<T>(string path, string fileType)
+    private static Task<WorkspaceDiscoveryResult> DeserializeWorkspaceDiscoveryResultFileAsync(string path)
     {
-        var json = File.Exists(path)
-            ? await File.ReadAllTextAsync(path)
-            : throw new FileNotFoundException($"{fileType} file not found.", path);
+        return DeserializeJsonFileAsync(path, nameof(WorkspaceDiscoveryResult), json => JsonSerializer.Deserialize<WorkspaceDiscoveryResult>(json, SerializerOptions));
+    }
+
+    private static Task<DependencyInfo> DeserializeDependencyInfoFileAsync(string path)
+    {
+        return DeserializeJsonFileAsync(path, nameof(DependencyInfo), DeserializeDependencyInfo);
+    }
 
-        return JsonSerializer.Deserialize<T>(json, SerializerOptions)
+    internal static DependencyInfo? DeserializeDependencyInfo(string content)
+    {
+        return JsonSerializer.Deserialize<DependencyInfo>(content, SerializerOptions);
+    }
+
+    private static async Task<T> DeserializeJsonFileAsync<T>(string filePath, string fileType, Func<string, T?> deserializer)
+    {
+        var json = File.Exists(filePath)
+            ? await File.ReadAllTextAsync(filePath)
+            : throw new FileNotFoundException($"{fileType} file not found.", filePath);
+
+        return deserializer(json)
             ?? throw new InvalidOperationException($"{fileType} file is empty.");
     }
 
@@ -391,8 +406,8 @@ public partial class AnalyzeWorker : IAnalyzeWorker
 
         var projectFrameworks = projectsWithDependency
             .SelectMany(p => p.TargetFrameworks)
-            .Distinct()
             .Select(NuGetFramework.Parse)
+            .Distinct()
             .ToImmutableArray();
 
         // When updating peer dependencies, we only need to consider top-level dependencies.
@@ -468,7 +483,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
 
         var resultPath = Path.Combine(analysisDirectory, $"{dependencyName}.json");
 
-        logger.Log($"  Writing analysis result to [{resultPath}].");
+        logger.Info($"  Writing analysis result to [{resultPath}].");
 
         var resultJson = JsonSerializer.Serialize(result, SerializerOptions);
         await File.WriteAllTextAsync(path: resultPath, resultJson);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/CompatabilityChecker.cs

@@ -68,7 +68,7 @@ internal static class CompatibilityChecker
         var incompatibleFrameworks = projectFrameworks.Where(f => !compatibleFrameworks.Contains(f)).ToArray();
         if (incompatibleFrameworks.Length > 0)
         {
-            logger.Log($"The package {package} is not compatible. Incompatible project frameworks: {string.Join(", ", incompatibleFrameworks.Select(f => f.GetShortFolderName()))}");
+            logger.Info($"The package {package} is not compatible. Incompatible project frameworks: {string.Join(", ", incompatibleFrameworks.Select(f => f.GetShortFolderName()))}");
             return false;
         }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/RequirementArrayConverter.cs

@@ -0,0 +1,39 @@
+using System.Collections.Immutable;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace NuGetUpdater.Core.Analyze;
+
+public class RequirementArrayConverter : JsonConverter<ImmutableArray<Requirement>>
+{
+    public override ImmutableArray<Requirement> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var requirements = new List<Requirement>();
+        var requirementStrings = JsonSerializer.Deserialize<string[]>(ref reader, options) ?? [];
+        foreach (var requirementString in requirementStrings)
+        {
+            try
+            {
+                var requirement = Requirement.Parse(requirementString);
+                requirements.Add(requirement);
+            }
+            catch (ArgumentException)
+            {
+                // couldn't parse, nothing to do
+            }
+        }
+
+        return requirements.ToImmutableArray();
+    }
+
+    public override void Write(Utf8JsonWriter writer, ImmutableArray<Requirement> value, JsonSerializerOptions options)
+    {
+        writer.WriteStartArray();
+        foreach (var requirement in value)
+        {
+            writer.WriteStringValue(requirement.ToString());
+        }
+
+        writer.WriteEndArray();
+    }
+}