aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-20 02:25:35 -0700
committerRob Mensching <rob@firegiant.com>2021-04-20 02:29:56 -0700
commitaee568fddd21fe0fc270f7e705dc7b9e834d9ff4 (patch)
tree1b02436e1895e6c86cdedaa3747a85118af6bc19
parente87091209c6155c0d326c29bafe8a35356d8031a (diff)
downloadwix-aee568fddd21fe0fc270f7e705dc7b9e834d9ff4.tar.gz
wix-aee568fddd21fe0fc270f7e705dc7b9e834d9ff4.tar.bz2
wix-aee568fddd21fe0fc270f7e705dc7b9e834d9ff4.zip
Undo RepairCondition until a more complete design is done
-rw-r--r--src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs13
-rw-r--r--src/WixToolset.Core/Compiler_Bundle.cs8
2 files changed, 0 insertions, 21 deletions
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index a8a12c28..db09b540 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -393,10 +393,6 @@ namespace WixToolset.Core.Burn.Bundles
393 writer.WriteAttributeString("InstallArguments", exePackage.InstallCommand); 393 writer.WriteAttributeString("InstallArguments", exePackage.InstallCommand);
394 writer.WriteAttributeString("UninstallArguments", exePackage.UninstallCommand); 394 writer.WriteAttributeString("UninstallArguments", exePackage.UninstallCommand);
395 writer.WriteAttributeString("RepairArguments", exePackage.RepairCommand); 395 writer.WriteAttributeString("RepairArguments", exePackage.RepairCommand);
396 if (!String.IsNullOrEmpty(exePackage.RepairCondition))
397 {
398 writer.WriteAttributeString("RepairCondition", exePackage.RepairCondition);
399 }
400 writer.WriteAttributeString("Repairable", exePackage.Repairable ? "yes" : "no"); 396 writer.WriteAttributeString("Repairable", exePackage.Repairable ? "yes" : "no");
401 if (!String.IsNullOrEmpty(exePackage.ExeProtocol)) 397 if (!String.IsNullOrEmpty(exePackage.ExeProtocol))
402 { 398 {
@@ -408,10 +404,6 @@ namespace WixToolset.Core.Burn.Bundles
408 writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); 404 writer.WriteAttributeString("ProductCode", msiPackage.ProductCode);
409 writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture)); 405 writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture));
410 writer.WriteAttributeString("Version", msiPackage.ProductVersion); 406 writer.WriteAttributeString("Version", msiPackage.ProductVersion);
411 if (!String.IsNullOrEmpty(msiPackage.RepairCondition))
412 {
413 writer.WriteAttributeString("RepairCondition", msiPackage.RepairCondition);
414 }
415 if (!String.IsNullOrEmpty(msiPackage.UpgradeCode)) 407 if (!String.IsNullOrEmpty(msiPackage.UpgradeCode))
416 { 408 {
417 writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode); 409 writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode);
@@ -422,11 +414,6 @@ namespace WixToolset.Core.Burn.Bundles
422 writer.WriteAttributeString("PatchCode", mspPackage.PatchCode); 414 writer.WriteAttributeString("PatchCode", mspPackage.PatchCode);
423 writer.WriteAttributeString("PatchXml", mspPackage.PatchXml); 415 writer.WriteAttributeString("PatchXml", mspPackage.PatchXml);
424 416
425 if (!String.IsNullOrEmpty(mspPackage.RepairCondition))
426 {
427 writer.WriteAttributeString("RepairCondition", mspPackage.RepairCondition);
428 }
429
430 // If there is still a chance that all of our patches will target a narrow set of 417 // If there is still a chance that all of our patches will target a narrow set of
431 // product codes, add the patch list to the overall list. 418 // product codes, add the patch list to the overall list.
432 if (null != targetCodes) 419 if (null != targetCodes)
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index d6e9e7af..779ad376 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -1974,7 +1974,6 @@ namespace WixToolset.Core
1974 var perMachine = YesNoDefaultType.NotSet; 1974 var perMachine = YesNoDefaultType.NotSet;
1975 string detectCondition = null; 1975 string detectCondition = null;
1976 string protocol = null; 1976 string protocol = null;
1977 string repairCondition = null;
1978 var installSize = CompilerConstants.IntegerNotSet; 1977 var installSize = CompilerConstants.IntegerNotSet;
1979 string msuKB = null; 1978 string msuKB = null;
1980 var enableFeatureSelection = YesNoType.NotSet; 1979 var enableFeatureSelection = YesNoType.NotSet;
@@ -2094,10 +2093,6 @@ namespace WixToolset.Core
2094 protocol = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 2093 protocol = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
2095 allowed = (packageType == WixBundlePackageType.Exe); 2094 allowed = (packageType == WixBundlePackageType.Exe);
2096 break; 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;
2101 case "InstallSize": 2096 case "InstallSize":
2102 installSize = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); 2097 installSize = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue);
2103 break; 2098 break;
@@ -2345,7 +2340,6 @@ namespace WixToolset.Core
2345 InstallCommand = installArguments, 2340 InstallCommand = installArguments,
2346 RepairCommand = repairArguments, 2341 RepairCommand = repairArguments,
2347 UninstallCommand = uninstallArguments, 2342 UninstallCommand = uninstallArguments,
2348 RepairCondition = repairCondition,
2349 ExeProtocol = protocol 2343 ExeProtocol = protocol
2350 }); 2344 });
2351 break; 2345 break;
@@ -2357,7 +2351,6 @@ namespace WixToolset.Core
2357 2351
2358 this.Core.AddSymbol(new WixBundleMsiPackageSymbol(sourceLineNumbers, id) 2352 this.Core.AddSymbol(new WixBundleMsiPackageSymbol(sourceLineNumbers, id)
2359 { 2353 {
2360 RepairCondition = repairCondition,
2361 Attributes = msiAttributes 2354 Attributes = msiAttributes
2362 }); 2355 });
2363 break; 2356 break;
@@ -2368,7 +2361,6 @@ namespace WixToolset.Core
2368 2361
2369 this.Core.AddSymbol(new WixBundleMspPackageSymbol(sourceLineNumbers, id) 2362 this.Core.AddSymbol(new WixBundleMspPackageSymbol(sourceLineNumbers, id)
2370 { 2363 {
2371 RepairCondition = repairCondition,
2372 Attributes = mspAttributes 2364 Attributes = mspAttributes
2373 }); 2365 });
2374 break; 2366 break;