aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_Dependency.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Compiler_Dependency.cs')
-rw-r--r--src/WixToolset.Core/Compiler_Dependency.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/WixToolset.Core/Compiler_Dependency.cs b/src/WixToolset.Core/Compiler_Dependency.cs
index 6825711f..7c863883 100644
--- a/src/WixToolset.Core/Compiler_Dependency.cs
+++ b/src/WixToolset.Core/Compiler_Dependency.cs
@@ -167,7 +167,7 @@ namespace WixToolset.Core
167 switch (child.Name.LocalName) 167 switch (child.Name.LocalName)
168 { 168 {
169 case "Requires": 169 case "Requires":
170 this.ParseRequiresElement(child, id.Id, requiresAction: !packageType.HasValue); 170 this.ParseRequiresElement(child, id.Id);
171 break; 171 break;
172 case "RequiresRef": 172 case "RequiresRef":
173 this.ParseRequiresRefElement(child, id.Id, requiresAction: !packageType.HasValue); 173 this.ParseRequiresRefElement(child, id.Id, requiresAction: !packageType.HasValue);
@@ -229,8 +229,7 @@ namespace WixToolset.Core
229 /// </summary> 229 /// </summary>
230 /// <param name="node">The XML node for the Requires element.</param> 230 /// <param name="node">The XML node for the Requires element.</param>
231 /// <param name="providerId">The parent provider identifier.</param> 231 /// <param name="providerId">The parent provider identifier.</param>
232 /// <param name="requiresAction">Whether the Requires custom action should be referenced.</param> 232 private void ParseRequiresElement(XElement node, string providerId)
233 private void ParseRequiresElement(XElement node, string providerId, bool requiresAction)
234 { 233 {
235 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); 234 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
236 Identifier id = null; 235 Identifier id = null;
@@ -310,7 +309,7 @@ namespace WixToolset.Core
310 309
311 if (!this.Messaging.EncounteredError) 310 if (!this.Messaging.EncounteredError)
312 { 311 {
313 var symbol = this.Core.AddSymbol(new WixDependencySymbol(sourceLineNumbers, id) 312 this.Core.AddSymbol(new WixDependencySymbol(sourceLineNumbers, id)
314 { 313 {
315 ProviderKey = providerKey, 314 ProviderKey = providerKey,
316 MinVersion = minVersion, 315 MinVersion = minVersion,