@joebigelow / wix-1 / commits / 67bcf306

Remove unused values

Rob Mensching committed Mar 25, 2021 at 22:14 UTC 67bcf306aa020c5480b6dd28eab5db3d49264585
5 files changed +7 -8
src/WixToolset.Core/Compiler.cs
+1 -1
@@ -6298,7 +6298,7 @@ namespace WixToolset.Core
6298 this.ParseRelatedBundleElement(child);
6299 break;
6300 case "Requires":
6301 - this.ParseRequiresElement(child, null, false);
6301 + this.ParseRequiresElement(child, null);
6302 break;
6303 case "SetDirectory":
6304 this.ParseSetDirectoryElement(child);
src/WixToolset.Core/Compiler_Bundle.cs
+1 -1
@@ -354,7 +354,7 @@ namespace WixToolset.Core
354 this.ParseRelatedBundleElement(child);
355 break;
356 case "Requires":
357 - this.ParseRequiresElement(child, null, false);
357 + this.ParseRequiresElement(child, null);
358 break;
359 case "SetVariable":
360 this.ParseSetVariableElement(child);
src/WixToolset.Core/Compiler_Dependency.cs
+3 -4
@@ -167,7 +167,7 @@ namespace WixToolset.Core
167 switch (child.Name.LocalName)
168 {
169 case "Requires":
170 - this.ParseRequiresElement(child, id.Id, requiresAction: !packageType.HasValue);
170 + this.ParseRequiresElement(child, id.Id);
171 break;
172 case "RequiresRef":
173 this.ParseRequiresRefElement(child, id.Id, requiresAction: !packageType.HasValue);
@@ -229,8 +229,7 @@ namespace WixToolset.Core
229 /// </summary>
230 /// <param name="node">The XML node for the Requires element.</param>
231 /// <param name="providerId">The parent provider identifier.</param>
232 - /// <param name="requiresAction">Whether the Requires custom action should be referenced.</param>
233 - private void ParseRequiresElement(XElement node, string providerId, bool requiresAction)
232 + private void ParseRequiresElement(XElement node, string providerId)
233 {
234 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
235 Identifier id = null;
@@ -310,7 +309,7 @@ namespace WixToolset.Core
309
310 if (!this.Messaging.EncounteredError)
311 {
313 - var symbol = this.Core.AddSymbol(new WixDependencySymbol(sourceLineNumbers, id)
312 + this.Core.AddSymbol(new WixDependencySymbol(sourceLineNumbers, id)
313 {
314 ProviderKey = providerKey,
315 MinVersion = minVersion,
src/WixToolset.Core/Compiler_Module.cs
+1 -1
@@ -191,7 +191,7 @@ namespace WixToolset.Core
191 this.ParseSimpleRefElement(child, SymbolDefinitions.Property);
192 break;
193 case "Requires":
194 - this.ParseRequiresElement(child, null, false);
194 + this.ParseRequiresElement(child, null);
195 break;
196 case "SetDirectory":
197 this.ParseSetDirectoryElement(child);
src/WixToolset.Core/Compiler_Package.cs
+1 -1
@@ -307,7 +307,7 @@ namespace WixToolset.Core
307 this.ParseSimpleRefElement(child, SymbolDefinitions.Property);
308 break;
309 case "Requires":
310 - this.ParseRequiresElement(child, null, false);
310 + this.ParseRequiresElement(child, null);
311 break;
312 case "SetDirectory":
313 this.ParseSetDirectoryElement(child);