diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index addb9750..62ea8aaf 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -886,7 +886,7 @@ namespace WixToolset.Core | |||
| 886 | /// Parses an instance element. | 886 | /// Parses an instance element. |
| 887 | /// </summary> | 887 | /// </summary> |
| 888 | /// <param name="node">Element to parse.</param> | 888 | /// <param name="node">Element to parse.</param> |
| 889 | /// <param name="componentId">Identifier of instance property.</param> | 889 | /// <param name="propertyId">Identifier of instance property.</param> |
| 890 | private void ParseInstanceElement(XElement node, string propertyId) | 890 | private void ParseInstanceElement(XElement node, string propertyId) |
| 891 | { | 891 | { |
| 892 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 892 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -1641,6 +1641,7 @@ namespace WixToolset.Core | |||
| 1641 | /// Parses a product search element. | 1641 | /// Parses a product search element. |
| 1642 | /// </summary> | 1642 | /// </summary> |
| 1643 | /// <param name="node">Element to parse.</param> | 1643 | /// <param name="node">Element to parse.</param> |
| 1644 | /// <param name="propertyId"></param> | ||
| 1644 | /// <returns>Signature for search element.</returns> | 1645 | /// <returns>Signature for search element.</returns> |
| 1645 | private void ParseProductSearchElement(XElement node, string propertyId) | 1646 | private void ParseProductSearchElement(XElement node, string propertyId) |
| 1646 | { | 1647 | { |
| @@ -2570,6 +2571,8 @@ namespace WixToolset.Core | |||
| 2570 | /// Parses a component group element. | 2571 | /// Parses a component group element. |
| 2571 | /// </summary> | 2572 | /// </summary> |
| 2572 | /// <param name="node">Element to parse.</param> | 2573 | /// <param name="node">Element to parse.</param> |
| 2574 | /// <param name="parentType"></param> | ||
| 2575 | /// <param name="parentId"></param> | ||
| 2573 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | 2576 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] |
| 2574 | private void ParseComponentGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) | 2577 | private void ParseComponentGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) |
| 2575 | { | 2578 | { |
| @@ -5024,6 +5027,8 @@ namespace WixToolset.Core | |||
| 5024 | /// Parses a feature group element. | 5027 | /// Parses a feature group element. |
| 5025 | /// </summary> | 5028 | /// </summary> |
| 5026 | /// <param name="node">Element to parse.</param> | 5029 | /// <param name="node">Element to parse.</param> |
| 5030 | /// <param name="parentType"></param> | ||
| 5031 | /// <param name="parentId"></param> | ||
| 5027 | [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | 5032 | [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] |
| 5028 | private void ParseFeatureGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) | 5033 | private void ParseFeatureGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) |
| 5029 | { | 5034 | { |
| @@ -5477,6 +5482,7 @@ namespace WixToolset.Core | |||
| 5477 | /// <param name="sourcePath">Default source path of parent directory.</param> | 5482 | /// <param name="sourcePath">Default source path of parent directory.</param> |
| 5478 | /// <param name="possibleKeyPath">This will be set with the possible keyPath for the parent component.</param> | 5483 | /// <param name="possibleKeyPath">This will be set with the possible keyPath for the parent component.</param> |
| 5479 | /// <param name="win64Component">true if the component is 64-bit.</param> | 5484 | /// <param name="win64Component">true if the component is 64-bit.</param> |
| 5485 | /// <param name="componentGuid"></param> | ||
| 5480 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> | 5486 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> |
| 5481 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | 5487 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] |
| 5482 | private YesNoType ParseFileElement(XElement node, string componentId, string directoryId, int diskId, string sourcePath, out string possibleKeyPath, bool win64Component, string componentGuid) | 5488 | private YesNoType ParseFileElement(XElement node, string componentId, string directoryId, int diskId, string sourcePath, out string possibleKeyPath, bool win64Component, string componentGuid) |
| @@ -6934,7 +6940,7 @@ namespace WixToolset.Core | |||
| 6934 | /// Parses a MajorUpgrade element. | 6940 | /// Parses a MajorUpgrade element. |
| 6935 | /// </summary> | 6941 | /// </summary> |
| 6936 | /// <param name="node">The element to parse.</param> | 6942 | /// <param name="node">The element to parse.</param> |
| 6937 | /// <param name="parentElement">The parent element.</param> | 6943 | /// <param name="contextValues">The current context.</param> |
| 6938 | private void ParseMajorUpgradeElement(XElement node, IDictionary<string, string> contextValues) | 6944 | private void ParseMajorUpgradeElement(XElement node, IDictionary<string, string> contextValues) |
| 6939 | { | 6945 | { |
| 6940 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 6946 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
