From b5323ace9b86ff99c42274855a7cf72e83ca8cda Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Mon, 13 Nov 2023 15:19:16 -0800
Subject: [PATCH] Minor formatting cleanup.

---
 src/core-sdk-tasks/CalculateTemplateVersions.cs | 17 +++++------------
 src/core-sdk-tasks/EnvironmentVariableFilter.cs | 12 ++++++------
 .../TarGzFileCreateFromDirectory.cs             |  2 --
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs
index ade0d8dac..0774a3858 100644
--- a/src/core-sdk-tasks/CalculateTemplateVersions.cs
+++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs
@@ -28,7 +28,6 @@ namespace Microsoft.DotNet.Cli.Build
         [Required]
         public int CombinedBuildNumberAndRevision { get; set; }
 
-
         //  Should be the BundledTemplates with BundledTemplateInstallPath metadata set to the value calculated for that group
         [Output]
         public ITaskItem [] BundledTemplatesWithInstallPaths { get; set; }
@@ -39,11 +38,10 @@ namespace Microsoft.DotNet.Cli.Build
         //  TemplatesMajorMinorVersion: 6.0 (from BundledTemplateMajorMinorVersion from group)
         //  InstallerUpgradeCode: Guid generated using GenerateGuidFromName, combining TemplateBaseFilename, FullNugetVersion, ProductMonikerRid, and InstallerExtension
         //  MSIVersion: Result of calling GenerateMsiVersionFromFullVersion logic with CombinedBuildNumberAndRevision and BundledTemplateMajorMinorPatchVersion from template group
-
         [Output]
         public ITaskItem [] TemplatesComponents { get; set; }
 
-        private const int _patchVersionResetOffset = 1;
+        private const int PatchVersionResetOffset = 1;
 
         public override bool Execute()
         {
@@ -112,15 +110,10 @@ namespace Microsoft.DotNet.Cli.Build
             // more in the above bug's detail.
             // There is no non-deterministic existing ComponentId under Major version 5.
             // so only apply the patch bump when below 5
-
-            int basePatch =
-                aspNetCoreTemplate.Major < 5
-                ? aspNetCoreTemplate.Patch + _patchVersionResetOffset
-                : aspNetCoreTemplate.Patch;
-
-            var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor,
-                basePatch);
-            return baseMajorMinorPatch;
+            int basePatch = aspNetCoreTemplate.Major < 5 ?
+                aspNetCoreTemplate.Patch + PatchVersionResetOffset :
+                aspNetCoreTemplate.Patch;
+            return new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, basePatch);
         }
     }
 
diff --git a/src/core-sdk-tasks/EnvironmentVariableFilter.cs b/src/core-sdk-tasks/EnvironmentVariableFilter.cs
index 6e0745622..6b82fa32c 100644
--- a/src/core-sdk-tasks/EnvironmentVariableFilter.cs
+++ b/src/core-sdk-tasks/EnvironmentVariableFilter.cs
@@ -9,15 +9,15 @@ namespace Microsoft.DotNet.Cli.Build
 {
     public class EnvironmentFilter
     {
-        private const string _MSBuildEnvironmentVariablePrefix = "MSBuild";
-        private const string _DotNetEnvironmentVariablePrefix = "DOTNET";
-        private const string _NugetEnvironmentVariablePrefix = "NUGET";
+        private const string MSBuildEnvironmentVariablePrefix = "MSBuild";
+        private const string DotNetEnvironmentVariablePrefix = "DOTNET";
+        private const string NugetEnvironmentVariablePrefix = "NUGET";
 
         private IEnumerable<string> _prefixesOfEnvironmentVariablesToRemove = new string []
         {
-            _MSBuildEnvironmentVariablePrefix,
-            _DotNetEnvironmentVariablePrefix,
-            _NugetEnvironmentVariablePrefix
+            MSBuildEnvironmentVariablePrefix,
+            DotNetEnvironmentVariablePrefix,
+            NugetEnvironmentVariablePrefix
         };
 
         private IEnumerable<string> _environmentVariablesToRemove = new string []
diff --git a/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs b/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs
index 4d616c994..f239e0161 100644
--- a/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs
+++ b/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs
@@ -102,9 +102,7 @@ namespace Microsoft.DotNet.Build.Tasks
             if (IncludeBaseDirectory)
             {
                 var parentDirectory = Directory.GetParent(SourceDirectory).Parent.FullName;
-
                 var sourceDirectoryName = Path.GetFileName(Path.GetDirectoryName(SourceDirectory));
-
                 return $"--directory {parentDirectory} {sourceDirectoryName}  {GetExcludes()}";
             }
             else