dependabot-nuget 0.323.0 → 0.325.1

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

@@ -666,22 +666,12 @@ public class FileWriterWorkerTests : TestBase
     [Fact]
     public async Task EndToEnd_GlobalJson()
     {
-        // project is unchanged but `global.json` is updated
+        // `global.json` is updated
         await TestAsync(
             dependencyName: "Some.MSBuild.Sdk",
             oldDependencyVersion: "1.0.0",
             newDependencyVersion: "1.1.0",
-            projectContents: """
-                <Project Sdk="Microsoft.NET.Sdk">
-                  <PropertyGroup>
-                    <TargetFramework>net9.0</TargetFramework>
-                  </PropertyGroup>
-                  <ItemGroup>
-                    <PackageReference Include="Some.Dependency" Version="1.0.0" />
-                  </ItemGroup>
-                </Project>
-                """,
-            additionalFiles: [
+            files: [
                 ("global.json", """
                     {
                       "sdk": {
@@ -702,17 +692,7 @@ public class FileWriterWorkerTests : TestBase
             discoveryWorker: null, // use real worker
             dependencySolver: null, // use real worker
             fileWriter: null, // use real worker
-            expectedProjectContents: """
-                <Project Sdk="Microsoft.NET.Sdk">
-                  <PropertyGroup>
-                    <TargetFramework>net9.0</TargetFramework>
-                  </PropertyGroup>
-                  <ItemGroup>
-                    <PackageReference Include="Some.Dependency" Version="1.0.0" />
-                  </ItemGroup>
-                </Project>
-                """,
-            expectedAdditionalFiles: [
+            expectedFiles: [
                 ("global.json", """
                     {
                       "sdk": {
@@ -871,11 +851,46 @@ public class FileWriterWorkerTests : TestBase
         ExperimentsManager? experimentsManager = null,
         Action<DirectoryInfo>? additionalChecks = null
     )
+    {
+        var files = new List<(string name, string contents)> { (projectName, projectContents) };
+        files.AddRange(additionalFiles);
+
+        var expectedFiles = new List<(string Path, string Contents)>() { (projectName, expectedProjectContents) };
+        expectedFiles.AddRange(expectedAdditionalFiles);
+
+        await TestAsync(
+            dependencyName,
+            oldDependencyVersion,
+            newDependencyVersion,
+            [.. files],
+            discoveryWorker,
+            dependencySolver,
+            fileWriter,
+            [.. expectedFiles],
+            expectedOperations,
+            packages,
+            experimentsManager,
+            additionalChecks
+        );
+    }
+
+    private static async Task TestAsync(
+        string dependencyName,
+        string oldDependencyVersion,
+        string newDependencyVersion,
+        (string name, string contents)[] files,
+        IDiscoveryWorker? discoveryWorker,
+        IDependencySolver? dependencySolver,
+        IFileWriter? fileWriter,
+        (string name, string contents)[] expectedFiles,
+        UpdateOperationBase[] expectedOperations,
+        MockNuGetPackage[]? packages = null,
+        ExperimentsManager? experimentsManager = null,
+        Action<DirectoryInfo>? additionalChecks = null
+    )
     {
         // arrange
-        var allFiles = new List<(string Path, string Contents)>() { (projectName, projectContents) };
-        allFiles.AddRange(additionalFiles);
-        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync([.. allFiles]);
+        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(files);
         await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, tempDir.DirectoryPath);
 
         var jobId = "TEST-JOB-ID";
@@ -883,8 +898,8 @@ public class FileWriterWorkerTests : TestBase
         experimentsManager ??= new ExperimentsManager();
         discoveryWorker ??= new DiscoveryWorker(jobId, experimentsManager, logger);
         var repoContentsPath = new DirectoryInfo(tempDir.DirectoryPath);
-        var projectPath = new FileInfo(Path.Combine(tempDir.DirectoryPath, projectName));
-        dependencySolver ??= new MSBuildDependencySolver(repoContentsPath, projectPath, experimentsManager, logger);
+        var projectPath = new FileInfo(Path.Combine(tempDir.DirectoryPath, files.First().name));
+        dependencySolver ??= new MSBuildDependencySolver(repoContentsPath, projectPath, logger);
         fileWriter ??= new XmlFileWriter(logger);
 
         var fileWriterWorker = new FileWriterWorker(discoveryWorker, dependencySolver, fileWriter, logger);
@@ -903,8 +918,6 @@ public class FileWriterWorkerTests : TestBase
         var expectedUpdateOperationsJson = expectedOperations.Select(o => JsonSerializer.Serialize(o, RunWorker.SerializerOptions)).ToArray();
         AssertEx.Equal(expectedUpdateOperationsJson, actualUpdateOperationsJson);
 
-        var expectedFiles = new List<(string Path, string Contents)>() { (projectName, expectedProjectContents) };
-        expectedFiles.AddRange(expectedAdditionalFiles);
         foreach (var (path, expectedContents) in expectedFiles)
         {
             var fullPath = Path.Join(tempDir.DirectoryPath, path);

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

@@ -1232,6 +1232,30 @@ public class XmlFileWriterTests : FileWriterTestsBase
         );
     }
 
+    [Fact]
+    public async Task SingleDependency_SingleFile_TransitiveIsPinnedInNewElement()
+    {
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: ["Transitive.Dependency/2.0.0"],
+            requiredDependencyStrings: ["Transitive.Dependency/3.0.0"],
+            expectedFiles: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Transitive.Dependency" Version="3.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ]
+        );
+    }
+
     [Fact]
     public async Task SingleDependency_CentralPackageManagement_TransitiveIsPinned_ExistingPackageVersionElement_AlreadyCorrect()
     {
@@ -1491,7 +1515,9 @@ public class XmlFileWriterTests : FileWriterTestsBase
                             <ItemGroup>
 
 
-                          <PackageReference Include="Some.Dependency" Version="1.0.0" />
+                          <PackageReference
+                            Include="Some.Dependency"
+                              Version="1.0.0" UnrelatedAttribute="arrow->is->not->replaced" />
 
                         </ItemGroup>
                     </Project>
@@ -1506,7 +1532,9 @@ public class XmlFileWriterTests : FileWriterTestsBase
                             <ItemGroup>
 
 
-                          <PackageReference Include="Some.Dependency" Version="2.0.0" />
+                          <PackageReference
+                            Include="Some.Dependency"
+                              Version="2.0.0" UnrelatedAttribute="arrow->is->not->replaced" />
 
                         </ItemGroup>
                     </Project>
@@ -1515,6 +1543,51 @@ public class XmlFileWriterTests : FileWriterTestsBase
         );
     }
 
+    [Fact]
+    public async Task FormattingIsPreserved_WhenNoChangesAreMade()
+    {
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("UnrelatedFile.props", """
+                    <Project>
+                      <Target Name="MyTarget"
+                              BeforeTargets="SomeBeforeTargets"
+                              AfterTargets="SomeAfterTargets">
+                        <Message Text="no space before tag close->"/>
+                      </Target>
+                    </Project>
+                    """),
+            ],
+            initialProjectDependencyStrings: ["Some.Dependency/1.0.0"],
+            requiredDependencyStrings: ["Some.Dependency/2.0.0"],
+            expectedFiles: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("UnrelatedFile.props", """
+                    <Project>
+                      <Target Name="MyTarget"
+                              BeforeTargets="SomeBeforeTargets"
+                              AfterTargets="SomeAfterTargets">
+                        <Message Text="no space before tag close->"/>
+                      </Target>
+                    </Project>
+                    """),
+            ]
+        );
+    }
+
     [Fact]
     public async Task FormattingIsPreserved_CommentsArePreserved_WhenInsertingAtFirstOfList()
     {
@@ -1535,8 +1608,8 @@ public class XmlFileWriterTests : FileWriterTestsBase
                 ("project.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <ItemGroup>
-                        <PackageReference Include="Some.Dependency" Version="2.0.0" />
                         <!-- some comment -->
+                        <PackageReference Include="Some.Dependency" Version="2.0.0" />
                         <PackageReference Include="Unrelated.Dependency" Version="3.0.0" />
                       </ItemGroup>
                     </Project>

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

@@ -24,7 +24,6 @@ public class PackageReferenceUpdaterTests
         // arrange
         using var repoRoot = await TemporaryDirectory.CreateWithContentsAsync(("project.csproj", "<Project Sdk=\"Microsoft.NET.Sdk\" />"));
         var projectPath = Path.Combine(repoRoot.DirectoryPath, "project.csproj");
-        var experimentsManager = new ExperimentsManager();
         await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
             MockNuGetPackage.CreateSimplePackage("Parent.Package", "1.0.0", "net9.0", [(null, [("Transitive.Package", "1.0.0")])]),
             MockNuGetPackage.CreateSimplePackage("Parent.Package", "2.0.0", "net9.0", [(null, [("Transitive.Package", "2.0.0")])]),
@@ -43,7 +42,6 @@ public class PackageReferenceUpdaterTests
             topLevelDependencies,
             requestedUpdates,
             resolvedDependencies,
-            experimentsManager,
             new TestLogger());
 
         // assert

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs

@@ -12,10 +12,8 @@ using TestFile = (string Path, string Content);
 
 public class MSBuildHelperTests : TestBase
 {
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task AllPackageDependenciesCanBeTraversed(bool useExistingSdks)
+    [Fact]
+    public async Task AllPackageDependenciesCanBeTraversed()
     {
         using var temp = new TemporaryDirectory();
         MockNuGetPackage[] testPackages =
@@ -39,16 +37,13 @@ public class MSBuildHelperTests : TestBase
             temp.DirectoryPath,
             "netstandard2.0",
             [new Dependency("Package.A", "1.0.0", DependencyType.Unknown)],
-            new ExperimentsManager() { InstallDotnetSdks = useExistingSdks },
             new TestLogger()
         );
         AssertEx.Equal(expectedDependencies, actualDependencies);
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task AllPackageDependencies_DoNotTruncateLongDependencyLists(bool useExistingSdks)
+    [Fact]
+    public async Task AllPackageDependencies_DoNotTruncateLongDependencyLists()
     {
         using var temp = new TemporaryDirectory();
         MockNuGetPackage[] testPackages =
@@ -175,7 +170,6 @@ public class MSBuildHelperTests : TestBase
             temp.DirectoryPath,
             "net8.0",
             packages,
-            new ExperimentsManager() { InstallDotnetSdks = useExistingSdks },
             new TestLogger()
         );
         for (int i = 0; i < actualDependencies.Length; i++)
@@ -188,10 +182,8 @@ public class MSBuildHelperTests : TestBase
         AssertEx.Equal(expectedDependencies, actualDependencies);
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task AllPackageDependencies_DoNotIncludeUpdateOnlyPackages(bool useExistingSdks)
+    [Fact]
+    public async Task AllPackageDependencies_DoNotIncludeUpdateOnlyPackages()
     {
         using var temp = new TemporaryDirectory();
         MockNuGetPackage[] testPackages =
@@ -218,16 +210,13 @@ public class MSBuildHelperTests : TestBase
             temp.DirectoryPath,
             "net8.0",
             packages,
-            new ExperimentsManager() { InstallDotnetSdks = useExistingSdks },
             new TestLogger()
         );
         AssertEx.Equal(expectedDependencies, actualDependencies);
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task GetAllPackageDependencies_NugetConfigInvalid_DoesNotThrow(bool useExistingSdks)
+    [Fact]
+    public async Task GetAllPackageDependencies_NugetConfigInvalid_DoesNotThrow()
     {
         using var temp = new TemporaryDirectory();
 
@@ -249,15 +238,12 @@ public class MSBuildHelperTests : TestBase
             temp.DirectoryPath,
             "net8.0",
             [new Dependency("Some.Package", "4.5.11", DependencyType.Unknown)],
-            new ExperimentsManager() { InstallDotnetSdks = useExistingSdks },
             new TestLogger()
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task LocalPackageSourcesAreHonored(bool useExistingSdks)
+    [Fact]
+    public async Task LocalPackageSourcesAreHonored()
     {
         using var temp = new TemporaryDirectory();
 
@@ -292,7 +278,6 @@ public class MSBuildHelperTests : TestBase
             temp.DirectoryPath,
             "net8.0",
             [new Dependency("Package.A", "1.0.0", DependencyType.Unknown)],
-            new ExperimentsManager() { InstallDotnetSdks = useExistingSdks },
             new TestLogger()
         );
 
@@ -310,9 +295,8 @@ public class MSBuildHelperTests : TestBase
             ("project.csproj", projectContents)
         ]);
         var projectPath = Path.Combine(tempDir.DirectoryPath, "project.csproj");
-        var experimentsManager = new ExperimentsManager();
         var logger = new TestLogger();
-        var actualTfms = await MSBuildHelper.GetTargetFrameworkValuesFromProject(tempDir.DirectoryPath, projectPath, experimentsManager, logger);
+        var actualTfms = await MSBuildHelper.GetTargetFrameworkValuesFromProject(tempDir.DirectoryPath, projectPath, logger);
         AssertEx.Equal(expectedTfms, actualTfms);
     }
 

data/lib/dependabot/nuget.rb

@@ -1,20 +1,12 @@
 # typed: strict
 # frozen_string_literal: true
 
-# These all need to be required so the various classes can be registered in a
-# lookup table of package manager names to concrete classes.
-require "dependabot/nuget/file_fetcher"
-require "dependabot/nuget/file_parser"
-require "dependabot/nuget/update_checker"
-require "dependabot/nuget/file_updater"
-require "dependabot/nuget/metadata_finder"
+# These files are part of the Dependabot Core library, which provides
+# functionality for managing dependencies across various ecosystems.
+# This file specifically handles the NuGet package management system.
 require "dependabot/nuget/requirement"
 require "dependabot/nuget/version"
 
-require "dependabot/pull_request_creator/labeler"
-Dependabot::PullRequestCreator::Labeler
-  .register_label_details("nuget", name: ".NET", colour: "7121c6")
-
 require "dependabot/dependency"
 Dependabot::Dependency.register_production_check(
   "nuget",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.323.0
+  version: 0.325.1
 platform: ruby
 authors:
 - Dependabot
@@ -15,34 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.323.0
+        version: 0.325.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.323.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.325.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -203,14 +183,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -305,18 +285,10 @@ files:
 - helpers/lib/NuGetUpdater/NuGetProjects/NuGet.Resolver/NuGet.Resolver.csproj
 - helpers/lib/NuGetUpdater/NuGetProjects/NuGet.Versioning/NuGet.Versioning.csproj
 - helpers/lib/NuGetUpdater/NuGetProjects/README.md
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Analyze.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Discover.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.FrameworkCheck.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Run.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Update.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/NuGetUpdater.Cli.Test.csproj
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/AnalyzeCommand.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/CloneCommand.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/DiscoverCommand.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/FrameworkCheckCommand.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/RunCommand.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/UpdateCommand.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Cli/NuGetUpdater.Cli.csproj
 - helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Program.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/AnalyzeWorkerTestBase.cs
@@ -347,6 +319,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/FrameworkChecker/SupportedFrameworkFacts.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/MockNuGetPackage.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/NuGetUpdater.Core.Test.csproj
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/ApiModel/CooldownTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/ApiModel/JobTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/EndToEndTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/HttpApiHandlerTests.cs
@@ -469,6 +442,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/ClosePullRequest.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/CommitOptions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/Condition.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/Cooldown.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/CreatePullRequest.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyFile.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyFileNotFound.cs
@@ -570,34 +544,14 @@ files:
 - helpers/lib/NuGetUpdater/global.json
 - helpers/lib/NuGetUpdater/xunit.runner.json
 - lib/dependabot/nuget.rb
-- lib/dependabot/nuget/analysis/analysis_json_reader.rb
-- lib/dependabot/nuget/analysis/dependency_analysis.rb
-- lib/dependabot/nuget/cache_manager.rb
-- lib/dependabot/nuget/discovery/dependency_details.rb
-- lib/dependabot/nuget/discovery/dependency_file_discovery.rb
-- lib/dependabot/nuget/discovery/discovery_json_reader.rb
-- lib/dependabot/nuget/discovery/evaluation_details.rb
-- lib/dependabot/nuget/discovery/project_discovery.rb
-- lib/dependabot/nuget/discovery/property_details.rb
-- lib/dependabot/nuget/discovery/workspace_discovery.rb
-- lib/dependabot/nuget/file_fetcher.rb
-- lib/dependabot/nuget/file_parser.rb
-- lib/dependabot/nuget/file_updater.rb
-- lib/dependabot/nuget/language.rb
-- lib/dependabot/nuget/metadata_finder.rb
-- lib/dependabot/nuget/native_helpers.rb
-- lib/dependabot/nuget/nuget_config_credential_helpers.rb
-- lib/dependabot/nuget/package_manager.rb
 - lib/dependabot/nuget/requirement.rb
-- lib/dependabot/nuget/update_checker.rb
-- lib/dependabot/nuget/update_checker/requirements_updater.rb
 - lib/dependabot/nuget/version.rb
 homepage: https://github.com/dependabot/dependabot-core
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.323.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.325.1
 rdoc_options: []
 require_paths:
 - lib

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

@@ -1,49 +0,0 @@
-using System.CommandLine;
-
-using NuGetUpdater.Core;
-using NuGetUpdater.Core.Analyze;
-
-namespace NuGetUpdater.Cli.Commands;
-
-internal static class AnalyzeCommand
-{
-    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)
-    {
-        Command command = new("analyze", "Determines how to update a dependency based on the workspace discovery information.")
-        {
-            JobIdOption,
-            JobPathOption,
-            RepoRootOption,
-            DependencyFilePathOption,
-            DiscoveryFilePathOption,
-            AnalysisFolderOption
-        };
-
-        command.TreatUnmatchedTokensAsErrors = true;
-
-        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);
-            return 0;
-        });
-
-        return command;
-    }
-}

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

@@ -1,60 +0,0 @@
-using System.CommandLine;
-
-using NuGetUpdater.Core;
-using NuGetUpdater.Core.Discover;
-
-namespace NuGetUpdater.Cli.Commands;
-
-internal static class DiscoverCommand
-{
-    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)
-    {
-        Command command = new("discover", "Generates a report of the workspace dependencies and where they are located.")
-        {
-            JobIdOption,
-            JobPathOption,
-            RepoRootOption,
-            WorkspaceOption,
-            OutputOption
-        };
-
-        command.TreatUnmatchedTokensAsErrors = true;
-
-        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);
-            if (error is not null)
-            {
-                // to make testing easier, this should be a `WorkspaceDiscoveryResult` object
-                var discoveryErrorResult = new WorkspaceDiscoveryResult
-                {
-                    Error = error,
-                    Path = workspace!,
-                    Projects = [],
-                };
-                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);
-            return 0;
-        });
-
-        return command;
-    }
-}

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

@@ -1,35 +0,0 @@
-using System.CommandLine;
-
-using NuGetUpdater.Core;
-using NuGetUpdater.Core.FrameworkChecker;
-
-namespace NuGetUpdater.Cli.Commands;
-
-internal static class FrameworkCheckCommand
-{
-    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)
-    {
-        Command command = new("framework-check", "Checks that a project's target frameworks are satisfied by the target frameworks supported by a package.")
-        {
-            ProjectTfmsOption,
-            PackageTfmsOption
-        };
-
-        command.TreatUnmatchedTokensAsErrors = true;
-
-        command.SetAction((parseResult) =>
-        {
-            var projectTfms = parseResult.GetValue(ProjectTfmsOption);
-            var packageTfms = parseResult.GetValue(PackageTfmsOption);
-
-            setExitCode(CompatibilityChecker.IsCompatible(projectTfms!, packageTfms!, new ConsoleLogger())
-                ? 0
-                : 1);
-        });
-
-        return command;
-    }
-}