dependabot-nuget 0.321.3 → 0.322.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 832ab457e727f6583a33319b04bc49b5142d33aae4f95873137c580f838b5abf
-  data.tar.gz: 0dca08fa4a87530852652d0264c13e4bd79024561cb3e3fe397551c12fa1b921
+  metadata.gz: 3960b8e460b0caef38e1a302c8245e51708c19e3070be3dcd6de9ac708174c48
+  data.tar.gz: 9de84a12311aa75b8f838e1413052d4c37a06e74887c3e9d16d050e7e463f096
 SHA512:
-  metadata.gz: 756d833b0d1616230f5ce980d1410ae8ea9883ab441837847a18eda7c41180032d20ae84cbc986231d293a2bf1e846b81f93fb8b40fd8419edcfd51e5bfd276e
-  data.tar.gz: 1acab8370fe0a8b0bd8719613e783c1c2e1d5cc7f7a22355ce1e80d10eb242c0545df65d6cbaba3964cd551345d02c0e43a7c94b7da76d6a10ccdd1c354ab3c4
+  metadata.gz: 390a5e049399bf2d135915b3aa37c9c3977139193f3a46c41b09ea20568a7b417a96235fd32751f9d0b14efa8ad56c54187a0096d760676a728d8c61166225a3
+  data.tar.gz: bc2cabf452264a3df4f02e8531bfc8905c379072982f8ff31048d1fb3dbb4ededd221112eb3914bc0a6b56e87c0eff739ef5cebad1d12e7564264714463f94ec

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

@@ -3,42 +3,42 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <PropertyGroup>
-    <MSBuildPackageVersion>17.12.6</MSBuildPackageVersion>
+    <MSBuildPackageVersion>17.14.8</MSBuildPackageVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="DiffPlex" Version="1.7.2" />
+    <PackageVersion Include="DiffPlex" Version="1.8.0" />
     <PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.93" />
-    <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.9.1" />
     <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.12.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.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.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
     <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
-    <PackageVersion Include="Microsoft.Web.Xdt" Version="3.1.0" />
-    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
+    <PackageVersion Include="Microsoft.Web.Xdt" Version="3.2.0" />
+    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.17" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NuGet.Core" Version="2.14.0" Aliases="CoreV2" />
-    <PackageVersion Include="OpenTelemetry" Version="1.11.2" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.11.2" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
+    <PackageVersion Include="OpenTelemetry" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
     <PackageVersion Include="Semver" Version="3.0.0" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.3" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta6.25358.103" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.7" />
     <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="9.0.0" />
-    <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.3" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
+    <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.3" />
-    <PackageVersion Include="xunit.v3" Version="2.0.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.7" />
+    <PackageVersion Include="xunit.v3" Version="3.0.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
   </ItemGroup>
 </Project>

data/helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Cli/Program.cs

@@ -9,24 +9,38 @@ public class Program
 {
     public static async Task<int> Main(string[] args)
     {
-        var coreLocationOption = new Option<DirectoryInfo>("--core-location", "The location of the .NET Core source code.") { IsRequired = true };
-        var outputOption = new Option<FileInfo>("--output", "The location to write the result.") { IsRequired = true };
+        var coreLocationOption = new Option<DirectoryInfo>("--core-location")
+        {
+            Description = "The location of the .NET Core source code.",
+            Required = true
+        };
+        var outputOption = new Option<FileInfo>("--output")
+        {
+            Description = "The location to write the result.",
+            Required = true
+        };
         var command = new Command("build")
         {
             coreLocationOption,
             outputOption,
         };
         command.TreatUnmatchedTokensAsErrors = true;
-        command.SetHandler(async (coreLocationDirectory, output) =>
+        command.SetAction(async (parseResult, cancellationToken) =>
         {
+            var coreLocationDirectory = parseResult.GetValue(coreLocationOption);
+            var output = parseResult.GetValue(outputOption);
+
             // the tool is expected to be given the path to the .NET Core repository, but the correlator only needs a specific subdirectory
-            var releaseNotesDirectory = new DirectoryInfo(Path.Combine(coreLocationDirectory.FullName, "release-notes"));
+            var releaseNotesDirectory = new DirectoryInfo(Path.Combine(coreLocationDirectory!.FullName, "release-notes"));
             var correlator = new Correlator(releaseNotesDirectory);
             var (sdkPackages, _warnings) = await correlator.RunAsync();
             var json = JsonSerializer.Serialize(sdkPackages, Correlator.SerializerOptions);
-            await File.WriteAllTextAsync(output.FullName, json);
-        }, coreLocationOption, outputOption);
-        var exitCode = await command.InvokeAsync(args);
+            await File.WriteAllTextAsync(output!.FullName, json, cancellationToken);
+
+            return 0;
+        });
+        var parseResult = command.Parse(args);
+        var exitCode = await parseResult.InvokeAsync();
         return exitCode;
     }
 }

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

@@ -7,12 +7,12 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class AnalyzeCommand
 {
-    internal static readonly Option<string> JobIdOption = new("--job-id") { IsRequired = true };
-    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<FileInfo> DependencyFilePathOption = new("--dependency-file-path") { IsRequired = true };
-    internal static readonly Option<FileInfo> DiscoveryFilePathOption = new("--discovery-file-path") { IsRequired = true };
-    internal static readonly Option<DirectoryInfo> AnalysisFolderOption = new("--analysis-folder-path") { IsRequired = true };
+    internal static readonly Option<string> JobIdOption = new("--job-id") { Required = true };
+    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { Required = true };
+    internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root") { Required = true };
+    internal static readonly Option<FileInfo> DependencyFilePathOption = new("--dependency-file-path") { Required = true };
+    internal static readonly Option<FileInfo> DiscoveryFilePathOption = new("--discovery-file-path") { Required = true };
+    internal static readonly Option<DirectoryInfo> AnalysisFolderOption = new("--analysis-folder-path") { Required = true };
 
     internal static Command GetCommand(Action<int> setExitCode)
     {
@@ -28,13 +28,21 @@ internal static class AnalyzeCommand
 
         command.TreatUnmatchedTokensAsErrors = true;
 
-        command.SetHandler(async (jobId, jobPath, repoRoot, discoveryPath, dependencyPath, analysisDirectory) =>
+        command.SetAction(async (parseResult, cancellationToken) =>
         {
+            var jobId = parseResult.GetValue(JobIdOption);
+            var jobPath = parseResult.GetValue(JobPathOption);
+            var repoRoot = parseResult.GetValue(RepoRootOption);
+            var discoveryPath = parseResult.GetValue(DiscoveryFilePathOption);
+            var dependencyPath = parseResult.GetValue(DependencyFilePathOption);
+            var analysisDirectory = parseResult.GetValue(AnalysisFolderOption);
+
             var logger = new OpenTelemetryLogger();
-            var (experimentsManager, _errorResult) = await ExperimentsManager.FromJobFileAsync(jobId, jobPath.FullName);
-            var worker = new AnalyzeWorker(jobId, experimentsManager, logger);
-            await worker.RunAsync(repoRoot.FullName, discoveryPath.FullName, dependencyPath.FullName, analysisDirectory.FullName);
-        }, JobIdOption, JobPathOption, RepoRootOption, DiscoveryFilePathOption, DependencyFilePathOption, AnalysisFolderOption);
+            var (experimentsManager, _errorResult) = await ExperimentsManager.FromJobFileAsync(jobId!, jobPath!.FullName);
+            var worker = new AnalyzeWorker(jobId!, experimentsManager, logger);
+            await worker.RunAsync(repoRoot!.FullName, discoveryPath!.FullName, dependencyPath!.FullName, analysisDirectory!.FullName);
+            return 0;
+        });
 
         return command;
     }

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

@@ -8,10 +8,14 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class CloneCommand
 {
-    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { IsRequired = true };
-    internal static readonly Option<DirectoryInfo> RepoContentsPathOption = new("--repo-contents-path") { IsRequired = true };
-    internal static readonly Option<Uri> ApiUrlOption = new("--api-url") { IsRequired = true };
-    internal static readonly Option<string> JobIdOption = new("--job-id") { IsRequired = true };
+    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { Required = true };
+    internal static readonly Option<DirectoryInfo> RepoContentsPathOption = new("--repo-contents-path") { Required = true };
+    internal static readonly Option<Uri> ApiUrlOption = new("--api-url")
+    {
+        Required = true,
+        CustomParser = (argumentResult) => Uri.TryCreate(argumentResult.Tokens.Single().Value, UriKind.Absolute, out var uri) ? uri : throw new ArgumentException("Invalid API URL format.")
+    };
+    internal static readonly Option<string> JobIdOption = new("--job-id") { Required = true };
 
     internal static Command GetCommand(Action<int> setExitCode)
     {
@@ -25,15 +29,21 @@ internal static class CloneCommand
 
         command.TreatUnmatchedTokensAsErrors = true;
 
-        command.SetHandler(async (jobPath, repoContentsPath, apiUrl, jobId) =>
+        command.SetAction(async (parseResult, cancellationToken) =>
         {
-            var apiHandler = new HttpApiHandler(apiUrl.ToString(), jobId);
+            var jobPath = parseResult.GetValue(JobPathOption);
+            var repoContentsPath = parseResult.GetValue(RepoContentsPathOption);
+            var apiUrl = parseResult.GetValue(ApiUrlOption);
+            var jobId = parseResult.GetValue(JobIdOption);
+
+            var apiHandler = new HttpApiHandler(apiUrl!.ToString(), jobId!);
             var logger = new OpenTelemetryLogger();
             var gitCommandHandler = new ShellGitCommandHandler(logger);
-            var worker = new CloneWorker(jobId, apiHandler, gitCommandHandler, logger);
-            var exitCode = await worker.RunAsync(jobPath, repoContentsPath);
+            var worker = new CloneWorker(jobId!, apiHandler, gitCommandHandler, logger);
+            var exitCode = await worker.RunAsync(jobPath!, repoContentsPath!);
             setExitCode(exitCode);
-        }, JobPathOption, RepoContentsPathOption, ApiUrlOption, JobIdOption);
+            return exitCode;
+        });
 
         return command;
     }

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

@@ -7,11 +7,11 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class DiscoverCommand
 {
-    internal static readonly Option<string> JobIdOption = new("--job-id") { IsRequired = true };
-    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 };
+    internal static readonly Option<string> JobIdOption = new("--job-id") { Required = true };
+    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { Required = true };
+    internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root") { Required = true };
+    internal static readonly Option<string> WorkspaceOption = new("--workspace") { Required = true };
+    internal static readonly Option<FileInfo> OutputOption = new("--output") { Required = true };
 
     internal static Command GetCommand(Action<int> setExitCode)
     {
@@ -26,27 +26,34 @@ internal static class DiscoverCommand
 
         command.TreatUnmatchedTokensAsErrors = true;
 
-        command.SetHandler(async (jobId, jobPath, repoRoot, workspace, outputPath) =>
+        command.SetAction(async (parseResult, cancellationToken) =>
         {
+            var jobId = parseResult.GetValue(JobIdOption);
+            var jobPath = parseResult.GetValue(JobPathOption);
+            var repoRoot = parseResult.GetValue(RepoRootOption);
+            var workspace = parseResult.GetValue(WorkspaceOption);
+            var outputPath = parseResult.GetValue(OutputOption);
+
             var logger = new OpenTelemetryLogger();
-            MSBuildHelper.RegisterMSBuild(repoRoot.FullName, repoRoot.FullName, logger);
-            var (experimentsManager, error) = await ExperimentsManager.FromJobFileAsync(jobId, jobPath.FullName);
+            MSBuildHelper.RegisterMSBuild(repoRoot!.FullName, repoRoot.FullName, logger);
+            var (experimentsManager, error) = await ExperimentsManager.FromJobFileAsync(jobId!, jobPath!.FullName);
             if (error is not null)
             {
                 // to make testing easier, this should be a `WorkspaceDiscoveryResult` object
                 var discoveryErrorResult = new WorkspaceDiscoveryResult
                 {
                     Error = error,
-                    Path = workspace,
+                    Path = workspace!,
                     Projects = [],
                 };
-                await DiscoveryWorker.WriteResultsAsync(repoRoot.FullName, outputPath.FullName, discoveryErrorResult);
-                return;
+                await DiscoveryWorker.WriteResultsAsync(repoRoot.FullName, outputPath!.FullName, discoveryErrorResult);
+                return 0;
             }
 
-            var worker = new DiscoveryWorker(jobId, experimentsManager, logger);
-            await worker.RunAsync(repoRoot.FullName, workspace, outputPath.FullName);
-        }, JobIdOption, JobPathOption, RepoRootOption, WorkspaceOption, OutputOption);
+            var worker = new DiscoveryWorker(jobId!, experimentsManager, logger);
+            await worker.RunAsync(repoRoot.FullName, workspace!, outputPath!.FullName);
+            return 0;
+        });
 
         return command;
     }

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

@@ -7,8 +7,8 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class FrameworkCheckCommand
 {
-    internal static readonly Option<string[]> ProjectTfmsOption = new("--project-tfms") { IsRequired = true, AllowMultipleArgumentsPerToken = true };
-    internal static readonly Option<string[]> PackageTfmsOption = new("--package-tfms") { IsRequired = true, AllowMultipleArgumentsPerToken = true };
+    internal static readonly Option<string[]> ProjectTfmsOption = new("--project-tfms") { Required = true, AllowMultipleArgumentsPerToken = true };
+    internal static readonly Option<string[]> PackageTfmsOption = new("--package-tfms") { Required = true, AllowMultipleArgumentsPerToken = true };
 
     internal static Command GetCommand(Action<int> setExitCode)
     {
@@ -20,12 +20,15 @@ internal static class FrameworkCheckCommand
 
         command.TreatUnmatchedTokensAsErrors = true;
 
-        command.SetHandler((projectTfms, packageTfms) =>
+        command.SetAction((parseResult) =>
         {
-            setExitCode(CompatibilityChecker.IsCompatible(projectTfms, packageTfms, new ConsoleLogger())
+            var projectTfms = parseResult.GetValue(ProjectTfmsOption);
+            var packageTfms = parseResult.GetValue(PackageTfmsOption);
+
+            setExitCode(CompatibilityChecker.IsCompatible(projectTfms!, packageTfms!, new ConsoleLogger())
                 ? 0
                 : 1);
-        }, ProjectTfmsOption, PackageTfmsOption);
+        });
 
         return command;
     }

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

@@ -9,13 +9,17 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class RunCommand
 {
-    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { IsRequired = true };
-    internal static readonly Option<DirectoryInfo> RepoContentsPathOption = new("--repo-contents-path") { IsRequired = true };
-    internal static readonly Option<DirectoryInfo?> CaseInsensitiveRepoContentsPathOption = new("--case-insensitive-repo-contents-path") { IsRequired = false };
-    internal static readonly Option<Uri> ApiUrlOption = new("--api-url") { IsRequired = true };
-    internal static readonly Option<string> JobIdOption = new("--job-id") { IsRequired = true };
-    internal static readonly Option<FileInfo> OutputPathOption = new("--output-path") { IsRequired = true };
-    internal static readonly Option<string> BaseCommitShaOption = new("--base-commit-sha") { IsRequired = true };
+    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { Required = true };
+    internal static readonly Option<DirectoryInfo> RepoContentsPathOption = new("--repo-contents-path") { Required = true };
+    internal static readonly Option<DirectoryInfo?> CaseInsensitiveRepoContentsPathOption = new("--case-insensitive-repo-contents-path") { Required = false };
+    internal static readonly Option<Uri> ApiUrlOption = new("--api-url")
+    {
+        Required = true,
+        CustomParser = (argumentResult) => Uri.TryCreate(argumentResult.Tokens.Single().Value, UriKind.Absolute, out var uri) ? uri : throw new ArgumentException("Invalid API URL format.")
+    };
+    internal static readonly Option<string> JobIdOption = new("--job-id") { Required = true };
+    internal static readonly Option<FileInfo> OutputPathOption = new("--output-path") { Required = true };
+    internal static readonly Option<string> BaseCommitShaOption = new("--base-commit-sha") { Required = true };
 
     internal static Command GetCommand(Action<int> setExitCode)
     {
@@ -32,17 +36,26 @@ internal static class RunCommand
 
         command.TreatUnmatchedTokensAsErrors = true;
 
-        command.SetHandler(async (jobPath, repoContentsPath, caseInsensitiveRepoContentsPath, apiUrl, jobId, outputPath, baseCommitSha) =>
+        command.SetAction(async (parseResult, cancellationToken) =>
         {
-            var apiHandler = new HttpApiHandler(apiUrl.ToString(), jobId);
-            var (experimentsManager, _errorResult) = await ExperimentsManager.FromJobFileAsync(jobId, jobPath.FullName);
+            var jobPath = parseResult.GetValue(JobPathOption);
+            var repoContentsPath = parseResult.GetValue(RepoContentsPathOption);
+            var caseInsensitiveRepoContentsPath = parseResult.GetValue(CaseInsensitiveRepoContentsPathOption);
+            var apiUrl = parseResult.GetValue(ApiUrlOption);
+            var jobId = parseResult.GetValue(JobIdOption);
+            var outputPath = parseResult.GetValue(OutputPathOption);
+            var baseCommitSha = parseResult.GetValue(BaseCommitShaOption);
+
+            var apiHandler = new HttpApiHandler(apiUrl!.ToString(), jobId!);
+            var (experimentsManager, _errorResult) = await ExperimentsManager.FromJobFileAsync(jobId!, jobPath!.FullName);
             var logger = new OpenTelemetryLogger();
-            var discoverWorker = new DiscoveryWorker(jobId, experimentsManager, logger);
-            var analyzeWorker = new AnalyzeWorker(jobId, experimentsManager, logger);
-            var updateWorker = new UpdaterWorker(jobId, experimentsManager, logger);
-            var worker = new RunWorker(jobId, apiHandler, discoverWorker, analyzeWorker, updateWorker, logger);
-            await worker.RunAsync(jobPath, repoContentsPath, caseInsensitiveRepoContentsPath, baseCommitSha, outputPath);
-        }, JobPathOption, RepoContentsPathOption, CaseInsensitiveRepoContentsPathOption, ApiUrlOption, JobIdOption, OutputPathOption, BaseCommitShaOption);
+            var discoverWorker = new DiscoveryWorker(jobId!, experimentsManager, logger);
+            var analyzeWorker = new AnalyzeWorker(jobId!, experimentsManager, logger);
+            var updateWorker = new UpdaterWorker(jobId!, experimentsManager, logger);
+            var worker = new RunWorker(jobId!, apiHandler, discoverWorker, analyzeWorker, updateWorker, logger);
+            await worker.RunAsync(jobPath!, repoContentsPath!, caseInsensitiveRepoContentsPath, baseCommitSha!, outputPath!);
+            return 0;
+        });
 
         return command;
     }

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

@@ -6,15 +6,15 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class UpdateCommand
 {
-    internal static readonly Option<string> JobIdOption = new("--job-id") { IsRequired = true };
-    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { IsRequired = true };
-    internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root", () => new DirectoryInfo(Environment.CurrentDirectory)) { IsRequired = false };
-    internal static readonly Option<FileInfo> SolutionOrProjectFileOption = new("--solution-or-project") { IsRequired = true };
-    internal static readonly Option<string> DependencyNameOption = new("--dependency") { IsRequired = true };
-    internal static readonly Option<string> NewVersionOption = new("--new-version") { IsRequired = true };
-    internal static readonly Option<string> PreviousVersionOption = new("--previous-version") { IsRequired = true };
-    internal static readonly Option<bool> IsTransitiveOption = new("--transitive", getDefaultValue: () => false);
-    internal static readonly Option<string?> ResultOutputPathOption = new("--result-output-path", getDefaultValue: () => null);
+    internal static readonly Option<string> JobIdOption = new("--job-id") { Required = true };
+    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { Required = true };
+    internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root") { DefaultValueFactory = _ => new DirectoryInfo(Environment.CurrentDirectory), Required = false };
+    internal static readonly Option<FileInfo> SolutionOrProjectFileOption = new("--solution-or-project") { Required = true };
+    internal static readonly Option<string> DependencyNameOption = new("--dependency") { Required = true };
+    internal static readonly Option<string> NewVersionOption = new("--new-version") { Required = true };
+    internal static readonly Option<string> PreviousVersionOption = new("--previous-version") { Required = true };
+    internal static readonly Option<bool> IsTransitiveOption = new("--transitive") { DefaultValueFactory = _ => false };
+    internal static readonly Option<string?> ResultOutputPathOption = new("--result-output-path") { DefaultValueFactory = _ => null };
 
     internal static Command GetCommand(Action<int> setExitCode)
     {
@@ -32,24 +32,25 @@ internal static class UpdateCommand
         };
 
         command.TreatUnmatchedTokensAsErrors = true;
-        command.SetHandler(async (context) =>
+        command.SetAction(async (parseResult, cancellationToken) =>
         {
             // since we have more than 8 arguments, we have to pull them out manually
-            var jobId = context.ParseResult.GetValueForOption(JobIdOption)!;
-            var jobPath = context.ParseResult.GetValueForOption(JobPathOption)!;
-            var repoRoot = context.ParseResult.GetValueForOption(RepoRootOption)!;
-            var solutionOrProjectFile = context.ParseResult.GetValueForOption(SolutionOrProjectFileOption)!;
-            var dependencyName = context.ParseResult.GetValueForOption(DependencyNameOption)!;
-            var newVersion = context.ParseResult.GetValueForOption(NewVersionOption)!;
-            var previousVersion = context.ParseResult.GetValueForOption(PreviousVersionOption)!;
-            var isTransitive = context.ParseResult.GetValueForOption(IsTransitiveOption);
-            var resultOutputPath = context.ParseResult.GetValueForOption(ResultOutputPathOption);
+            var jobId = parseResult.GetValue(JobIdOption)!;
+            var jobPath = parseResult.GetValue(JobPathOption)!;
+            var repoRoot = parseResult.GetValue(RepoRootOption)!;
+            var solutionOrProjectFile = parseResult.GetValue(SolutionOrProjectFileOption)!;
+            var dependencyName = parseResult.GetValue(DependencyNameOption)!;
+            var newVersion = parseResult.GetValue(NewVersionOption)!;
+            var previousVersion = parseResult.GetValue(PreviousVersionOption)!;
+            var isTransitive = parseResult.GetValue(IsTransitiveOption);
+            var resultOutputPath = parseResult.GetValue(ResultOutputPathOption);
 
             var (experimentsManager, _error) = await ExperimentsManager.FromJobFileAsync(jobId, jobPath.FullName);
             var logger = new OpenTelemetryLogger();
             var worker = new UpdaterWorker(jobId, experimentsManager, logger);
             await worker.RunAsync(repoRoot.FullName, solutionOrProjectFile.FullName, dependencyName, previousVersion, newVersion, isTransitive, resultOutputPath);
             setExitCode(0);
+            return 0;
         });
 
         return command;

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Program.cs

@@ -27,7 +27,8 @@ internal sealed class Program
         };
         command.TreatUnmatchedTokensAsErrors = true;
 
-        var result = await command.InvokeAsync(args);
+        var parseResult = command.Parse(args);
+        var result = await parseResult.InvokeAsync();
 
         return result == 0
             ? exitCode

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/GlobalJsonBuildFile.cs

@@ -1,3 +1,4 @@
+using System.Collections.Immutable;
 using System.Text.Json.Nodes;
 
 namespace NuGetUpdater.Core;
@@ -12,28 +13,19 @@ internal sealed class GlobalJsonBuildFile : JsonBuildFile
     {
     }
 
-    public JsonObject? Sdk => Node.Value is JsonObject root ? root["sdk"]?.AsObject() : null;
-
     public JsonObject? MSBuildSdks => Node.Value is JsonObject root ? root["msbuild-sdks"]?.AsObject() : null;
 
     public IEnumerable<Dependency> GetDependencies()
     {
-        List<Dependency> dependencies = [];
-        if (Sdk is not null
-            && Sdk.TryGetPropertyValue("version", out var version))
-        {
-            dependencies.Add(GetSdkDependency("Microsoft.NET.Sdk", version));
-        }
-
         if (MSBuildSdks is null)
         {
-            return dependencies;
+            return [];
         }
 
         var msBuildDependencies = MSBuildSdks
-            .Select(t => GetSdkDependency(t.Key, t.Value));
-        dependencies.AddRange(msBuildDependencies);
-        return dependencies;
+            .Select(t => GetSdkDependency(t.Key, t.Value))
+            .ToImmutableArray();
+        return msBuildDependencies;
     }
 
     private Dependency GetSdkDependency(string name, JsonNode? version)

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/PrivateSourceTimedOutException.cs

@@ -0,0 +1,12 @@
+namespace NuGetUpdater.Core;
+
+internal class PrivateSourceTimedOutException : Exception
+{
+    public string Url { get; }
+
+    public PrivateSourceTimedOutException(string url)
+        : base($"The request to source {url} has timed out.")
+    {
+        Url = url;
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/JobErrorBase.cs

@@ -70,10 +70,14 @@ public abstract record JobErrorBase : MessageBase
 
                         return new UnknownError(ex, jobId);
                 }
+            case InvalidDataException invalidData when invalidData.Message == "Central Directory corrupt.":
+                return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory));
             case InvalidProjectFileException invalidProjectFile:
                 return new DependencyFileNotParseable(invalidProjectFile.ProjectFile);
             case MissingFileException missingFile:
                 return new DependencyFileNotFound(missingFile.FilePath, missingFile.Message);
+            case PrivateSourceTimedOutException timeout:
+                return new PrivateSourceTimedOut(timeout.Url);
             case UnparseableFileException unparseableFile:
                 return new DependencyFileNotParseable(unparseableFile.FilePath, unparseableFile.Message);
             case UpdateNotPossibleException updateNotPossible:

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/PrivateSourceTimedOut.cs

@@ -0,0 +1,10 @@
+namespace NuGetUpdater.Core.Run.ApiModel;
+
+public record PrivateSourceTimedOut : JobErrorBase
+{
+    public PrivateSourceTimedOut(string url)
+        : base("private_source_timed_out")
+    {
+        Details["source"] = url;
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/PullRequestTextGenerator.cs

@@ -126,7 +126,7 @@ public class PullRequestTextGenerator
 
     public static string GetPullRequestBody(Job job, ImmutableArray<UpdateOperationBase> updateOperationsPerformed, string? dependencyGroupName)
     {
-        var report = UpdateOperationBase.GenerateUpdateOperationReport(updateOperationsPerformed);
+        var report = UpdateOperationBase.GenerateUpdateOperationReport(updateOperationsPerformed, includeFileNames: false);
         return report;
     }
 }

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

@@ -140,7 +140,7 @@ internal class CreateSecurityUpdatePullRequestHandler : IUpdateHandler
                     updateOperationsPerformed.AddRange(patchedUpdateOperations);
                     foreach (var o in patchedUpdateOperations)
                     {
-                        logger.Info($"Update operation performed: {o.GetReport()}");
+                        logger.Info($"Update operation performed: {o.GetReport(includeFileNames: true)}");
                     }
                 }
             }

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

@@ -143,7 +143,7 @@ internal class GroupUpdateAllVersionsHandler : IUpdateHandler
                     updateOperationsPerformed.AddRange(patchedUpdateOperations);
                     foreach (var o in patchedUpdateOperations)
                     {
-                        logger.Info($"Update operation performed: {o.GetReport()}");
+                        logger.Info($"Update operation performed: {o.GetReport(includeFileNames: true)}");
                     }
                 }
 
@@ -242,7 +242,7 @@ internal class GroupUpdateAllVersionsHandler : IUpdateHandler
                 updateOperationsPerformed.AddRange(patchedUpdateOperations);
                 foreach (var o in patchedUpdateOperations)
                 {
-                    logger.Info($"Update operation performed: {o.GetReport()}");
+                    logger.Info($"Update operation performed: {o.GetReport(includeFileNames: true)}");
                 }
             }
 

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

@@ -137,7 +137,7 @@ internal class RefreshGroupUpdatePullRequestHandler : IUpdateHandler
                     updateOperationsPerformed.AddRange(patchedUpdateOperations);
                     foreach (var o in patchedUpdateOperations)
                     {
-                        logger.Info($"Update operation performed: {o.GetReport()}");
+                        logger.Info($"Update operation performed: {o.GetReport(includeFileNames: true)}");
                     }
                 }
             }

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

@@ -135,7 +135,7 @@ internal class RefreshSecurityUpdatePullRequestHandler : IUpdateHandler
                     updateOperationsPerformed.AddRange(patchedUpdateOperations);
                     foreach (var o in patchedUpdateOperations)
                     {
-                        logger.Info($"Update operation performed: {o.GetReport()}");
+                        logger.Info($"Update operation performed: {o.GetReport(includeFileNames: true)}");
                     }
                 }
             }

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

@@ -125,7 +125,7 @@ internal class RefreshVersionUpdatePullRequestHandler : IUpdateHandler
                     updateOperationsPerformed.AddRange(patchedUpdateOperations);
                     foreach (var o in patchedUpdateOperations)
                     {
-                        logger.Info($"Update operation performed: {o.GetReport()}");
+                        logger.Info($"Update operation performed: {o.GetReport(includeFileNames: true)}");
                     }
                 }
             }