diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler_Bundle.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler_Bundle.cs | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index 00f88c1f..0817aef3 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs | |||
| @@ -436,6 +436,7 @@ namespace WixToolset.Core | |||
| 436 | /// Parse a Container element. | 436 | /// Parse a Container element. |
| 437 | /// </summary> | 437 | /// </summary> |
| 438 | /// <param name="node">Element to parse</param> | 438 | /// <param name="node">Element to parse</param> |
| 439 | /// <param name="fileSystemSafeBundleName"></param> | ||
| 439 | private string ParseLogElement(XElement node, string fileSystemSafeBundleName) | 440 | private string ParseLogElement(XElement node, string fileSystemSafeBundleName) |
| 440 | { | 441 | { |
| 441 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 442 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -706,6 +707,8 @@ namespace WixToolset.Core | |||
| 706 | /// Parse the BoostrapperApplication element. | 707 | /// Parse the BoostrapperApplication element. |
| 707 | /// </summary> | 708 | /// </summary> |
| 708 | /// <param name="node">Element to parse</param> | 709 | /// <param name="node">Element to parse</param> |
| 710 | /// <param name="previousType"></param> | ||
| 711 | /// <param name="previousId"></param> | ||
| 709 | private Identifier ParseBootstrapperApplicationDllElement(XElement node, ComplexReferenceChildType previousType, Identifier previousId) | 712 | private Identifier ParseBootstrapperApplicationDllElement(XElement node, ComplexReferenceChildType previousType, Identifier previousId) |
| 710 | { | 713 | { |
| 711 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 714 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -1308,6 +1311,8 @@ namespace WixToolset.Core | |||
| 1308 | /// <param name="node">Element to parse</param> | 1311 | /// <param name="node">Element to parse</param> |
| 1309 | /// <param name="parentType">ComplexReferenceParentType of parent element. (BA or PayloadGroup)</param> | 1312 | /// <param name="parentType">ComplexReferenceParentType of parent element. (BA or PayloadGroup)</param> |
| 1310 | /// <param name="parentId">Identifier of parent element.</param> | 1313 | /// <param name="parentId">Identifier of parent element.</param> |
| 1314 | /// <param name="previousType"></param> | ||
| 1315 | /// <param name="previousId"></param> | ||
| 1311 | private Identifier ParsePayloadElement(XElement node, ComplexReferenceParentType parentType, Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId) | 1316 | private Identifier ParsePayloadElement(XElement node, ComplexReferenceParentType parentType, Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId) |
| 1312 | { | 1317 | { |
| 1313 | Debug.Assert(ComplexReferenceParentType.PayloadGroup == parentType || ComplexReferenceParentType.Package == parentType || ComplexReferenceParentType.Container == parentType); | 1318 | Debug.Assert(ComplexReferenceParentType.PayloadGroup == parentType || ComplexReferenceParentType.Package == parentType || ComplexReferenceParentType.Container == parentType); |
| @@ -1345,6 +1350,10 @@ namespace WixToolset.Core | |||
| 1345 | /// <param name="node">Element to parse</param> | 1350 | /// <param name="node">Element to parse</param> |
| 1346 | /// <param name="parentType">ComplexReferenceParentType of parent element.</param> | 1351 | /// <param name="parentType">ComplexReferenceParentType of parent element.</param> |
| 1347 | /// <param name="parentId">Identifier of parent element.</param> | 1352 | /// <param name="parentId">Identifier of parent element.</param> |
| 1353 | /// <param name="previousType"></param> | ||
| 1354 | /// <param name="previousId"></param> | ||
| 1355 | /// <param name="required"></param> | ||
| 1356 | /// <param name="id"></param> | ||
| 1348 | /// <returns>Whether SourceFile was specified.</returns> | 1357 | /// <returns>Whether SourceFile was specified.</returns> |
| 1349 | private bool ParsePayloadElementContent(XElement node, ComplexReferenceParentType parentType, Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId, bool required, out Identifier id) | 1358 | private bool ParsePayloadElementContent(XElement node, ComplexReferenceParentType parentType, Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId, bool required, out Identifier id) |
| 1350 | { | 1359 | { |
| @@ -1519,9 +1528,21 @@ namespace WixToolset.Core | |||
| 1519 | /// <summary> | 1528 | /// <summary> |
| 1520 | /// Creates the row for a Payload. | 1529 | /// Creates the row for a Payload. |
| 1521 | /// </summary> | 1530 | /// </summary> |
| 1522 | /// <param name="node">Element to parse</param> | 1531 | /// <param name="sourceLineNumbers"></param> |
| 1532 | /// <param name="id"></param> | ||
| 1533 | /// <param name="name"></param> | ||
| 1534 | /// <param name="sourceFile"></param> | ||
| 1535 | /// <param name="downloadUrl"></param> | ||
| 1523 | /// <param name="parentType">ComplexReferenceParentType of parent element</param> | 1536 | /// <param name="parentType">ComplexReferenceParentType of parent element</param> |
| 1524 | /// <param name="parentId">Identifier of parent element.</param> | 1537 | /// <param name="parentId">Identifier of parent element.</param> |
| 1538 | /// <param name="previousType"></param> | ||
| 1539 | /// <param name="previousId"></param> | ||
| 1540 | /// <param name="compressed"></param> | ||
| 1541 | /// <param name="enableSignatureVerification"></param> | ||
| 1542 | /// <param name="displayName"></param> | ||
| 1543 | /// <param name="description"></param> | ||
| 1544 | /// <param name="remotePayload"></param> | ||
| 1545 | /// <returns></returns> | ||
| 1525 | private WixBundlePayloadSymbol CreatePayloadRow(SourceLineNumber sourceLineNumbers, Identifier id, string name, string sourceFile, string downloadUrl, ComplexReferenceParentType parentType, | 1546 | private WixBundlePayloadSymbol CreatePayloadRow(SourceLineNumber sourceLineNumbers, Identifier id, string name, string sourceFile, string downloadUrl, ComplexReferenceParentType parentType, |
| 1526 | Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId, YesNoDefaultType compressed, YesNoType enableSignatureVerification, string displayName, string description, | 1547 | Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId, YesNoDefaultType compressed, YesNoType enableSignatureVerification, string displayName, string description, |
| 1527 | RemotePayload remotePayload) | 1548 | RemotePayload remotePayload) |
| @@ -1640,6 +1661,8 @@ namespace WixToolset.Core | |||
| 1640 | /// <param name="node">Element to parse.</param> | 1661 | /// <param name="node">Element to parse.</param> |
| 1641 | /// <param name="parentType">ComplexReferenceParentType of parent element (BA or PayloadGroup).</param> | 1662 | /// <param name="parentType">ComplexReferenceParentType of parent element (BA or PayloadGroup).</param> |
| 1642 | /// <param name="parentId">Identifier of parent element.</param> | 1663 | /// <param name="parentId">Identifier of parent element.</param> |
| 1664 | /// <param name="previousType"></param> | ||
| 1665 | /// <param name="previousId"></param> | ||
| 1643 | private Identifier ParsePayloadGroupRefElement(XElement node, ComplexReferenceParentType parentType, Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId) | 1666 | private Identifier ParsePayloadGroupRefElement(XElement node, ComplexReferenceParentType parentType, Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId) |
| 1644 | { | 1667 | { |
| 1645 | Debug.Assert(ComplexReferenceParentType.Layout == parentType || ComplexReferenceParentType.PayloadGroup == parentType || ComplexReferenceParentType.Package == parentType || ComplexReferenceParentType.Container == parentType); | 1668 | Debug.Assert(ComplexReferenceParentType.Layout == parentType || ComplexReferenceParentType.PayloadGroup == parentType || ComplexReferenceParentType.Package == parentType || ComplexReferenceParentType.Container == parentType); |
| @@ -2513,6 +2536,7 @@ namespace WixToolset.Core | |||
| 2513 | /// Parse CommandLine element. | 2536 | /// Parse CommandLine element. |
| 2514 | /// </summary> | 2537 | /// </summary> |
| 2515 | /// <param name="node">Element to parse</param> | 2538 | /// <param name="node">Element to parse</param> |
| 2539 | /// <param name="packageId">Parent packageId</param> | ||
| 2516 | private void ParseCommandLineElement(XElement node, string packageId) | 2540 | private void ParseCommandLineElement(XElement node, string packageId) |
| 2517 | { | 2541 | { |
| 2518 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 2542 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -2661,7 +2685,7 @@ namespace WixToolset.Core | |||
| 2661 | /// <param name="node">Element to parse.</param> | 2685 | /// <param name="node">Element to parse.</param> |
| 2662 | /// <param name="parentType">ComplexReferenceParentType of parent element (Unknown or PackageGroup).</param> | 2686 | /// <param name="parentType">ComplexReferenceParentType of parent element (Unknown or PackageGroup).</param> |
| 2663 | /// <param name="parentId">Identifier of parent element.</param> | 2687 | /// <param name="parentId">Identifier of parent element.</param> |
| 2664 | /// <returns>Identifier for package group element.</rereturns> | 2688 | /// <returns>Identifier for package group element.</returns> |
| 2665 | private string ParsePackageGroupRefElement(XElement node, ComplexReferenceParentType parentType, string parentId) | 2689 | private string ParsePackageGroupRefElement(XElement node, ComplexReferenceParentType parentType, string parentId) |
| 2666 | { | 2690 | { |
| 2667 | return this.ParsePackageGroupRefElement(node, parentType, parentId, ComplexReferenceChildType.Unknown, null); | 2691 | return this.ParsePackageGroupRefElement(node, parentType, parentId, ComplexReferenceChildType.Unknown, null); |
| @@ -2673,9 +2697,9 @@ namespace WixToolset.Core | |||
| 2673 | /// <param name="node">Element to parse.</param> | 2697 | /// <param name="node">Element to parse.</param> |
| 2674 | /// <param name="parentType">ComplexReferenceParentType of parent element (Unknown or PackageGroup).</param> | 2698 | /// <param name="parentType">ComplexReferenceParentType of parent element (Unknown or PackageGroup).</param> |
| 2675 | /// <param name="parentId">Identifier of parent element.</param> | 2699 | /// <param name="parentId">Identifier of parent element.</param> |
| 2676 | /// <param name="parentType">ComplexReferenceParentType of previous element (Unknown, Package, or PackageGroup).</param> | 2700 | /// <param name="previousType"></param> |
| 2677 | /// <param name="parentId">Identifier of parent element.</param> | 2701 | /// <param name="previousId"></param> |
| 2678 | /// <returns>Identifier for package group element.</rereturns> | 2702 | /// <returns>Identifier for package group element.</returns> |
| 2679 | private string ParsePackageGroupRefElement(XElement node, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType previousType, string previousId) | 2703 | private string ParsePackageGroupRefElement(XElement node, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType previousType, string previousId) |
| 2680 | { | 2704 | { |
| 2681 | Debug.Assert(ComplexReferenceParentType.Unknown == parentType || ComplexReferenceParentType.PackageGroup == parentType || ComplexReferenceParentType.Container == parentType); | 2705 | Debug.Assert(ComplexReferenceParentType.Unknown == parentType || ComplexReferenceParentType.PackageGroup == parentType || ComplexReferenceParentType.Container == parentType); |
| @@ -2740,6 +2764,7 @@ namespace WixToolset.Core | |||
| 2740 | /// <param name="sourceLineNumbers">Source line numbers.</param> | 2764 | /// <param name="sourceLineNumbers">Source line numbers.</param> |
| 2741 | /// <param name="id">Identifier for the rollback boundary.</param> | 2765 | /// <param name="id">Identifier for the rollback boundary.</param> |
| 2742 | /// <param name="vital">Indicates whether the rollback boundary is vital or not.</param> | 2766 | /// <param name="vital">Indicates whether the rollback boundary is vital or not.</param> |
| 2767 | /// <param name="transaction">Indicates whether the rollback boundary will use an MSI transaction.</param> | ||
| 2743 | /// <param name="parentType">Type of parent group.</param> | 2768 | /// <param name="parentType">Type of parent group.</param> |
| 2744 | /// <param name="parentId">Identifier of parent group.</param> | 2769 | /// <param name="parentId">Identifier of parent group.</param> |
| 2745 | /// <param name="previousType">Type of previous item, if any.</param> | 2770 | /// <param name="previousType">Type of previous item, if any.</param> |
