Instead of trying to delete the Zap directory use Zap1, Zap2, etc to …

…avoid reporting conflicts.

Lombiq.Tests.UI/Helpers/DirectoryHelper.cs

@@ -41,4 +41,23 @@ public static void SafelyDeleteDirectoryIfExists(string path, int maxTryCount =
             }
         }
     }
+
+    /// <summary>
+    /// Creates a directory with the given path and a numeric suffix from 1 to <see cref="int.MaxValue"/>. This means if
+    /// the <paramref name="path"/> is <c>c:\MyDirectory</c> then it will first attempt to create <c>c:\MyDirectory1</c>
+    /// but if that already exists it will try to create <c>c:\MyDirectory2</c> instead, and so on.
+    /// </summary>
+    /// <param name="path">The base path to use when constructing the final path.</param>
+    /// <returns>The final path created.</returns>
+    public static string CreateEnumeratedDirectory(string path)
+    {
+        for (var i = 1; i < int.MaxValue; i++)
+        {
+            var newPath = path + i.ToTechnicalString();
+            if (Directory.Exists(newPath)) continue;
+
+            Directory.CreateDirectory(newPath);
+            return newPath;
+        }
+    }
 }

Lombiq.Tests.UI/SecurityScanning/ZapManager.cs

@@ -69,32 +69,11 @@ public async Task<SecurityScanResult> RunSecurityScanAsync(
             automationFrameworkYamlPath = AutomationFrameworkPlanPaths.BaselinePlanPath;
         }
 
-        var mountedDirectoryPath = DirectoryPaths.GetTempSubDirectoryPath(context.Id, "Zap");
+        // Each attempt will have it's own "ZapN" directory inside the temp, starting with "Zap1".
+        var mountedDirectoryPath = DirectoryHelper.CreateEnumeratedDirectory(
+            DirectoryPaths.GetTempSubDirectoryPath(context.Id, "Zap"));
         var reportsDirectoryPath = Path.Combine(mountedDirectoryPath, _zapReportsDirectoryName);
 
-        // If there is already a Zap directory, delete it before recreating the necessary directory structure. This is
-        // only needed if a scan has already been executed once for the current context. Deleting the existing "Zap"
-        // directory ensures a clean slate.
-        if (Directory.Exists(mountedDirectoryPath))
-        {
-            var temporaryPath = $"{mountedDirectoryPath}-{Guid.NewGuid():N}";
-
-            // The directory is first renamed with a random suffix. This way even if the deletion is failed, the test
-            // should continue without problems. If this rename fails, that's fatal and should throw.
-            Directory.Move(mountedDirectoryPath, temporaryPath);
-
-            try
-            {
-                DirectoryHelper.SafelyDeleteDirectoryIfExists(temporaryPath);
-            }
-            catch (IOException exception)
-            {
-                _testOutputHelper.WriteLineTimestampedAndDebug(
-                    $"Failed to delete existing Zap directory ({exception.Message}). This is not a fatal error " +
-                    $"because the directory has already been renamed.");
-            }
-        }
-
         Directory.CreateDirectory(reportsDirectoryPath);
 
         // Giving write permission to all users to the reports folder. This is to avoid issues under GitHub-hosted