Undo RepairCondition until a more complete design is done
Rob Mensching committed
Apr 20, 2021 at 02:25 UTC
aee568fddd21fe0fc270f7e705dc7b9e834d9ff4
2 files changed
-21
src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
-13
@@ -393,10 +393,6 @@ namespace WixToolset.Core.Burn.Bundles
393
writer.WriteAttributeString("InstallArguments", exePackage.InstallCommand);
394
writer.WriteAttributeString("UninstallArguments", exePackage.UninstallCommand);
395
writer.WriteAttributeString("RepairArguments", exePackage.RepairCommand);
396
- if (!String.IsNullOrEmpty(exePackage.RepairCondition))
397
- {
398
- writer.WriteAttributeString("RepairCondition", exePackage.RepairCondition);
399
- }
396
writer.WriteAttributeString("Repairable", exePackage.Repairable ? "yes" : "no");
397
if (!String.IsNullOrEmpty(exePackage.ExeProtocol))
398
{
@@ -408,10 +404,6 @@ namespace WixToolset.Core.Burn.Bundles
404
writer.WriteAttributeString("ProductCode", msiPackage.ProductCode);
405
writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture));
406
writer.WriteAttributeString("Version", msiPackage.ProductVersion);
411
- if (!String.IsNullOrEmpty(msiPackage.RepairCondition))
412
- {
413
- writer.WriteAttributeString("RepairCondition", msiPackage.RepairCondition);
414
- }
407
if (!String.IsNullOrEmpty(msiPackage.UpgradeCode))
408
{
409
writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode);
@@ -422,11 +414,6 @@ namespace WixToolset.Core.Burn.Bundles
414
writer.WriteAttributeString("PatchCode", mspPackage.PatchCode);
415
writer.WriteAttributeString("PatchXml", mspPackage.PatchXml);
416
425
- if (!String.IsNullOrEmpty(mspPackage.RepairCondition))
426
- {
427
- writer.WriteAttributeString("RepairCondition", mspPackage.RepairCondition);
428
- }
429
-
417
// If there is still a chance that all of our patches will target a narrow set of
418
// product codes, add the patch list to the overall list.
419
if (null != targetCodes)
src/WixToolset.Core/Compiler_Bundle.cs
-8
@@ -1974,7 +1974,6 @@ namespace WixToolset.Core
1974
var perMachine = YesNoDefaultType.NotSet;
1975
string detectCondition = null;
1976
string protocol = null;
1977
- string repairCondition = null;
1977
var installSize = CompilerConstants.IntegerNotSet;
1978
string msuKB = null;
1979
var enableFeatureSelection = YesNoType.NotSet;
@@ -2094,10 +2093,6 @@ namespace WixToolset.Core
2093
protocol = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
2094
allowed = (packageType == WixBundlePackageType.Exe);
2095
break;
2097
- case "RepairCondition":
2098
- repairCondition = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty);
2099
- allowed = (packageType == WixBundlePackageType.Exe || packageType == WixBundlePackageType.Msi || packageType == WixBundlePackageType.Msp);
2100
- break;
2096
case "InstallSize":
2097
installSize = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue);
2098
break;
@@ -2345,7 +2340,6 @@ namespace WixToolset.Core
2340
InstallCommand = installArguments,
2341
RepairCommand = repairArguments,
2342
UninstallCommand = uninstallArguments,
2348
- RepairCondition = repairCondition,
2343
ExeProtocol = protocol
2344
});
2345
break;
@@ -2357,7 +2351,6 @@ namespace WixToolset.Core
2351
2352
this.Core.AddSymbol(new WixBundleMsiPackageSymbol(sourceLineNumbers, id)
2353
{
2360
- RepairCondition = repairCondition,
2354
Attributes = msiAttributes
2355
});
2356
break;
@@ -2368,7 +2361,6 @@ namespace WixToolset.Core
2361
2362
this.Core.AddSymbol(new WixBundleMspPackageSymbol(sourceLineNumbers, id)
2363
{
2371
- RepairCondition = repairCondition,
2364
Attributes = mspAttributes
2365
});
2366
break;