Support deleting orphan products

nirbar · Dec 22, 2022 · 7e33e35 · 7e33e35
1 parent e3c6a71
commit 7e33e35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/MsiZapEx/Program.cs b/MsiZapEx/Program.cs
@@ -141,9 +141,16 @@ static void Main(string[] args)
                 {
                     List<ProductInfo> orphan = ProductInfo.GetOrphanProducts();
                     Console.WriteLine($"{orphan.Count} orphan product(s) detected");
-                    foreach (ProductInfo pi in orphan)
+                    using (RegistryModifier modifier = new RegistryModifier())
                     {
-                        pi.PrintState();
+                        foreach (ProductInfo pi in orphan)
+                        {
+                            pi.PrintState();
+                            if (Settings.Instance.ForceCleanAllRelated)
+                            {
+                                pi.Prune(modifier);
+                            }
+                        }
                     }
                 }
             }

diff --git a/MsiZapEx/Settings.cs b/MsiZapEx/Settings.cs
@@ -27,7 +27,7 @@ public class Settings
         [Option("delete", Required = false, HelpText = "Forcibly remove product's Windows Installer entries from the registry")]
         public bool ForceClean { get; set; }
 
-        [Option("delete-all-related", Required = false, HelpText = "When used with --upgrade-code or --bundle-upgrade-code, deletes Windows Installer and WiX entries for all related products")]
+        [Option("delete-all-related", Required = false, HelpText = "When used with --upgrade-code or --bundle-upgrade-code, deletes Windows Installer and WiX entries for all related products. When used with --detect-orphan-products, deletes registration for all orphan products")]
         public bool ForceCleanAllRelated { get; set; }
 
         [Option("dry-run", Required = false, HelpText = "Do not delete Windows Installer entries. Instead, print anything that would have been deleted")]

diff --git a/TidyBuild.custom.props b/TidyBuild.custom.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <Import Project="$(SolutionDir)TidyBuild.user.props" Condition="Exists('$(SolutionDir)TidyBuild.user.props')" />
   <PropertyGroup>
-    <FullVersion Condition="'$(FullVersion)'==''">0.0.9</FullVersion>
+    <FullVersion Condition="'$(FullVersion)'==''">0.0.10</FullVersion>
     <DefineConstants Condition="'$(MSBuildProjectExtension)'=='.wixproj'">FullVersion=$(FullVersion);$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 </Project>