From df8135659f616cd07522b491e85a661c21080776 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 16 Apr 2025 14:55:59 -0700
Subject: [PATCH 1/7] Refactor Update Dependencies project to facilitate adding
 additional commands

---
 eng/Set-DotnetVersions.ps1                    |   2 +-
 eng/update-dependencies/BaseCommand.cs        |  45 +++++++
 eng/update-dependencies/BaseUrlUpdater.cs     |  10 +-
 .../DockerfileShaUpdater.cs                   |  28 ++--
 eng/update-dependencies/IOptions.cs           |  13 ++
 eng/update-dependencies/ManifestHelper.cs     |   5 +-
 eng/update-dependencies/NuGet.config          |   9 ++
 eng/update-dependencies/NuGetConfigUpdater.cs |   5 +-
 eng/update-dependencies/Options.cs            | 125 ------------------
 eng/update-dependencies/Program.cs            |  26 ++++
 eng/update-dependencies/ReleaseState.cs       |  10 ++
 ...dateDependencies.cs => SpecificCommand.cs} |  27 ++--
 .../SpecificCommandOptions.cs                 | 125 ++++++++++++++++++
 .../VariableUpdaterBase.cs                    |   6 +-
 eng/update-dependencies/VersionUpdater.cs     |   8 +-
 .../update-dependencies.csproj                |  17 +--
 16 files changed, 269 insertions(+), 192 deletions(-)
 create mode 100644 eng/update-dependencies/BaseCommand.cs
 create mode 100644 eng/update-dependencies/IOptions.cs
 create mode 100644 eng/update-dependencies/NuGet.config
 delete mode 100644 eng/update-dependencies/Options.cs
 create mode 100644 eng/update-dependencies/Program.cs
 create mode 100644 eng/update-dependencies/ReleaseState.cs
 rename eng/update-dependencies/{UpdateDependencies.cs => SpecificCommand.cs} (95%)
 create mode 100644 eng/update-dependencies/SpecificCommandOptions.cs

diff --git a/eng/Set-DotnetVersions.ps1 b/eng/Set-DotnetVersions.ps1
index 5e7d6d064c..53f8ff8935 100644
--- a/eng/Set-DotnetVersions.ps1
+++ b/eng/Set-DotnetVersions.ps1
@@ -149,5 +149,5 @@ if ($AzdoVariableName) {
     Write-Host "##vso[task.setvariable variable=$AzdoVariableName]$updateDepsArgs"
 }
 else {
-    & dotnet run --project $PSScriptRoot/update-dependencies/update-dependencies.csproj @updateDepsArgs
+    & dotnet run --project $PSScriptRoot/update-dependencies/update-dependencies.csproj specific @updateDepsArgs
 }
diff --git a/eng/update-dependencies/BaseCommand.cs b/eng/update-dependencies/BaseCommand.cs
new file mode 100644
index 0000000000..e07ce1f86a
--- /dev/null
+++ b/eng/update-dependencies/BaseCommand.cs
@@ -0,0 +1,45 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.CommandLine;
+using System.CommandLine.NamingConventionBinder;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace Dotnet.Docker;
+
+public abstract class BaseCommand<TOptions>() where TOptions : IOptions
+{
+    public abstract Task<int> ExecuteAsync(TOptions options);
+
+    public static void Register<T>(IServiceCollection serviceCollection) where T : BaseCommand<TOptions>
+    {
+        serviceCollection.AddSingleton<BaseCommand<TOptions>, T>();
+    }
+
+    public static Command Create(string name, string description)
+    {
+        var command = new Command(name, description);
+
+        foreach (var option in TOptions.Options)
+        {
+            command.Add(option);
+        }
+
+        foreach (var argument in TOptions.Arguments)
+        {
+            command.Add(argument);
+        }
+
+        command.Action = Handler;
+        return command;
+    }
+
+    protected static BindingHandler Handler =>
+        CommandHandler.Create<TOptions, IHost>(async (options, host) =>
+            {
+                var thisCommand = host.Services.GetRequiredService<BaseCommand<TOptions>>();
+                return await thisCommand.ExecuteAsync(options);
+            });
+}
diff --git a/eng/update-dependencies/BaseUrlUpdater.cs b/eng/update-dependencies/BaseUrlUpdater.cs
index 647c7f2d69..5d2c97826f 100644
--- a/eng/update-dependencies/BaseUrlUpdater.cs
+++ b/eng/update-dependencies/BaseUrlUpdater.cs
@@ -15,20 +15,20 @@ namespace Dotnet.Docker;
 internal class BaseUrlUpdater : FileRegexUpdater
 {
     private const string BaseUrlGroupName = "BaseUrlValue";
-    private readonly Options _options;
+    private readonly SpecificCommandOptions _options;
     private readonly JObject _manifestVariables;
 
-    public BaseUrlUpdater(string repoRoot, Options options)
+    public BaseUrlUpdater(string repoRoot, SpecificCommandOptions options)
     {
-        Path = System.IO.Path.Combine(repoRoot, UpdateDependencies.VersionsFilename);
+        Path = System.IO.Path.Combine(repoRoot, SpecificCommand.VersionsFilename);
         VersionGroupName = BaseUrlGroupName;
         Regex = ManifestHelper.GetManifestVariableRegex(
             ManifestHelper.GetBaseUrlVariableName(options.DockerfileVersion, options.SourceBranch, options.VersionSourceName),
             $"(?<{BaseUrlGroupName}>.+)");
         _options = options;
 
-        _manifestVariables = (JObject?)ManifestHelper.LoadManifest(UpdateDependencies.VersionsFilename)["variables"] ??
-            throw new InvalidOperationException($"'{UpdateDependencies.VersionsFilename}' property missing in '{UpdateDependencies.VersionsFilename}'"); ;
+        _manifestVariables = (JObject?)ManifestHelper.LoadManifest(SpecificCommand.VersionsFilename)["variables"] ??
+            throw new InvalidOperationException($"'{SpecificCommand.VersionsFilename}' property missing in '{SpecificCommand.VersionsFilename}'"); ;
     }
 
     protected override string TryGetDesiredValue(IEnumerable<IDependencyInfo> dependencyInfos, out IEnumerable<IDependencyInfo> usedDependencyInfos)
diff --git a/eng/update-dependencies/DockerfileShaUpdater.cs b/eng/update-dependencies/DockerfileShaUpdater.cs
index 986c1ba704..0e522c7f10 100644
--- a/eng/update-dependencies/DockerfileShaUpdater.cs
+++ b/eng/update-dependencies/DockerfileShaUpdater.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-//
 
 using System;
 using System.Collections.Generic;
@@ -38,13 +37,13 @@ public class DockerfileShaUpdater : FileRegexUpdater
         private readonly string? _buildVersion;
         private readonly string _arch;
         private readonly string _os;
-        private readonly Options _options;
+        private readonly SpecificCommandOptions _options;
         private readonly string _versions;
         private readonly Dictionary<string, string> _urls;
         private readonly Lazy<JObject> _manifestVariables;
 
         public DockerfileShaUpdater(
-            string productName, string dockerfileVersion, string? buildVersion, string arch, string os, string versions, Options options)
+            string productName, string dockerfileVersion, string? buildVersion, string arch, string os, string versions, SpecificCommandOptions options)
         {
             _productName = productName;
             _dockerfileVersion = new Version(dockerfileVersion);
@@ -74,10 +73,10 @@ public DockerfileShaUpdater(
                 () =>
                 {
                     const string VariablesProperty = "variables";
-                    JToken? variables = ManifestHelper.LoadManifest(UpdateDependencies.VersionsFilename)[VariablesProperty];
+                    JToken? variables = ManifestHelper.LoadManifest(SpecificCommand.VersionsFilename)[VariablesProperty];
                     if (variables is null)
                     {
-                        throw new InvalidOperationException($"'{VariablesProperty}' property missing in '{UpdateDependencies.VersionsFilename}'");
+                        throw new InvalidOperationException($"'{VariablesProperty}' property missing in '{SpecificCommand.VersionsFilename}'");
                     }
                     return (JObject)variables;
                 });
@@ -92,23 +91,14 @@ public DockerfileShaUpdater(
         }
 
         public static IEnumerable<IDependencyUpdater> CreateUpdaters(
-            string productName, string dockerfileVersion, string repoRoot, Options options)
+            string productName, string dockerfileVersion, string repoRoot, SpecificCommandOptions options)
         {
-            string versionsPath = System.IO.Path.Combine(repoRoot, UpdateDependencies.VersionsFilename);
+            string versionsPath = System.IO.Path.Combine(repoRoot, SpecificCommand.VersionsFilename);
             string versions = File.ReadAllText(versionsPath);
 
             // The format of the sha variable name is '<productName>|<dockerfileVersion>|<os>|<arch>|sha'.
             // The 'os' and 'arch' segments are optional.
-            string shaVariablePattern;
-            if (productName == NetStandard21TargetingPack)
-            {
-                // NetStandard targeting pack is not associated with a specific Dockerfile version
-                shaVariablePattern = $"\"(?<{ShaVariableGroupName}>{Regex.Escape(productName)}.*\\|sha)\":";
-            }
-            else
-            {
-                shaVariablePattern = $"\"(?<{ShaVariableGroupName}>{Regex.Escape(productName)}\\|{Regex.Escape(dockerfileVersion)}.*\\|sha)\":";
-            }
+            string shaVariablePattern = $"\"(?<{ShaVariableGroupName}>{Regex.Escape(productName)}\\|{Regex.Escape(dockerfileVersion)}.*\\|sha)\":";
 
             Regex shaVariableRegex = new(shaVariablePattern);
 
@@ -151,7 +141,7 @@ public static IEnumerable<IDependencyUpdater> CreateUpdaters(
             // Remove Aspire Dashboard case once https://github.com/dotnet/aspire/issues/2035 is fixed.
             string archiveExt = _os.Contains("win") || _productName.Contains("aspire-dashboard") ? "zip" : "tar.gz";
             string versionDir = _buildVersion ?? "";
-            string versionFile = UpdateDependencies.ResolveProductVersion(versionDir, _options);
+            string versionFile = SpecificCommand.ResolveProductVersion(versionDir, _options);
 
             string downloadUrl = _urls[_productName]
                 .Replace("$DOTNET_BASE_URL", baseUrl)
@@ -416,7 +406,7 @@ Other times the first line is the first checksum entry. This
             return checksumEntries;
         }
 
-        private static string? GetBuildVersion(string productName, string dockerfileVersion, string variables, Options options)
+        private static string? GetBuildVersion(string productName, string dockerfileVersion, string variables, SpecificCommandOptions options)
         {
             string? buildVersion;
             if (options.ProductVersions.TryGetValue(productName, out string? version))
diff --git a/eng/update-dependencies/IOptions.cs b/eng/update-dependencies/IOptions.cs
new file mode 100644
index 0000000000..cf90739422
--- /dev/null
+++ b/eng/update-dependencies/IOptions.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.CommandLine;
+
+namespace Dotnet.Docker;
+
+public interface IOptions
+{
+    public static abstract List<Option> Options { get; }
+    public static abstract List<Argument> Arguments { get; }
+}
diff --git a/eng/update-dependencies/ManifestHelper.cs b/eng/update-dependencies/ManifestHelper.cs
index bf6efd8801..a2bf623ed1 100644
--- a/eng/update-dependencies/ManifestHelper.cs
+++ b/eng/update-dependencies/ManifestHelper.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-//
 
 using System;
 using System.IO;
@@ -22,7 +21,7 @@ public static partial class ManifestHelper
     /// </summary>
     /// <param name="manifestVariables">JSON object of the variables from the manifest.</param>
     /// <param name="options">Configured options from the app.</param>
-    public static string GetBaseUrl(JObject manifestVariables, Options options) =>
+    public static string GetBaseUrl(JObject manifestVariables, SpecificCommandOptions options) =>
         ResolveVariableValue(GetBaseUrlVariableName(options.DockerfileVersion, options.SourceBranch, options.VersionSourceName), manifestVariables);
 
     /// <summary>
@@ -94,7 +93,7 @@ public static string GetVariableValue(string variableName, JObject variables)
     /// <param name="filename">Name, not path, of the manifest file located at the root of the repo.</param>
     public static JObject LoadManifest(string filename)
     {
-        string path = Path.Combine(UpdateDependencies.RepoRoot, filename);
+        string path = Path.Combine(SpecificCommand.RepoRoot, filename);
         string contents = File.ReadAllText(path);
         return JObject.Parse(contents);
     }
diff --git a/eng/update-dependencies/NuGet.config b/eng/update-dependencies/NuGet.config
new file mode 100644
index 0000000000..bccec33d8e
--- /dev/null
+++ b/eng/update-dependencies/NuGet.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/eng/update-dependencies/NuGetConfigUpdater.cs b/eng/update-dependencies/NuGetConfigUpdater.cs
index 279c595957..b0943e8fb3 100644
--- a/eng/update-dependencies/NuGetConfigUpdater.cs
+++ b/eng/update-dependencies/NuGetConfigUpdater.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-//
 
 using System;
 using System.Collections.Generic;
@@ -19,10 +18,10 @@ internal class NuGetConfigUpdater : IDependencyUpdater
 {
     private const string PkgSrcSuffix = "_internal";
     private readonly string _repoRoot;
-    private readonly Options _options;
+    private readonly SpecificCommandOptions _options;
     private readonly string _configPath;
 
-    public NuGetConfigUpdater(string repoRoot, Options options)
+    public NuGetConfigUpdater(string repoRoot, SpecificCommandOptions options)
     {
         _repoRoot = repoRoot;
         _options = options;
diff --git a/eng/update-dependencies/Options.cs b/eng/update-dependencies/Options.cs
deleted file mode 100644
index 218a5c559e..0000000000
--- a/eng/update-dependencies/Options.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-//
-
-using System.Collections.Generic;
-using System.CommandLine;
-using System.Linq;
-
-namespace Dotnet.Docker
-{
-    public class Options
-    {
-        public string InternalBaseUrl { get; }
-        public string InternalAccessToken { get; }
-        public bool ComputeChecksums { get; }
-        public string DockerfileVersion { get; }
-        public string Email { get; }
-        public string Password { get; }
-        public string GitHubProject => "dotnet-docker";
-        public string SourceBranch { get; }
-        public string TargetBranch { get; }
-        public string GitHubUpstreamOwner => "dotnet";
-        public string User { get; }
-        public string AzdoOrganization { get; }
-        public string AzdoProject { get; }
-        public string AzdoRepo { get; }
-        public IDictionary<string, string?> ProductVersions { get; set; } = new Dictionary<string, string?>();
-        public string[] Tools { get; }
-        public string VersionSourceName { get; }
-        public bool UseStableBranding { get; }
-        public bool UpdateOnly => Email == null || Password == null || User == null || TargetBranch == null;
-        public bool IsInternal => !string.IsNullOrEmpty(InternalBaseUrl);
-        public string ChecksumsFile { get; }
-        public ReleaseState? ReleaseState { get; }
-
-        public Options(
-            string dockerfileVersion,
-            string[] productVersion,
-            string[] tool,
-            string versionSourceName,
-            string email,
-            string password,
-            string user,
-            bool computeShas,
-            bool stableBranding,
-            string binarySas,
-            string checksumSas,
-            string sourceBranch,
-            string targetBranch,
-            string org,
-            string project,
-            string repo,
-            string checksumsFile,
-            ReleaseState? releaseState,
-            string internalBaseUrl,
-            string internalAccessToken)
-        {
-            DockerfileVersion = dockerfileVersion;
-            ProductVersions = productVersion
-                .Select(pair => pair.Split(new char[] { '=' }, 2))
-                .ToDictionary(split => split[0].ToLower(), split => split.Skip(1).FirstOrDefault());
-            Tools = tool;
-            VersionSourceName = versionSourceName;
-            Email = email;
-            Password = password;
-            User = user;
-            ComputeChecksums = computeShas;
-            ChecksumsFile = checksumsFile;
-            UseStableBranding = stableBranding;
-            SourceBranch = sourceBranch;
-            InternalBaseUrl = internalBaseUrl;
-            InternalAccessToken = internalAccessToken;
-
-            // Default TargetBranch to SourceBranch if it's not explicitly provided
-            TargetBranch = string.IsNullOrEmpty(targetBranch) ? sourceBranch : targetBranch;
-
-            AzdoOrganization = org;
-            AzdoProject = project;
-            AzdoRepo = repo;
-
-            // Special case for handling the shared dotnet product version variables.
-            if (ProductVersions.ContainsKey("runtime"))
-            {
-                ProductVersions["dotnet"] = ProductVersions["runtime"];
-            }
-            else if (ProductVersions.ContainsKey("aspnet"))
-            {
-                ProductVersions["dotnet"] = ProductVersions["aspnet"];
-            }
-
-            ReleaseState = releaseState;
-        }
-
-        public static IEnumerable<Symbol> GetCliSymbols() =>
-            new Symbol[]
-            {
-                new Argument<string>("dockerfile-version", "Version of the Dockerfiles to update"),
-                new Option<string[]>("--product-version", "Product versions to update (<product-name>=<version>)"),
-                new Option<string[]>("--tool", "Tool to update.").FromAmong(Docker.Tools.SupportedTools),
-                new Option<string>("--version-source-name", "The name of the source from which the version information was acquired."),
-                new Option<string>("--email", "GitHub or AzDO email used to make PR (if not specified, a PR will not be created)"),
-                new Option<string>("--password", "GitHub or AzDO password used to make PR (if not specified, a PR will not be created)"),
-                new Option<string>("--user", "GitHub or AzDO user used to make PR (if not specified, a PR will not be created)"),
-                new Option<bool>("--compute-shas", "Compute the checksum if a published checksum cannot be found"),
-                new Option<bool>("--stable-branding", "Use stable branding version numbers to compute paths"),
-                new Option<string>("--source-branch", () => "nightly", "Branch where the Dockerfiles are hosted"),
-                new Option<string>("--target-branch", "Target branch of the generated PR (defaults to value of source-branch)"),
-                new Option<string>("--binary-sas", "SAS query string used to access binary files in blob storage"),
-                new Option<string>("--checksum-sas", "SAS query string used to access checksum files in blob storage"),
-                new Option<string>("--org", "Name of the AzDO organization"),
-                new Option<string>("--project", "Name of the AzDO project"),
-                new Option<string>("--repo", "Name of the AzDO repo"),
-                new Option<string>("--checksums-file", "File containing a list of checksums for each product asset"),
-                new Option<ReleaseState?>("--release-state", "The release state of the product assets"),
-                new Option<string>("--internal-base-url", "Base Url for internal build artifacts"),
-                new Option<string>("--internal-access-token", "PAT for accessing internal build artifacts")
-            };
-    }
-
-    public enum ReleaseState
-    {
-        Prerelease,
-        Release
-    }
-}
diff --git a/eng/update-dependencies/Program.cs b/eng/update-dependencies/Program.cs
new file mode 100644
index 0000000000..df00b84f26
--- /dev/null
+++ b/eng/update-dependencies/Program.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.CommandLine;
+using System.CommandLine.Hosting;
+using Dotnet.Docker;
+using Microsoft.Extensions.Hosting;
+
+var rootCommand = new RootCommand()
+{
+    SpecificCommand.Create(
+        name: "specific",
+        description: "Update dependencies using specific product versions"),
+};
+
+var config = new CommandLineConfiguration(rootCommand);
+
+config.UseHost(
+    _ => Host.CreateDefaultBuilder(),
+    host => host.ConfigureServices(services =>
+        {
+            SpecificCommand.Register<SpecificCommand>(services);
+        })
+    );
+
+return await config.InvokeAsync(args);
diff --git a/eng/update-dependencies/ReleaseState.cs b/eng/update-dependencies/ReleaseState.cs
new file mode 100644
index 0000000000..7ff04c5783
--- /dev/null
+++ b/eng/update-dependencies/ReleaseState.cs
@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Dotnet.Docker;
+
+public enum ReleaseState
+{
+    Prerelease,
+    Release
+}
diff --git a/eng/update-dependencies/UpdateDependencies.cs b/eng/update-dependencies/SpecificCommand.cs
similarity index 95%
rename from eng/update-dependencies/UpdateDependencies.cs
rename to eng/update-dependencies/SpecificCommand.cs
index e560e912c1..d4f4f7b25f 100644
--- a/eng/update-dependencies/UpdateDependencies.cs
+++ b/eng/update-dependencies/SpecificCommand.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Invocation;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -18,30 +16,23 @@
 
 namespace Dotnet.Docker
 {
-    public static class UpdateDependencies
+    public class SpecificCommand : BaseCommand<SpecificCommandOptions>
     {
         public const string ManifestFilename = "manifest.json";
         public const string VersionsFilename = "manifest.versions.json";
 
-        private static Options? s_options;
+        private static SpecificCommandOptions? s_options;
 
-        private static Options Options {
+        private static SpecificCommandOptions Options {
             get => s_options ?? throw new InvalidOperationException($"{nameof(Options)} has not been set.");
             set => s_options = value;
         }
 
         public static string RepoRoot { get; } = Directory.GetCurrentDirectory();
 
-        public static Task Main(string[] args)
+        internal static string ResolveProductVersion(string version, SpecificCommandOptions options)
         {
-            RootCommand command = [.. Options.GetCliSymbols()];
-            command.Handler = CommandHandler.Create<Options>(ExecuteAsync);
-            return command.InvokeAsync(args);
-        }
-
-        internal static string ResolveProductVersion(string version, Options options)
-        {
-            if (!string.IsNullOrEmpty(version) && options.UseStableBranding)
+            if (!string.IsNullOrEmpty(version) && options.StableBranding)
             {
                 int monikerSeparatorIndex = version.IndexOf('-');
                 if (monikerSeparatorIndex >= 0)
@@ -53,7 +44,7 @@ internal static string ResolveProductVersion(string version, Options options)
             return version;
         }
 
-        private static async Task ExecuteAsync(Options options)
+        public override async Task<int> ExecuteAsync(SpecificCommandOptions options)
         {
             Options = options;
 
@@ -117,7 +108,7 @@ private static async Task ExecuteAsync(Options options)
                 Environment.Exit(1);
             }
 
-            Environment.Exit(0);
+            return 0;
         }
 
         private static DependencyUpdateResults UpdateFiles(
@@ -420,8 +411,8 @@ private static IEnumerable<IDependencyUpdater> GetProductUpdaters()
 
         private static IEnumerable<IDependencyUpdater> GetGeneratedContentUpdaters() =>
         [
-            ScriptRunnerUpdater.GetDockerfileUpdater(RepoRoot),
-            ScriptRunnerUpdater.GetReadMeUpdater(RepoRoot)
+            // ScriptRunnerUpdater.GetDockerfileUpdater(RepoRoot),
+            // ScriptRunnerUpdater.GetReadMeUpdater(RepoRoot)
         ];
     }
 }
diff --git a/eng/update-dependencies/SpecificCommandOptions.cs b/eng/update-dependencies/SpecificCommandOptions.cs
new file mode 100644
index 0000000000..0606007dbb
--- /dev/null
+++ b/eng/update-dependencies/SpecificCommandOptions.cs
@@ -0,0 +1,125 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Parsing;
+using System.Linq;
+
+namespace Dotnet.Docker
+{
+    public class SpecificCommandOptions : IOptions
+    {
+        public string GitHubProject { get; } = "dotnet-docker";
+        public string GitHubUpstreamOwner { get; } = "dotnet";
+
+        public required string InternalBaseUrl { get; init; }
+        public required string InternalAccessToken { get; init; }
+        public required bool ComputeShas { get; init; }
+        public required string DockerfileVersion { get; init; }
+        public required string Email { get; init; }
+        public required string Password { get; init; }
+        public string SourceBranch { get; init; } = "nightly";
+        public required string TargetBranch { get; init; }
+        public required string User { get; init; }
+        public required string AzdoOrganization { get; init; }
+        public required string AzdoProject { get; init; }
+        public required string AzdoRepo { get; init; }
+        public required IDictionary<string, string?> ProductVersions { get; set; }
+        public required IEnumerable<string> Tools { get; init; }
+        public required string VersionSourceName { get; init; }
+        public required bool StableBranding { get; init; }
+        public required string ChecksumsFile { get; init; }
+        public required ReleaseState? ReleaseState { get; init; }
+
+        public bool UpdateOnly => Email == null || Password == null || User == null || TargetBranch == null;
+        public bool IsInternal => !string.IsNullOrEmpty(InternalBaseUrl);
+
+        public static List<Argument> Arguments =>
+        [
+            new Argument<string>("dockerfile-version"),
+        ];
+
+        public static List<Option> Options => GetOptions();
+
+        private static List<Option> GetOptions()
+        {
+            var toolOption = new Option<IEnumerable<string>>("--tool", "--tools")
+            {
+                Description = "Tool to update.",
+                Arity = ArgumentArity.ZeroOrMore,
+                DefaultValueFactory = _ => [],
+            };
+            toolOption.AcceptOnlyFromAmong(Docker.Tools.SupportedTools);
+
+            List<Option> options =
+            [
+                new Option<IDictionary<string, string?>>("--product-versions", "--product-version")
+                {
+                    Description = "Product versions to update (<product-name>=<version>)",
+                    Arity = ArgumentArity.ZeroOrMore,
+                    DefaultValueFactory = _ => new Dictionary<string, string?>(),
+                    CustomParser = argumentResult =>
+                    {
+                        var productVersions = argumentResult.Tokens
+                            .Select(token => token.Value)
+                            .Select(value => value.Split('=', 2))
+                            .ToDictionary(
+                                keySelector: pair => pair[0],
+                                elementSelector: pair => pair.Length > 1 ? pair[1] : null);
+
+                        // Special case for handling the shared dotnet product version variables.
+                        if (productVersions.TryGetValue("runtime", out string? runtimeVersion))
+                        {
+                            productVersions["dotnet"] = runtimeVersion;
+                        }
+                        else if (productVersions.TryGetValue("aspnet", out string? aspnetVersion))
+                        {
+                            productVersions["dotnet"] = aspnetVersion;
+                        }
+
+                        return productVersions;
+                    },
+                },
+                toolOption,
+                new Option<string>("--version-source-name") { Description = "The name of the source from which the version information was acquired." },
+                new Option<string>("--email") { Description = "GitHub or AzDO email used to make PR (if not specified, a PR will not be created)" },
+                new Option<string>("--password") { Description = "GitHub or AzDO password used to make PR (if not specified, a PR will not be created)" },
+                new Option<string>("--user") { Description = "GitHub or AzDO user used to make PR (if not specified, a PR will not be created)" },
+                new Option<bool>("--compute-shas") { Description = "Compute the checksum if a published checksum cannot be found" },
+                new Option<bool>("--stable-branding") { Description = "Use stable branding version numbers to compute paths" },
+                new Option<string>("--source-branch") { Description = "Branch where the Dockerfiles are hosted" },
+                new Option<string>("--target-branch")
+                {
+                    Description = "Target branch of the generated PR (defaults to value of source-branch)",
+                    DefaultValueFactory = argumentResult =>
+                    {
+                        var thisOption = argumentResult.Parent as OptionResult;
+                        var command = thisOption?.Parent as CommandResult;
+
+                        OptionResult? sourceBranchOption = command?.Children?
+                            .Where(child => child is OptionResult)
+                            .Cast<OptionResult>()
+                            .Where(option => option.IdentifierToken?.Value == "--source-branch")
+                            .FirstOrDefault();
+
+                        string? sourceBranchValue = sourceBranchOption?.Tokens
+                            .FirstOrDefault()?
+                            .Value;
+
+                        return sourceBranchValue ?? "";
+                    },
+                },
+                new Option<string>("--azdo-organization", "--org") { Description = "Name of the AzDO organization" },
+                new Option<string>("--azdo-project", "--project") { Description = "Name of the AzDO project" },
+                new Option<string>("--azdo-repo", "--repo") { Description = "Name of the AzDO repo" },
+                new Option<string>("--checksums-file") { Description = "File containing a list of checksums for each product asset" },
+                new Option<ReleaseState?>("--release-state") { Description = "The release state of the product assets" },
+                new Option<string>("--internal-base-url") { Description = "Base Url for internal build artifacts" },
+                new Option<string>("--internal-access-token") { Description = "PAT for accessing internal build artifacts" }
+            ];
+
+            return options;
+        }
+    }
+}
diff --git a/eng/update-dependencies/VariableUpdaterBase.cs b/eng/update-dependencies/VariableUpdaterBase.cs
index 3dc80c53bb..d50aa2a2de 100644
--- a/eng/update-dependencies/VariableUpdaterBase.cs
+++ b/eng/update-dependencies/VariableUpdaterBase.cs
@@ -15,7 +15,7 @@ internal abstract class VariableUpdaterBase : FileRegexUpdater
     public VariableUpdaterBase(string repoRoot, string variableName)
     {
         VariableName = variableName;
-        Path = System.IO.Path.Combine(repoRoot, UpdateDependencies.VersionsFilename);
+        Path = System.IO.Path.Combine(repoRoot, SpecificCommand.VersionsFilename);
         VersionGroupName = "val";
         Regex = ManifestHelper.GetManifestVariableRegex(variableName, @$"(?<{VersionGroupName}>\S*)");
 
@@ -23,10 +23,10 @@ public VariableUpdaterBase(string repoRoot, string variableName)
             () =>
             {
                 const string VariablesProperty = "variables";
-                JToken? variables = ManifestHelper.LoadManifest(UpdateDependencies.VersionsFilename)[VariablesProperty];
+                JToken? variables = ManifestHelper.LoadManifest(SpecificCommand.VersionsFilename)[VariablesProperty];
                 if (variables is null)
                 {
-                    throw new InvalidOperationException($"'{VariablesProperty}' property missing in '{UpdateDependencies.VersionsFilename}'");
+                    throw new InvalidOperationException($"'{VariablesProperty}' property missing in '{SpecificCommand.VersionsFilename}'");
                 }
                 return (JObject)variables;
             });
diff --git a/eng/update-dependencies/VersionUpdater.cs b/eng/update-dependencies/VersionUpdater.cs
index 82f7570ba0..9d2badc360 100644
--- a/eng/update-dependencies/VersionUpdater.cs
+++ b/eng/update-dependencies/VersionUpdater.cs
@@ -20,10 +20,10 @@ public class VersionUpdater : FileRegexUpdater
         private static readonly string s_versionGroupName = "versionValue";
 
         private readonly string _productName;
-        private readonly Options _options;
+        private readonly SpecificCommandOptions _options;
         private readonly VersionType _versionType;
 
-        public VersionUpdater(VersionType versionType, string productName, string dockerfileVersion, string repoRoot, Options options)
+        public VersionUpdater(VersionType versionType, string productName, string dockerfileVersion, string repoRoot, SpecificCommandOptions options)
         {
             _productName = productName;
             _options = options;
@@ -32,7 +32,7 @@ public VersionUpdater(VersionType versionType, string productName, string docker
 
             Trace.TraceInformation($"Updating {versionVariableName}");
 
-            Path = System.IO.Path.Combine(repoRoot, UpdateDependencies.VersionsFilename);
+            Path = System.IO.Path.Combine(repoRoot, SpecificCommand.VersionsFilename);
             VersionGroupName = s_versionGroupName;
             Regex = GetVersionVariableRegex(versionVariableName);
         }
@@ -95,7 +95,7 @@ private string GetProductVersion(IDependencyInfo productInfo)
                 }
             }
 
-            return UpdateDependencies.ResolveProductVersion(version, _options);
+            return SpecificCommand.ResolveProductVersion(version, _options);
         }
 
         private static Regex GetVersionVariableRegex(string versionVariableName) =>
diff --git a/eng/update-dependencies/update-dependencies.csproj b/eng/update-dependencies/update-dependencies.csproj
index 2340022ba3..6b62a81c01 100644
--- a/eng/update-dependencies/update-dependencies.csproj
+++ b/eng/update-dependencies/update-dependencies.csproj
@@ -8,18 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.29.0" />
+    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
     <PackageReference Include="Microsoft.DotNet.VersionTools" Version="9.0.0-beta.24151.5" />
-    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.232.0-preview" />
     <PackageReference Include="Octokit" Version="13.0.1" />
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.3.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
-
-    <!-- Workaround for CVE-2024-0056 introduced as a transient dependency of Microsoft.TeamFoundationServer.Client -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-
-    <!-- CVE-2024-38095: Upgrade version of System.Formats.Asn1 implicitly referenced by Microsoft.DotNet.VersionTools -->
-    <!-- Tracking issue for Arcade: https://github.com/dotnet/dnceng/issues/3336 -->
-    <PackageReference Include="System.Formats.Asn1" Version="6.0.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25210.1" />
+    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.25210.1" />
+    <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta5.25210.1" />
   </ItemGroup>
 </Project>

From a2a42b0f713fa38a2fa466db8bfb2cb2b981b92c Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 16 Apr 2025 15:17:49 -0700
Subject: [PATCH 2/7] Un-comment script runners

---
 eng/update-dependencies/SpecificCommand.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/update-dependencies/SpecificCommand.cs b/eng/update-dependencies/SpecificCommand.cs
index d4f4f7b25f..ab8cb8c00c 100644
--- a/eng/update-dependencies/SpecificCommand.cs
+++ b/eng/update-dependencies/SpecificCommand.cs
@@ -411,8 +411,8 @@ private static IEnumerable<IDependencyUpdater> GetProductUpdaters()
 
         private static IEnumerable<IDependencyUpdater> GetGeneratedContentUpdaters() =>
         [
-            // ScriptRunnerUpdater.GetDockerfileUpdater(RepoRoot),
-            // ScriptRunnerUpdater.GetReadMeUpdater(RepoRoot)
+            ScriptRunnerUpdater.GetDockerfileUpdater(RepoRoot),
+            ScriptRunnerUpdater.GetReadMeUpdater(RepoRoot)
         ];
     }
 }

From e127debac8e33d4e3be51aaf04ae91df0339ee9d Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 16 Apr 2025 19:35:00 -0700
Subject: [PATCH 3/7] Simplify PR target branch calculation

---
 .../SpecificCommandOptions.cs                 | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/eng/update-dependencies/SpecificCommandOptions.cs b/eng/update-dependencies/SpecificCommandOptions.cs
index 0606007dbb..da75c073a0 100644
--- a/eng/update-dependencies/SpecificCommandOptions.cs
+++ b/eng/update-dependencies/SpecificCommandOptions.cs
@@ -3,13 +3,14 @@
 
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Parsing;
 using System.Linq;
 
 namespace Dotnet.Docker
 {
     public class SpecificCommandOptions : IOptions
     {
+        private string? _targetBranch = null;
+
         public string GitHubProject { get; } = "dotnet-docker";
         public string GitHubUpstreamOwner { get; } = "dotnet";
 
@@ -20,7 +21,11 @@ public class SpecificCommandOptions : IOptions
         public required string Email { get; init; }
         public required string Password { get; init; }
         public string SourceBranch { get; init; } = "nightly";
-        public required string TargetBranch { get; init; }
+        public string TargetBranch
+        {
+            get => _targetBranch ?? SourceBranch;
+            init => _targetBranch = value;
+        }
         public required string User { get; init; }
         public required string AzdoOrganization { get; init; }
         public required string AzdoProject { get; init; }
@@ -89,27 +94,7 @@ private static List<Option> GetOptions()
                 new Option<bool>("--compute-shas") { Description = "Compute the checksum if a published checksum cannot be found" },
                 new Option<bool>("--stable-branding") { Description = "Use stable branding version numbers to compute paths" },
                 new Option<string>("--source-branch") { Description = "Branch where the Dockerfiles are hosted" },
-                new Option<string>("--target-branch")
-                {
-                    Description = "Target branch of the generated PR (defaults to value of source-branch)",
-                    DefaultValueFactory = argumentResult =>
-                    {
-                        var thisOption = argumentResult.Parent as OptionResult;
-                        var command = thisOption?.Parent as CommandResult;
-
-                        OptionResult? sourceBranchOption = command?.Children?
-                            .Where(child => child is OptionResult)
-                            .Cast<OptionResult>()
-                            .Where(option => option.IdentifierToken?.Value == "--source-branch")
-                            .FirstOrDefault();
-
-                        string? sourceBranchValue = sourceBranchOption?.Tokens
-                            .FirstOrDefault()?
-                            .Value;
-
-                        return sourceBranchValue ?? "";
-                    },
-                },
+                new Option<string>("--target-branch") { Description = "Target branch of the generated PR (defaults to value of source-branch)" },
                 new Option<string>("--azdo-organization", "--org") { Description = "Name of the AzDO organization" },
                 new Option<string>("--azdo-project", "--project") { Description = "Name of the AzDO project" },
                 new Option<string>("--azdo-repo", "--repo") { Description = "Name of the AzDO repo" },

From dc413076ce6291f843b511c91481b72bd3456447 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 16 Apr 2025 19:37:08 -0700
Subject: [PATCH 4/7] Reorder options and default to empty strings

---
 .../SpecificCommandOptions.cs                 | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/eng/update-dependencies/SpecificCommandOptions.cs b/eng/update-dependencies/SpecificCommandOptions.cs
index da75c073a0..c1bff80054 100644
--- a/eng/update-dependencies/SpecificCommandOptions.cs
+++ b/eng/update-dependencies/SpecificCommandOptions.cs
@@ -14,30 +14,40 @@ public class SpecificCommandOptions : IOptions
         public string GitHubProject { get; } = "dotnet-docker";
         public string GitHubUpstreamOwner { get; } = "dotnet";
 
-        public required string InternalBaseUrl { get; init; }
-        public required string InternalAccessToken { get; init; }
-        public required bool ComputeShas { get; init; }
-        public required string DockerfileVersion { get; init; }
-        public required string Email { get; init; }
-        public required string Password { get; init; }
+        // .NET Version options
+        public required string DockerfileVersion { get; init; } = "";
+        public IDictionary<string, string?> ProductVersions { get; init; } = new Dictionary<string, string?>();
+        public ReleaseState? ReleaseState { get; init; } = null;
+        public bool StableBranding { get; init; } = false;
+        public string ChecksumsFile { get; init; } = "";
+
+        // Tool/image component version options
+        public IEnumerable<string> Tools { get; init; } = [];
+
+        // Pull request options
+        public string User { get; init; } = "";
+        public string Email { get; init; } = "";
+        public string Password { get; init; } = "";
+        public string AzdoOrganization { get; init; } = "";
+        public string AzdoProject { get; init; } = "";
+        public string AzdoRepo { get; init; } = "";
+        public string VersionSourceName { get; init; } = "";
         public string SourceBranch { get; init; } = "nightly";
         public string TargetBranch
         {
             get => _targetBranch ?? SourceBranch;
             init => _targetBranch = value;
         }
-        public required string User { get; init; }
-        public required string AzdoOrganization { get; init; }
-        public required string AzdoProject { get; init; }
-        public required string AzdoRepo { get; init; }
-        public required IDictionary<string, string?> ProductVersions { get; set; }
-        public required IEnumerable<string> Tools { get; init; }
-        public required string VersionSourceName { get; init; }
-        public required bool StableBranding { get; init; }
-        public required string ChecksumsFile { get; init; }
-        public required ReleaseState? ReleaseState { get; init; }
 
-        public bool UpdateOnly => Email == null || Password == null || User == null || TargetBranch == null;
+        public bool UpdateOnly =>
+            string.IsNullOrEmpty(Email)
+            || string.IsNullOrEmpty(Password)
+            || string.IsNullOrEmpty(User)
+            || string.IsNullOrEmpty(TargetBranch);
+
+        // Internal build options
+        public string InternalBaseUrl { get; init; } = "";
+        public string InternalAccessToken { get; init; } = "";
         public bool IsInternal => !string.IsNullOrEmpty(InternalBaseUrl);
 
         public static List<Argument> Arguments =>

From c83e6af9e65c04714883be69843ffce2640a6cdc Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 16 Apr 2025 19:42:58 -0700
Subject: [PATCH 5/7] Reorder options to match properties

---
 .../SpecificCommandOptions.cs                 | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/eng/update-dependencies/SpecificCommandOptions.cs b/eng/update-dependencies/SpecificCommandOptions.cs
index c1bff80054..ad564e89f2 100644
--- a/eng/update-dependencies/SpecificCommandOptions.cs
+++ b/eng/update-dependencies/SpecificCommandOptions.cs
@@ -59,13 +59,13 @@ public string TargetBranch
 
         private static List<Option> GetOptions()
         {
-            var toolOption = new Option<IEnumerable<string>>("--tool", "--tools")
+            var toolsOption = new Option<IEnumerable<string>>("--tools", "--tool")
             {
-                Description = "Tool to update.",
+                Description = "Image tools or Dockerfile components to update",
                 Arity = ArgumentArity.ZeroOrMore,
                 DefaultValueFactory = _ => [],
             };
-            toolOption.AcceptOnlyFromAmong(Docker.Tools.SupportedTools);
+            toolsOption.AcceptOnlyFromAmong(Docker.Tools.SupportedTools);
 
             List<Option> options =
             [
@@ -96,22 +96,24 @@ private static List<Option> GetOptions()
                         return productVersions;
                     },
                 },
-                toolOption,
-                new Option<string>("--version-source-name") { Description = "The name of the source from which the version information was acquired." },
+
+                new Option<ReleaseState?>("--release-state") { Description = "The release state of the product assets" },
+                new Option<bool>("--stable-branding") { Description = "Use stable branding version numbers to compute paths" },
+                new Option<string>("--checksums-file") { Description = "File containing a list of checksums for each product asset" },
+                toolsOption,
+
+                new Option<string>("--user") { Description = "GitHub or AzDO user used to make PR (if not specified, a PR will not be created)" },
                 new Option<string>("--email") { Description = "GitHub or AzDO email used to make PR (if not specified, a PR will not be created)" },
                 new Option<string>("--password") { Description = "GitHub or AzDO password used to make PR (if not specified, a PR will not be created)" },
-                new Option<string>("--user") { Description = "GitHub or AzDO user used to make PR (if not specified, a PR will not be created)" },
-                new Option<bool>("--compute-shas") { Description = "Compute the checksum if a published checksum cannot be found" },
-                new Option<bool>("--stable-branding") { Description = "Use stable branding version numbers to compute paths" },
-                new Option<string>("--source-branch") { Description = "Branch where the Dockerfiles are hosted" },
-                new Option<string>("--target-branch") { Description = "Target branch of the generated PR (defaults to value of source-branch)" },
                 new Option<string>("--azdo-organization", "--org") { Description = "Name of the AzDO organization" },
                 new Option<string>("--azdo-project", "--project") { Description = "Name of the AzDO project" },
                 new Option<string>("--azdo-repo", "--repo") { Description = "Name of the AzDO repo" },
-                new Option<string>("--checksums-file") { Description = "File containing a list of checksums for each product asset" },
-                new Option<ReleaseState?>("--release-state") { Description = "The release state of the product assets" },
+                new Option<string>("--version-source-name") { Description = "The name of the source from which the version information was acquired." },
+                new Option<string>("--source-branch") { Description = "Branch where the Dockerfiles are hosted" },
+                new Option<string>("--target-branch") { Description = "Target branch of the generated PR (defaults to value of source-branch)" },
+
                 new Option<string>("--internal-base-url") { Description = "Base Url for internal build artifacts" },
-                new Option<string>("--internal-access-token") { Description = "PAT for accessing internal build artifacts" }
+                new Option<string>("--internal-access-token") { Description = "PAT for accessing internal build artifacts" },
             ];
 
             return options;

From 24bd64e7e53ccdc096885ab2d74a2f2aeb22799c Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Thu, 17 Apr 2025 07:44:37 -0700
Subject: [PATCH 6/7] Prefer root NuGet config

---
 NuGet.config                         | 1 +
 eng/update-dependencies/NuGet.config | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 eng/update-dependencies/NuGet.config

diff --git a/NuGet.config b/NuGet.config
index 4b2250e637..bccec33d8e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,5 +4,6 @@
     <clear />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/eng/update-dependencies/NuGet.config b/eng/update-dependencies/NuGet.config
deleted file mode 100644
index bccec33d8e..0000000000
--- a/eng/update-dependencies/NuGet.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-    <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
-  </packageSources>
-</configuration>

From c2f06871496c4932b15c5fe5993557117744d1c6 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Thu, 17 Apr 2025 07:46:28 -0700
Subject: [PATCH 7/7] Make BaseCommand Handler private

Co-authored-by: Matt Thalman <mthalman@microsoft.com>
---
 eng/update-dependencies/BaseCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/update-dependencies/BaseCommand.cs b/eng/update-dependencies/BaseCommand.cs
index e07ce1f86a..e94413dc5d 100644
--- a/eng/update-dependencies/BaseCommand.cs
+++ b/eng/update-dependencies/BaseCommand.cs
@@ -36,7 +36,7 @@ public static Command Create(string name, string description)
         return command;
     }
 
-    protected static BindingHandler Handler =>
+    private static BindingHandler Handler =>
         CommandHandler.Create<TOptions, IHost>(async (options, host) =>
             {
                 var thisCommand = host.Services.GetRequiredService<BaseCommand<TOptions>>();