@joebigelow / wix-1 / commits / 66b668b4

Add support for bundle extension searches. Add MissingBundleSearch error message. Add BundleExtensionRef to WixSearchTuple. Add BundleExtensionSearchTupleDefinitionTag.

Sean Hall committed Mar 26, 2020 at 19:26 UTC 66b668b4c5d37f572dfca86446f7dddc5dd3d85f

3 files changed +15

src/WixToolset.Data/Burn/BurnConstants.cs

@@ -9,6 +9,7 @@ namespace WixToolset.Data.Burn

9 public const string BundleLayoutOnlyPayloadsName = "BundleLayoutOnlyPayloads";

11 public const string BootstrapperApplicationDataTupleDefinitionTag = "WixBootstrapperApplicationData";

12 + public const string BundleExtensionSearchTupleDefinitionTag = "WixBundleExtensionSearch";

14 // The following constants must stay in sync with src\burn\engine\core.h

15 public const string BURN_BUNDLE_NAME = "WixBundleName";

src/WixToolset.Data/ErrorMessages.cs

@@ -1469,6 +1469,11 @@ namespace WixToolset.Data

1469 return Message(null, Ids.MissingBundleInformation, "The Bundle is missing '{0}' data, and cannot continue.", data);

1470 }

1471

1472 + public static Message MissingBundleSearch(SourceLineNumber sourceLineNumbers, string searchId)

1473 + {

1474 + return Message(sourceLineNumbers, Ids.MissingBundleSearch, "Bundle Search with id '{0}' has no corresponding implementation tuple.", searchId);

1475 + }

1476 +

1477 public static Message MissingDependencyVersion(string packageId)

1478 {

1479 return Message(null, Ids.MissingDependencyVersion, "The provider dependency version was not authored for the package with Id '{0}'. Please author the Provides/@Version attribute for this package.", packageId);

@@ -2658,6 +2663,7 @@ namespace WixToolset.Data

2663 CouldNotDetermineProductCodeFromTransformSummaryInfo = 394,

2664 IntermediatesMustBeCompiled = 395,

2665 IntermediatesMustBeResolved = 396,

2666 + MissingBundleSearch = 397,

2667 }

2668 }

2669 }

src/WixToolset.Data/Tuples/WixSearchTuple.cs

@@ -12,6 +12,7 @@ namespace WixToolset.Data

12 {

13 new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Variable), IntermediateFieldType.String),

14 new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Condition), IntermediateFieldType.String),

15 + new IntermediateFieldDefinition(nameof(WixSearchTupleFields.BundleExtensionRef), IntermediateFieldType.String),

16 },

17 typeof(WixSearchTuple));

18 }

@@ -23,6 +24,7 @@ namespace WixToolset.Data.Tuples

24 {

25 Variable,

26 Condition,

27 + BundleExtensionRef,

28 }

30 public class WixSearchTuple : IntermediateTuple

@@ -48,5 +50,11 @@ namespace WixToolset.Data.Tuples

50 get => (string)this.Fields[(int)WixSearchTupleFields.Condition];

51 set => this.Set((int)WixSearchTupleFields.Condition, value);

52 }

53 +

54 + public string BundleExtensionRef

55 + {

56 + get => (string)this.Fields[(int)WixSearchTupleFields.BundleExtensionRef];

57 + set => this.Set((int)WixSearchTupleFields.BundleExtensionRef, value);

58 + }

59 }

60 }

\ No newline at end of file