aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-25 22:14:44 -0700
committerRob Mensching <rob@firegiant.com>2021-04-02 14:58:00 -0700
commit67bcf306aa020c5480b6dd28eab5db3d49264585 (patch)
tree8df5ca2371b2ae0b62aae41d76b7068f501ad1fc /src
parentc8d8b48c87254f2b3932f169bd5e2783fb8fb627 (diff)
downloadwix-67bcf306aa020c5480b6dd28eab5db3d49264585.tar.gz
wix-67bcf306aa020c5480b6dd28eab5db3d49264585.tar.bz2
wix-67bcf306aa020c5480b6dd28eab5db3d49264585.zip
Remove unused values
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Core/Compiler.cs2
-rw-r--r--src/WixToolset.Core/Compiler_Bundle.cs2
-rw-r--r--src/WixToolset.Core/Compiler_Dependency.cs7
-rw-r--r--src/WixToolset.Core/Compiler_Module.cs2
-rw-r--r--src/WixToolset.Core/Compiler_Package.cs2
5 files changed, 7 insertions, 8 deletions
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
6298 this.ParseRelatedBundleElement(child); 6298 this.ParseRelatedBundleElement(child);
6299 break; 6299 break;
6300 case "Requires": 6300 case "Requires":
6301 this.ParseRequiresElement(child, null, false); 6301 this.ParseRequiresElement(child, null);
6302 break; 6302 break;
6303 case "SetDirectory": 6303 case "SetDirectory":
6304 this.ParseSetDirectoryElement(child); 6304 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
354 this.ParseRelatedBundleElement(child); 354 this.ParseRelatedBundleElement(child);
355 break; 355 break;
356 case "Requires": 356 case "Requires":
357 this.ParseRequiresElement(child, null, false); 357 this.ParseRequiresElement(child, null);
358 break; 358 break;
359 case "SetVariable": 359 case "SetVariable":
360 this.ParseSetVariableElement(child); 360 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
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,
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
191 this.ParseSimpleRefElement(child, SymbolDefinitions.Property); 191 this.ParseSimpleRefElement(child, SymbolDefinitions.Property);
192 break; 192 break;
193 case "Requires": 193 case "Requires":
194 this.ParseRequiresElement(child, null, false); 194 this.ParseRequiresElement(child, null);
195 break; 195 break;
196 case "SetDirectory": 196 case "SetDirectory":
197 this.ParseSetDirectoryElement(child); 197 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
307 this.ParseSimpleRefElement(child, SymbolDefinitions.Property); 307 this.ParseSimpleRefElement(child, SymbolDefinitions.Property);
308 break; 308 break;
309 case "Requires": 309 case "Requires":
310 this.ParseRequiresElement(child, null, false); 310 this.ParseRequiresElement(child, null);
311 break; 311 break;
312 case "SetDirectory": 312 case "SetDirectory":
313 this.ParseSetDirectoryElement(child); 313 this.ParseSetDirectoryElement(child);