Refactor code to remove '!' operators

Author: v-wuzhai

test/Common/Program.cs

@@ -10,7 +10,7 @@ partial class Program
     public static int Main(string[] args)
     {
         var testCommandLine = TestCommandLine.HandleCommandLine(args);
-        var newArgs = testCommandLine.RemainingArgs?.ToList()!;
+        List<string> newArgs = testCommandLine.RemainingArgs?.ToList() ?? new List<string>();
 
         // Help argument needs to be the first one to xunit, so don't insert assembly location in that case
         if (testCommandLine.ShouldShowHelp)

test/HelixTasks/CreateLocalHelixTestLayout.cs

@@ -15,11 +15,16 @@ public sealed class CreateLocalHelixTestLayout : Build.Utilities.Task
 
         public override bool Execute()
         {
-            foreach (var payload in HelixCorrelationPayload!)
+            if (HelixCorrelationPayload is null)
+            {
+                return false;
+            };
+
+            foreach (var payload in HelixCorrelationPayload)
             {
                 var copyfrom = new DirectoryInfo(payload.GetMetadata("PayloadDirectory"));
                 var relativeDestinationPathOnHelix = payload.GetMetadata("Destination");
-                var destination = new DirectoryInfo(Path.Combine(TestOutputDirectory!, relativeDestinationPathOnHelix));
+                var destination = new DirectoryInfo(Path.Combine(TestOutputDirectory ?? string.Empty, relativeDestinationPathOnHelix));
 
                 if (Directory.Exists(destination.FullName))
                 {

test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs

@@ -71,8 +71,13 @@ public override bool Execute()
         /// <returns></returns>
         private async Task ExecuteAsync()
         {
-            XUnitWorkItems = (await Task.WhenAll(XUnitProjects?.Select(PrepareWorkItem)!))
-                .SelectMany(i => i!)
+            if(XUnitProjects is null)
+            {
+                return;
+            }
+
+            XUnitWorkItems = (await Task.WhenAll(XUnitProjects.Select(PrepareWorkItem)))
+                .SelectMany(i => i ?? new())
                 .Where(wi => wi != null)
                 .ToArray();
             return;

test/HelixTasks/TarGzFileCreateFromDirectory.cs

@@ -69,7 +69,7 @@ protected override bool ValidateParameters()
                     retVal = false;
                 }
             }
-            if (SourceDirectory != null)
+            if (SourceDirectory is not null)
             {
                 SourceDirectory = Path.GetFullPath(SourceDirectory);
 
@@ -115,7 +115,7 @@ protected override string GenerateCommandLineCommands()
 
         private string GetSourceSpecification()
         {
-            if (IncludeBaseDirectory && SourceDirectory != null)
+            if (SourceDirectory is not null && IncludeBaseDirectory)
             {
                 var parentDirectory = Directory.GetParent(SourceDirectory)?.Parent?.FullName;
 

test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs

@@ -246,7 +246,7 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
         await registry.PushAsync(builtImage, sourceReference, destinationReference, cancellationToken: default).ConfigureAwait(false);
 
         // Build an application image on top of the rootless base runtime image.
-        DirectoryInfo newProjectDir = new(Path.Combine(TestSettings.TestArtifactsDirectory!, nameof(CreateNewImage_RootlessBaseImage)));
+        DirectoryInfo newProjectDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, nameof(CreateNewImage_RootlessBaseImage)));
 
         if (newProjectDir.Exists)
         {
@@ -307,7 +307,7 @@ private static (IBuildEngine buildEngine, List<string?> errors) SetupBuildEngine
         return (buildEngine, errors);
     }
 
-    private static string GetTestDirectoryName([CallerMemberName] string testName = "DefaultTest") => Path.Combine(TestSettings.TestArtifactsDirectory!, testName + "_" + DateTime.Now.ToString("yyyyMMddHHmmss"));
+    private static string GetTestDirectoryName([CallerMemberName] string testName = "DefaultTest") => Path.Combine(TestSettings.TestArtifactsDirectory, testName + "_" + DateTime.Now.ToString("yyyyMMddHHmmss"));
 
     private static string FormatBuildMessages(List<string?> messages) => string.Join("\r\n", messages);
 }

test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -153,7 +153,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
         BuiltImage builtImage = imageBuilder.Build();
 
         // Write the image to disk
-        var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory!,
+        var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory,
             nameof(ApiEndToEndWithArchiveWritingAndLoad), "app.tar.gz");
         var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9PreviewImageTag);
         var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), new[] { "latest", "1.0" });
@@ -178,7 +178,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
 
     private string BuildLocalApp([CallerMemberName] string testName = "TestName", string tfm = ToolsetInfo.CurrentTargetFramework, string rid = "linux-x64")
     {
-        string workingDirectory = Path.Combine(TestSettings.TestArtifactsDirectory!, testName);
+        string workingDirectory = Path.Combine(TestSettings.TestArtifactsDirectory, testName);
 
         DirectoryInfo d = new(Path.Combine(workingDirectory, "MinimalTestApp"));
         if (d.Exists)
@@ -213,7 +213,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
     public async Task EndToEnd_MultiProjectSolution()
     {
         ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
-        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory!, $"CreateNewImageTest_EndToEnd_MultiProjectSolution"));
+        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_EndToEnd_MultiProjectSolution"));
 
         if (newSolutionDir.Exists)
         {
@@ -298,8 +298,8 @@ public async Task EndToEnd_MultiProjectSolution()
     [InlineData("worker", true)]
     public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackageReference)
     {
-        DirectoryInfo newProjectDir = new(Path.Combine(TestSettings.TestArtifactsDirectory!, $"CreateNewImageTest_{projectType}_{addPackageReference}"));
-        DirectoryInfo privateNuGetAssets = new(Path.Combine(TestSettings.TestArtifactsDirectory!, "ContainerNuGet"));
+        DirectoryInfo newProjectDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_{projectType}_{addPackageReference}"));
+        DirectoryInfo privateNuGetAssets = new(Path.Combine(TestSettings.TestArtifactsDirectory, "ContainerNuGet"));
 
         if (newProjectDir.Exists)
         {
@@ -471,8 +471,8 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
     [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
     public void EndToEnd_NoAPI_Console()
     {
-        DirectoryInfo newProjectDir = new(Path.Combine(TestSettings.TestArtifactsDirectory!, "CreateNewImageTest"));
-        DirectoryInfo privateNuGetAssets = new(Path.Combine(TestSettings.TestArtifactsDirectory!, "ContainerNuGet"));
+        DirectoryInfo newProjectDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, "CreateNewImageTest"));
+        DirectoryInfo privateNuGetAssets = new(Path.Combine(TestSettings.TestArtifactsDirectory, "ContainerNuGet"));
 
         if (newProjectDir.Exists)
         {

test/Microsoft.NET.Build.Containers.IntegrationTests/PackageTests.cs

@@ -132,7 +132,7 @@ public void PackageContentTest()
         };
 
         (string? packageFilePath, string? packageVersion) = ToolsetUtils.GetContainersPackagePath();
-        using ZipArchive archive = new(File.OpenRead(packageFilePath), ZipArchiveMode.Read, false);
+        using ZipArchive archive = new(File.OpenRead(packageFilePath ?? string.Empty), ZipArchiveMode.Read, false);
 
         IEnumerable<string> actualEntries = archive.Entries
             .Select(e => e.FullName)

test/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs

@@ -27,7 +27,7 @@ private static string CombineFiles(string propsFile, string targetsFile)
         var combinedContent = new List<string>();
         combinedContent.AddRange(propsContent[..^1]);
         combinedContent.AddRange(targetsContent[1..]);
-        var tempTargetLocation = Path.Combine(TestSettings.TestArtifactsDirectory!, "Containers", "Microsoft.NET.Build.Containers.targets");
+        var tempTargetLocation = Path.Combine(TestSettings.TestArtifactsDirectory, "Containers", "Microsoft.NET.Build.Containers.targets");
         string? directoryName = Path.GetDirectoryName(tempTargetLocation);
         Assert.NotNull(directoryName);
         Directory.CreateDirectory(directoryName);

test/Microsoft.NET.Build.Containers.IntegrationTests/TestSettings.cs

@@ -13,7 +13,7 @@ internal static class TestSettings
     /// <summary>
     /// Gets temporary location for test artifacts.
     /// </summary>
-    internal static string? TestArtifactsDirectory
+    internal static string TestArtifactsDirectory
     {
         get
         {

test/Microsoft.NET.Build.Containers.IntegrationTests/ToolsetUtils.cs

@@ -20,18 +20,18 @@ internal static string GetRuntimeGraphFilePath()
     /// Gets path to built Microsoft.NET.Build.Containers.*.nupkg prepared for tests.
     /// </summary>
     /// <returns></returns>
-    internal static (string PackagePath, string PackageVersion) GetContainersPackagePath()
+    internal static (string? PackagePath, string? PackageVersion) GetContainersPackagePath()
     {
         string packageDir = Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "package");
 
         //until the package is stabilized, the package version matches TestContext.Current.ToolsetUnderTest.SdkVersion
         //after the package is stabilized, the package version doesn't have -prefix (-dev, -ci) anymore
         //so one of those is expected
-        string[] expectedPackageVersions = new[] { TestContext.Current.ToolsetUnderTest?.SdkVersion, TestContext.Current.ToolsetUnderTest?.SdkVersion?.Split('-')[0] }!;
+        string?[] expectedPackageVersions = new[] { TestContext.Current.ToolsetUnderTest?.SdkVersion, TestContext.Current.ToolsetUnderTest?.SdkVersion?.Split('-')[0] };
 
-        foreach (string expectedVersion in expectedPackageVersions)
+        foreach (string? expectedVersion in expectedPackageVersions)
         {
-            string fullFileName = Path.Combine(packageDir, $"Microsoft.NET.Build.Containers.{expectedVersion}.nupkg");
+            string? fullFileName = Path.Combine(packageDir, $"Microsoft.NET.Build.Containers.{expectedVersion}.nupkg");
             if (File.Exists(fullFileName))
             {
                 return (fullFileName, expectedVersion);