Update the code based on the feedback

Author: v-wuzhai

test/HelixTasks/TarGzFileCreateFromDirectory.cs

@@ -33,7 +33,7 @@ public sealed class TarGzFileCreateFromDirectory : ToolTask
         /// <summary>
         /// An item group of regular expressions for content to exclude from the archive.
         /// </summary>
-        public ITaskItem[]? ExcludePatterns { get; set; } 
+        public ITaskItem[]? ExcludePatterns { get; set; }
 
         public bool IgnoreExitCode { get; set; }
 

test/Microsoft.NET.TestFramework/Commands/AddReferenceCommand.cs

@@ -17,7 +17,7 @@ public override CommandResult Execute(IEnumerable<string> args)
         {
             List<string> newArgs = new();
             newArgs.Add("add");
-            if (_projectName is not null && !string.IsNullOrEmpty(_projectName))
+            if (!string.IsNullOrEmpty(_projectName))
             {
                 newArgs.Add(_projectName);
             }

test/Microsoft.NET.TestFramework/Commands/DotnetPublishCommand.cs

@@ -16,7 +16,7 @@ public DotnetPublishCommand(ITestOutputHelper log, params string[] args) : base(
         protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
         {
             List<string> newArgs = new(args);
-            if (_runtime is not null && !string.IsNullOrEmpty(_runtime))
+            if (!string.IsNullOrEmpty(_runtime))
             {
                 newArgs.Add("-r");
                 newArgs.Add(_runtime);

test/Microsoft.NET.TestFramework/Commands/ListPackageCommand.cs

@@ -17,7 +17,7 @@ public override CommandResult Execute(IEnumerable<string> args)
         {
             List<string> newArgs = new();
             newArgs.Add("list");
-            if (_projectName is not null && !string.IsNullOrEmpty(_projectName))
+            if (!string.IsNullOrEmpty(_projectName))
             {
                 newArgs.Add(_projectName);
             }

test/Microsoft.NET.TestFramework/Commands/ListReferenceCommand.cs

@@ -17,7 +17,7 @@ public override CommandResult Execute(IEnumerable<string> args)
         {
             List<string> newArgs = new();
             newArgs.Add("list");
-            if (_projectName != null && !string.IsNullOrEmpty(_projectName))
+            if (!string.IsNullOrEmpty(_projectName))
             {
                 newArgs.Add(_projectName);
             }

test/Microsoft.NET.TestFramework/Commands/RemoveReferenceCommand.cs

@@ -17,7 +17,7 @@ public override CommandResult Execute(IEnumerable<string> args)
         {
             List<string> newArgs = new();
             newArgs.Add("remove");
-            if (_projectName is not null && !string.IsNullOrEmpty(_projectName))
+            if (!string.IsNullOrEmpty(_projectName))
             {
                 newArgs.Add(_projectName);
             }

test/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs

@@ -160,9 +160,10 @@ internal void Create(TestAsset targetTestAsset, string testProjectsSourceFolder,
             }
             var ns = projectXml.Root.Name.Namespace;
 
-            if (projectXml.Root.Attribute("Sdk") is not null && ProjectSdk != null)
+            var sdkAttribute = projectXml.Root.Attribute("Sdk");
+            if (sdkAttribute is not null && ProjectSdk != null)
             {
-                projectXml.Root.Attribute("Sdk")!.Value = ProjectSdk;
+                sdkAttribute.Value = ProjectSdk;
             }
 
             var propertyGroup = projectXml.Root?.Elements(ns + "PropertyGroup").First();

test/Microsoft.NET.TestFramework/TestAsset.cs

@@ -138,12 +138,13 @@ public TestAsset ReplacePackageVersionVariable(string targetName, string targetV
                     {
                         var packageReferencesToUpdate =
                             project.Root.Descendants(ns + PropertyName)
-                                .Where(p => p.Attribute("Version") != null && p.Attribute("Version")!.Value.Equals($"$({targetName})", StringComparison.OrdinalIgnoreCase));
-                        foreach (var packageReference in packageReferencesToUpdate)
+                                .Select(p => p.Attribute("Version"))
+                                .Where(va => va is not null && va.Value.Equals($"$({targetName})", StringComparison.OrdinalIgnoreCase));
+                        foreach (var versionAttribute in packageReferencesToUpdate)
                         {
-                            if(packageReference.Attribute("Version") is not null)
+                            if(versionAttribute is not null)
                             {
-                                packageReference.Attribute("Version")!.Value = targetValue;
+                                versionAttribute.Value = targetValue;
                             }
                         }
                     }

test/Microsoft.NET.TestFramework/TestAssetsManager.cs

@@ -110,7 +110,7 @@ public TestAsset CreateTestProjects(
 
             foreach (var testProject in testProjects)
             {
-                new DotnetCommand(Log, "sln", "add", testProject.Name?? string.Empty)
+                new DotnetCommand(Log, "sln", "add", testProject.Name ?? string.Empty)
                     .WithWorkingDirectory(testDestinationDirectory)
                     .Execute()
                     .Should()

test/Microsoft.NET.TestFramework/ToolsetInfo.cs

@@ -195,7 +195,7 @@ public void AddTestEnvironmentVariables(IDictionary<string, string> environment)
                 environment.Add("DOTNET_ROOT(x86)", DotNetRoot);
             }
 
-            if (CliHomePath is not null && !string.IsNullOrEmpty(CliHomePath))
+            if (!string.IsNullOrEmpty(CliHomePath))
             {
                 environment.Add("DOTNET_CLI_HOME", CliHomePath);
             }