From c8d9e0b4b07d78d02c2d0324f10d32cd7597e1ed Mon Sep 17 00:00:00 2001
From: Logan Bussell false <loganbussell@microsoft.com>
Date: Fri, 17 May 2024 08:40:48 -0700
Subject: [PATCH] Undo some superfluous changes to make the PR diff smaller

---
 .../src/Commands/BuildCommand.cs              |  1 -
 .../src/Commands/BuildOptions.cs              | 74 ++++++++++---------
 .../src/Commands/GetStaleImagesOptions.cs     | 43 ++++++-----
 .../src/Commands/PublishManifestCommand.cs    |  3 +-
 .../src/DockerHelper.cs                       |  1 +
 .../tests/Helpers/ManifestServiceHelper.cs    | 13 ++--
 6 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildCommand.cs b/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildCommand.cs
index 5a75e3da..b4f0e88d 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildCommand.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildCommand.cs
@@ -13,7 +13,6 @@
 using System.Threading.Tasks;
 using Microsoft.DotNet.ImageBuilder.Models.Image;
 using Microsoft.DotNet.ImageBuilder.ViewModel;
-using Microsoft.Win32;
 
 #nullable enable
 namespace Microsoft.DotNet.ImageBuilder.Commands
diff --git a/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildOptions.cs b/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildOptions.cs
index ee7ccc65..64fb844a 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildOptions.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildOptions.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.CommandLine;
+using System.Linq;
 using static Microsoft.DotNet.ImageBuilder.Commands.CliHelper;
 
 #nullable enable
@@ -35,43 +36,44 @@ public class BuildOptionsBuilder : DockerRegistryOptionsBuilder
         private readonly BaseImageOverrideOptionsBuilder _baseImageOverrideOptionsBuilder = new();
 
         public override IEnumerable<Option> GetCliOptions() =>
-            [
-                ..base.GetCliOptions(),
-                .._manifestFilterOptionsBuilder.GetCliOptions(),
-                .._baseImageOverrideOptionsBuilder.GetCliOptions(),
-                CreateOption<bool>("push", nameof(BuildOptions.IsPushEnabled),
-                    "Push built images to Docker registry"),
-                CreateOption<bool>("retry", nameof(BuildOptions.IsRetryEnabled),
-                    "Retry building images upon failure"),
-                CreateOption<bool>("skip-pulling", nameof(BuildOptions.IsSkipPullingEnabled),
-                    "Skip explicitly pulling the base images of the Dockerfiles"),
-                CreateOption<string?>("image-info-output-path", nameof(BuildOptions.ImageInfoOutputPath),
-                    "Path to output image info"),
-                CreateOption<string?>("image-info-source-path", nameof(BuildOptions.ImageInfoSourcePath),
-                    "Path to source image info"),
-                CreateOption<string?>("source-repo", nameof(BuildOptions.SourceRepoUrl),
-                    "Repo URL of the Dockerfile sources"),
-                CreateOption<bool>("no-cache", nameof(BuildOptions.NoCache),
-                    "Disables build cache feature"),
-                CreateOption<string?>("source-repo-prefix", nameof(BuildOptions.SourceRepoPrefix),
-                    "Prefix to add to the external base image names when pulling them"),
-                CreateDictionaryOption("build-arg", nameof(BuildOptions.BuildArgs),
-                    "Build argument to pass to the Dockerfiles (<name>=<value>)"),
-                CreateOption<bool>("skip-platform-check", nameof(BuildOptions.SkipPlatformCheck),
-                    "Skips validation that ensures the Dockerfile's base image's platform matches the manifest configuration"),
-                CreateOption<string>("digests-out-var", nameof(BuildOptions.OutputVariableName),
-                    "Azure DevOps variable name to use for outputting the list of built image digests"),
-                CreateOption<string>("acr-subscription", nameof(BuildOptions.Subscription),
-                    "Azure subscription to operate on"),
-                CreateOption<string>("acr-resource-group", nameof(BuildOptions.ResourceGroup),
-                    "Azure resource group to operate on"),
-            ];
+            base.GetCliOptions()
+                .Concat(_manifestFilterOptionsBuilder.GetCliOptions())
+                .Concat(_baseImageOverrideOptionsBuilder.GetCliOptions())
+                .Concat(
+                    new Option[]
+                    {
+                        CreateOption<bool>("push", nameof(BuildOptions.IsPushEnabled),
+                            "Push built images to Docker registry"),
+                        CreateOption<bool>("retry", nameof(BuildOptions.IsRetryEnabled),
+                            "Retry building images upon failure"),
+                        CreateOption<bool>("skip-pulling", nameof(BuildOptions.IsSkipPullingEnabled),
+                            "Skip explicitly pulling the base images of the Dockerfiles"),
+                        CreateOption<string?>("image-info-output-path", nameof(BuildOptions.ImageInfoOutputPath),
+                            "Path to output image info"),
+                        CreateOption<string?>("image-info-source-path", nameof(BuildOptions.ImageInfoSourcePath),
+                            "Path to source image info"),
+                        CreateOption<string?>("source-repo", nameof(BuildOptions.SourceRepoUrl),
+                            "Repo URL of the Dockerfile sources"),
+                        CreateOption<bool>("no-cache", nameof(BuildOptions.NoCache),
+                            "Disables build cache feature"),
+                        CreateOption<string?>("source-repo-prefix", nameof(BuildOptions.SourceRepoPrefix),
+                            "Prefix to add to the external base image names when pulling them"),
+                        CreateDictionaryOption("build-arg", nameof(BuildOptions.BuildArgs),
+                            "Build argument to pass to the Dockerfiles (<name>=<value>)"),
+                        CreateOption<bool>("skip-platform-check", nameof(BuildOptions.SkipPlatformCheck),
+                            "Skips validation that ensures the Dockerfile's base image's platform matches the manifest configuration"),
+                        CreateOption<string>("digests-out-var", nameof(BuildOptions.OutputVariableName),
+                            "Azure DevOps variable name to use for outputting the list of built image digests"),
+                        CreateOption<string>("acr-subscription", nameof(BuildOptions.Subscription),
+                            "Azure subscription to operate on"),
+                        CreateOption<string>("acr-resource-group", nameof(BuildOptions.ResourceGroup),
+                            "Azure resource group to operate on"),
+                    });
 
         public override IEnumerable<Argument> GetCliArguments() =>
-            [
-                ..base.GetCliArguments(),
-                .._manifestFilterOptionsBuilder.GetCliArguments(),
-                .._baseImageOverrideOptionsBuilder.GetCliArguments(),
-            ];
+            base.GetCliArguments()
+                .Concat(_manifestFilterOptionsBuilder.GetCliArguments())
+                .Concat(_baseImageOverrideOptionsBuilder.GetCliArguments());
     }
 }
+#nullable disable
diff --git a/src/Microsoft.DotNet.ImageBuilder/src/Commands/GetStaleImagesOptions.cs b/src/Microsoft.DotNet.ImageBuilder/src/Commands/GetStaleImagesOptions.cs
index 8c72904b..8cf07d59 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/Commands/GetStaleImagesOptions.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/Commands/GetStaleImagesOptions.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.CommandLine;
+using System.Linq;
 using static Microsoft.DotNet.ImageBuilder.Commands.CliHelper;
 
 #nullable enable
@@ -35,26 +36,30 @@ public class GetStaleImagesOptionsBuilder : CliOptionsBuilder
         private readonly BaseImageOverrideOptionsBuilder _baseImageOverrideOptionsBuilder = new();
 
         public override IEnumerable<Option> GetCliOptions() =>
-            [
-                ..base.GetCliOptions(),
-                .._subscriptionOptionsBuilder.GetCliOptions(),
-                .._manifestFilterOptionsBuilder.GetCliOptions(),
-                .._gitOptionsBuilder.GetCliOptions(),
-                .._registryCredentialsOptionsBuilder.GetCliOptions(),
-                .._baseImageOverrideOptionsBuilder.GetCliOptions(),
-                CreateOption<string?>("owned-acr", nameof(GetStaleImagesOptions.OwnedAcr),
-                        "The name of the ACR to authenticate with"),
-            ];
+            base.GetCliOptions()
+                .Concat(_subscriptionOptionsBuilder.GetCliOptions())
+                .Concat(_manifestFilterOptionsBuilder.GetCliOptions())
+                .Concat(_gitOptionsBuilder.GetCliOptions())
+                .Concat(_registryCredentialsOptionsBuilder.GetCliOptions())
+                .Concat(_baseImageOverrideOptionsBuilder.GetCliOptions())
+                .Concat(
+                    [
+                        CreateOption<string?>("owned-acr",
+                            nameof(GetStaleImagesOptions.OwnedAcr), "The name of the ACR to authenticate with"),
+                    ]);
 
         public override IEnumerable<Argument> GetCliArguments() =>
-            [
-                ..base.GetCliArguments(),
-                .._subscriptionOptionsBuilder.GetCliArguments(),
-                .._manifestFilterOptionsBuilder.GetCliArguments(),
-                .._gitOptionsBuilder.GetCliArguments(),
-                .._registryCredentialsOptionsBuilder.GetCliArguments(),
-                new Argument<string>(nameof(GetStaleImagesOptions.VariableName),
-                    "The Azure Pipeline variable name to assign the image paths to"),
-            ];
+            base.GetCliArguments()
+                .Concat(_subscriptionOptionsBuilder.GetCliArguments())
+                .Concat(_manifestFilterOptionsBuilder.GetCliArguments())
+                .Concat(_gitOptionsBuilder.GetCliArguments())
+                .Concat(_registryCredentialsOptionsBuilder.GetCliArguments()
+                .Concat(
+                    new Argument[]
+                    {
+                        new Argument<string>(nameof(GetStaleImagesOptions.VariableName),
+                            "The Azure Pipeline variable name to assign the image paths to")
+                    }));
     }
 }
+#nullable disable
diff --git a/src/Microsoft.DotNet.ImageBuilder/src/Commands/PublishManifestCommand.cs b/src/Microsoft.DotNet.ImageBuilder/src/Commands/PublishManifestCommand.cs
index 5ce0f1bd..413e71f7 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/Commands/PublishManifestCommand.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/Commands/PublishManifestCommand.cs
@@ -97,8 +97,7 @@ private async Task SaveTagInfoToImageInfoFileAsync(DateTime createdDate, ImageAr
                 image.Manifest.Digest = DockerHelper.GetDigestString(
                     image.ManifestRepo.FullModelName,
                     await _manifestService.Value.GetManifestDigestShaAsync(
-                        sharedTag.FullyQualifiedName,
-                        Options.IsDryRun));
+                        sharedTag.FullyQualifiedName, Options.IsDryRun));
 
                 IEnumerable<(string Repo, string Tag)> syndicatedRepresentativeSharedTags = image.ManifestImage.SharedTags
                     .Where(tag => tag.SyndicatedRepo is not null)
diff --git a/src/Microsoft.DotNet.ImageBuilder/src/DockerHelper.cs b/src/Microsoft.DotNet.ImageBuilder/src/DockerHelper.cs
index f05452c4..fa2eb47f 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/DockerHelper.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/DockerHelper.cs
@@ -208,6 +208,7 @@ public static Docker.Manifest InspectManifest(string image, bool isDryRun)
                 }
             }
 
+
             return null;
         }
 
diff --git a/src/Microsoft.DotNet.ImageBuilder/tests/Helpers/ManifestServiceHelper.cs b/src/Microsoft.DotNet.ImageBuilder/tests/Helpers/ManifestServiceHelper.cs
index abe482e3..bc854d1d 100644
--- a/src/Microsoft.DotNet.ImageBuilder/tests/Helpers/ManifestServiceHelper.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/tests/Helpers/ManifestServiceHelper.cs
@@ -18,13 +18,16 @@ public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
         IEnumerable<ImageLayersResults>? imageLayersResults = null) =>
             CreateManifestServiceFactoryMock(CreateManifestServiceMock(imageDigestResults, imageLayersResults));
 
-    public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(Mock<IInnerManifestService> innerManifestService) =>
-        CreateManifestServiceFactoryMock(new ManifestService(innerManifestService.Object));        
+    public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
+        Mock<IInnerManifestService> innerManifestService) =>
+            CreateManifestServiceFactoryMock(new ManifestService(innerManifestService.Object));
 
-    public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(Mock<IManifestService> manifestServiceMock) =>
-        CreateManifestServiceFactoryMock(manifestServiceMock.Object);        
+    public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
+        Mock<IManifestService> manifestServiceMock) =>
+            CreateManifestServiceFactoryMock(manifestServiceMock.Object);
 
-    public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(IManifestService manifestService)
+    public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
+        IManifestService manifestService)
     {
         Mock<IManifestServiceFactory> manifestServiceFactoryMock = new();
         manifestServiceFactoryMock