From 67bcf306aa020c5480b6dd28eab5db3d49264585 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Mar 2021 22:14:44 -0700 Subject: Remove unused values --- src/WixToolset.Core/Compiler.cs | 2 +- src/WixToolset.Core/Compiler_Bundle.cs | 2 +- src/WixToolset.Core/Compiler_Dependency.cs | 7 +++---- src/WixToolset.Core/Compiler_Module.cs | 2 +- src/WixToolset.Core/Compiler_Package.cs | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index d751dde0..c2783481 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -6298,7 +6298,7 @@ namespace WixToolset.Core this.ParseRelatedBundleElement(child); break; case "Requires": - this.ParseRequiresElement(child, null, false); + this.ParseRequiresElement(child, null); break; case "SetDirectory": this.ParseSetDirectoryElement(child); diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index 1c79a11b..7e07532e 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs @@ -354,7 +354,7 @@ namespace WixToolset.Core this.ParseRelatedBundleElement(child); break; case "Requires": - this.ParseRequiresElement(child, null, false); + this.ParseRequiresElement(child, null); break; case "SetVariable": this.ParseSetVariableElement(child); 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 switch (child.Name.LocalName) { case "Requires": - this.ParseRequiresElement(child, id.Id, requiresAction: !packageType.HasValue); + this.ParseRequiresElement(child, id.Id); break; case "RequiresRef": this.ParseRequiresRefElement(child, id.Id, requiresAction: !packageType.HasValue); @@ -229,8 +229,7 @@ namespace WixToolset.Core /// /// The XML node for the Requires element. /// The parent provider identifier. - /// Whether the Requires custom action should be referenced. - private void ParseRequiresElement(XElement node, string providerId, bool requiresAction) + private void ParseRequiresElement(XElement node, string providerId) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); Identifier id = null; @@ -310,7 +309,7 @@ namespace WixToolset.Core if (!this.Messaging.EncounteredError) { - var symbol = this.Core.AddSymbol(new WixDependencySymbol(sourceLineNumbers, id) + this.Core.AddSymbol(new WixDependencySymbol(sourceLineNumbers, id) { ProviderKey = providerKey, MinVersion = minVersion, diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs index 9c81ba5c..597bc25c 100644 --- a/src/WixToolset.Core/Compiler_Module.cs +++ b/src/WixToolset.Core/Compiler_Module.cs @@ -191,7 +191,7 @@ namespace WixToolset.Core this.ParseSimpleRefElement(child, SymbolDefinitions.Property); break; case "Requires": - this.ParseRequiresElement(child, null, false); + this.ParseRequiresElement(child, null); break; case "SetDirectory": this.ParseSetDirectoryElement(child); diff --git a/src/WixToolset.Core/Compiler_Package.cs b/src/WixToolset.Core/Compiler_Package.cs index 561205f7..fed08001 100644 --- a/src/WixToolset.Core/Compiler_Package.cs +++ b/src/WixToolset.Core/Compiler_Package.cs @@ -307,7 +307,7 @@ namespace WixToolset.Core this.ParseSimpleRefElement(child, SymbolDefinitions.Property); break; case "Requires": - this.ParseRequiresElement(child, null, false); + this.ParseRequiresElement(child, null); break; case "SetDirectory": this.ParseSetDirectoryElement(child); -- cgit v1.2.3-55-g6feb