From d77302d94b356a1db2b2b834e45c8962381eae6b Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 10 Apr 2021 15:24:33 -0700 Subject: Add support for RepairCondition on Exe, Msi and Msp packages --- src/WixToolset.Core/Compiler_Bundle.cs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/WixToolset.Core/Compiler_Bundle.cs') diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index 779ad376..d6e9e7af 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs @@ -1974,6 +1974,7 @@ namespace WixToolset.Core var perMachine = YesNoDefaultType.NotSet; string detectCondition = null; string protocol = null; + string repairCondition = null; var installSize = CompilerConstants.IntegerNotSet; string msuKB = null; var enableFeatureSelection = YesNoType.NotSet; @@ -2093,6 +2094,10 @@ namespace WixToolset.Core protocol = this.Core.GetAttributeValue(sourceLineNumbers, attrib); allowed = (packageType == WixBundlePackageType.Exe); break; + case "RepairCondition": + repairCondition = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); + allowed = (packageType == WixBundlePackageType.Exe || packageType == WixBundlePackageType.Msi || packageType == WixBundlePackageType.Msp); + break; case "InstallSize": installSize = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); break; @@ -2340,6 +2345,7 @@ namespace WixToolset.Core InstallCommand = installArguments, RepairCommand = repairArguments, UninstallCommand = uninstallArguments, + RepairCondition = repairCondition, ExeProtocol = protocol }); break; @@ -2351,6 +2357,7 @@ namespace WixToolset.Core this.Core.AddSymbol(new WixBundleMsiPackageSymbol(sourceLineNumbers, id) { + RepairCondition = repairCondition, Attributes = msiAttributes }); break; @@ -2361,6 +2368,7 @@ namespace WixToolset.Core this.Core.AddSymbol(new WixBundleMspPackageSymbol(sourceLineNumbers, id) { + RepairCondition = repairCondition, Attributes = mspAttributes }); break; -- cgit v1.2.3-55-g6feb