attempt to remove all entries if one fails, have test cleanup target potential leftover symlinks

Author: JohnMcPMS

src/AppInstallerCLICore/PortableInstaller.cpp

@@ -216,10 +216,27 @@ namespace AppInstaller::CLI::Portable
             {
                 PortableIndex existingIndex = PortableIndex::Open(existingIndexPath.u8string(), SQLiteStorageBase::OpenDisposition::ReadWrite);
 
+                std::exception_ptr firstRemoveException;
                 for (auto expectedEntry : m_expectedEntries)
                 {
-                    RemoveFile(expectedEntry);
-                    existingIndex.RemovePortableFile(expectedEntry);
+                    try
+                    {
+                        RemoveFile(expectedEntry);
+                        existingIndex.RemovePortableFile(expectedEntry);
+                    }
+                    catch (...)
+                    {
+                        // Capture first failure but continue so that all entries (especially symlinks)
+                        // are cleaned up, preventing cascade failures in shared state like PATH.
+                        if (!firstRemoveException)
+                        {
+                            firstRemoveException = std::current_exception();
+                        }
+                    }
+                }
+                if (firstRemoveException)
+                {
+                    std::rethrow_exception(firstRemoveException);
                 }
 
                 deleteIndex = existingIndex.IsEmpty();
@@ -233,9 +250,24 @@ namespace AppInstaller::CLI::Portable
         }
         else
         {
+            std::exception_ptr firstRemoveException;
             for (auto expectedEntry : m_expectedEntries)
             {
-                RemoveFile(expectedEntry);
+                try
+                {
+                    RemoveFile(expectedEntry);
+                }
+                catch (...)
+                {
+                    if (!firstRemoveException)
+                    {
+                        firstRemoveException = std::current_exception();
+                    }
+                }
+            }
+            if (firstRemoveException)
+            {
+                std::rethrow_exception(firstRemoveException);
             }
         }
 

src/AppInstallerCLIE2ETests/Helpers/TestCommon.cs

@@ -502,7 +502,16 @@ public static void VerifyPortablePackage(
             }
 
             // Always clean up as best effort.
-            RunAICLICommand("uninstall", $"--product-code {productCode} --force");
+            var cleanupResult = RunAICLICommand("uninstall", $"--product-code {productCode} --force");
+
+            // If the uninstall cleanup failed (e.g., the exe was still in use), manually remove the symlink
+            // to prevent cascade failures in other parallel tests that check the shared Links directory.
+            if (cleanupResult.ExitCode != 0 && File.Exists(symlinkPath))
+            {
+                TestContext.Out.WriteLine($"WARNING: Cleanup uninstall failed with exit code {cleanupResult.ExitCode}. Manually removing symlink to prevent cascade: {symlinkPath}");
+                try { File.Delete(symlinkPath); }
+                catch (Exception ex) { TestContext.Out.WriteLine($"WARNING: Failed to manually remove symlink: {ex.Message}"); }
+            }
 
             Assert.AreEqual(shouldExist, exeExists, $"Expected portable exe path: {exePath}");
             Assert.AreEqual(shouldExist && !installDirectoryAddedToPath, symlinkExists, $"Expected portable symlink path: {symlinkPath}");