diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-10 15:24:33 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-12 10:24:01 -0700 |
| commit | d77302d94b356a1db2b2b834e45c8962381eae6b (patch) | |
| tree | af44629cacb074bafb7b561e2e0db9d45a6a1727 /src/WixToolset.Core.Burn | |
| parent | 3441afb46c4dc056493ab84f9b27434c4185d713 (diff) | |
| download | wix-d77302d94b356a1db2b2b834e45c8962381eae6b.tar.gz wix-d77302d94b356a1db2b2b834e45c8962381eae6b.tar.bz2 wix-d77302d94b356a1db2b2b834e45c8962381eae6b.zip | |
Add support for RepairCondition on Exe, Msi and Msp packages
Diffstat (limited to 'src/WixToolset.Core.Burn')
| -rw-r--r-- | src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs index fa44a8e3..128c7a5f 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs | |||
| @@ -399,6 +399,10 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 399 | writer.WriteAttributeString("InstallArguments", exePackage.InstallCommand); | 399 | writer.WriteAttributeString("InstallArguments", exePackage.InstallCommand); |
| 400 | writer.WriteAttributeString("UninstallArguments", exePackage.UninstallCommand); | 400 | writer.WriteAttributeString("UninstallArguments", exePackage.UninstallCommand); |
| 401 | writer.WriteAttributeString("RepairArguments", exePackage.RepairCommand); | 401 | writer.WriteAttributeString("RepairArguments", exePackage.RepairCommand); |
| 402 | if (!String.IsNullOrEmpty(exePackage.RepairCondition)) | ||
| 403 | { | ||
| 404 | writer.WriteAttributeString("RepairCondition", exePackage.RepairCondition); | ||
| 405 | } | ||
| 402 | writer.WriteAttributeString("Repairable", exePackage.Repairable ? "yes" : "no"); | 406 | writer.WriteAttributeString("Repairable", exePackage.Repairable ? "yes" : "no"); |
| 403 | if (!String.IsNullOrEmpty(exePackage.ExeProtocol)) | 407 | if (!String.IsNullOrEmpty(exePackage.ExeProtocol)) |
| 404 | { | 408 | { |
| @@ -410,6 +414,10 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 410 | writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); | 414 | writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); |
| 411 | writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture)); | 415 | writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture)); |
| 412 | writer.WriteAttributeString("Version", msiPackage.ProductVersion); | 416 | writer.WriteAttributeString("Version", msiPackage.ProductVersion); |
| 417 | if (!String.IsNullOrEmpty(msiPackage.RepairCondition)) | ||
| 418 | { | ||
| 419 | writer.WriteAttributeString("RepairCondition", msiPackage.RepairCondition); | ||
| 420 | } | ||
| 413 | if (!String.IsNullOrEmpty(msiPackage.UpgradeCode)) | 421 | if (!String.IsNullOrEmpty(msiPackage.UpgradeCode)) |
| 414 | { | 422 | { |
| 415 | writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode); | 423 | writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode); |
| @@ -420,6 +428,11 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 420 | writer.WriteAttributeString("PatchCode", mspPackage.PatchCode); | 428 | writer.WriteAttributeString("PatchCode", mspPackage.PatchCode); |
| 421 | writer.WriteAttributeString("PatchXml", mspPackage.PatchXml); | 429 | writer.WriteAttributeString("PatchXml", mspPackage.PatchXml); |
| 422 | 430 | ||
| 431 | if (!String.IsNullOrEmpty(mspPackage.RepairCondition)) | ||
| 432 | { | ||
| 433 | writer.WriteAttributeString("RepairCondition", mspPackage.RepairCondition); | ||
| 434 | } | ||
| 435 | |||
| 423 | // If there is still a chance that all of our patches will target a narrow set of | 436 | // If there is still a chance that all of our patches will target a narrow set of |
| 424 | // product codes, add the patch list to the overall list. | 437 | // product codes, add the patch list to the overall list. |
| 425 | if (null != targetCodes) | 438 | if (null != targetCodes) |
