Automated code clean up
Rob Mensching committed
Dec 6, 2022 at 15:54 UTC
aa591db212c3df5a5c9f501c01fb1fbf2deadb7c
4 files changed
+66
-73
src/tools/heat/HeatCommand.cs
+12
-15
@@ -68,7 +68,7 @@ namespace WixToolset.Harvesters
68
}
69
else if ('-' == arg[0] || '/' == arg[0])
70
{
71
- string parameter = arg.Substring(1);
71
+ var parameter = arg.Substring(1);
72
if ("nologo" == parameter)
73
{
74
this.showLogo = false;
@@ -89,7 +89,7 @@ namespace WixToolset.Harvesters
89
}
90
else if (parameter.StartsWith("sw"))
91
{
92
- string paramArg = parameter.Substring(2);
92
+ var paramArg = parameter.Substring(2);
93
try
94
{
95
if (0 == paramArg.Length)
@@ -98,7 +98,7 @@ namespace WixToolset.Harvesters
98
}
99
else
100
{
101
- int suppressWarning = Convert.ToInt32(paramArg, CultureInfo.InvariantCulture.NumberFormat);
101
+ var suppressWarning = Convert.ToInt32(paramArg, CultureInfo.InvariantCulture.NumberFormat);
102
if (0 >= suppressWarning)
103
{
104
this.Messaging.Write(ErrorMessages.IllegalSuppressWarningId(paramArg));
@@ -123,7 +123,7 @@ namespace WixToolset.Harvesters
123
}
124
else if (parameter.StartsWith("wx"))
125
{
126
- string paramArg = parameter.Substring(2);
126
+ var paramArg = parameter.Substring(2);
127
try
128
{
129
if (0 == paramArg.Length)
@@ -132,7 +132,7 @@ namespace WixToolset.Harvesters
132
}
133
else
134
{
135
- int elevateWarning = Convert.ToInt32(paramArg, CultureInfo.InvariantCulture.NumberFormat);
135
+ var elevateWarning = Convert.ToInt32(paramArg, CultureInfo.InvariantCulture.NumberFormat);
136
if (0 >= elevateWarning)
137
{
138
this.Messaging.Write(ErrorMessages.IllegalWarningIdAsError(paramArg));
@@ -212,7 +212,7 @@ namespace WixToolset.Harvesters
212
}
213
214
// harvest the output
215
- Wix.Wix wix = heatCore.Harvester.Harvest(this.ExtensionArgument);
215
+ var wix = heatCore.Harvester.Harvest(this.ExtensionArgument);
216
if (null == wix)
217
{
218
return this.Messaging.LastErrorNumber;
@@ -224,15 +224,15 @@ namespace WixToolset.Harvesters
224
return this.Messaging.LastErrorNumber;
225
}
226
227
- XmlWriterSettings xmlSettings = new XmlWriterSettings();
227
+ var xmlSettings = new XmlWriterSettings();
228
xmlSettings.Indent = true;
229
xmlSettings.IndentChars = new string(' ', this.Indent);
230
xmlSettings.OmitXmlDeclaration = true;
231
232
string wixString;
233
- using (StringWriter stringWriter = new StringWriter())
233
+ using (var stringWriter = new StringWriter())
234
{
235
- using (XmlWriter xmlWriter = XmlWriter.Create(stringWriter, xmlSettings))
235
+ using (var xmlWriter = XmlWriter.Create(stringWriter, xmlSettings))
236
{
237
wix.OutputXml(xmlWriter);
238
}
@@ -240,7 +240,7 @@ namespace WixToolset.Harvesters
240
wixString = stringWriter.ToString();
241
}
242
243
- string mutatedWixString = heatCore.Mutator.Mutate(wixString);
243
+ var mutatedWixString = heatCore.Mutator.Mutate(wixString);
244
if (String.IsNullOrEmpty(mutatedWixString))
245
{
246
return this.Messaging.LastErrorNumber;
@@ -248,17 +248,14 @@ namespace WixToolset.Harvesters
248
249
Directory.CreateDirectory(Path.GetDirectoryName(this.OutputFile));
250
251
- using (StreamWriter streamWriter = new StreamWriter(this.OutputFile, false, System.Text.Encoding.UTF8))
251
+ using (var streamWriter = new StreamWriter(this.OutputFile, false, System.Text.Encoding.UTF8))
252
{
253
- xmlSettings.OmitXmlDeclaration = false;
254
- xmlSettings.Encoding = System.Text.Encoding.UTF8;
255
- using (XmlWriter xmlWriter = XmlWriter.Create(streamWriter, xmlSettings))
253
+ using (var xmlWriter = XmlWriter.Create(streamWriter, xmlSettings))
254
{
255
xmlWriter.WriteStartDocument();
256
xmlWriter.Flush();
257
}
258
261
- streamWriter.WriteLine();
259
streamWriter.Write(mutatedWixString);
260
}
261
}
src/tools/heat/RegFileHarvester.cs
-1
@@ -362,7 +362,6 @@ namespace WixToolset.Harvesters
362
363
this.currentLineNumber++;
364
line = line.Trim();
365
- Console.Write("Processing line: {0}\r", this.currentLineNumber);
365
366
if (line.EndsWith("\\"))
367
{
src/tools/heat/UtilHeatExtension.cs
+18
-18
@@ -60,13 +60,13 @@ namespace WixToolset.Harvesters
60
/// <param name="args">The option arguments.</param>
61
public override void ParseOptions(string type, string[] args)
62
{
63
- bool active = false;
63
+ var active = false;
64
IHarvesterExtension harvesterExtension = null;
65
- bool suppressHarvestingRegistryValues = false;
66
- UtilFinalizeHarvesterMutator utilFinalizeHarvesterMutator = new UtilFinalizeHarvesterMutator();
67
- UtilMutator utilMutator = new UtilMutator();
68
- List<UtilTransformMutator> transformMutators = new List<UtilTransformMutator>();
69
- GenerateType generateType = GenerateType.Components;
65
+ var suppressHarvestingRegistryValues = false;
66
+ var utilFinalizeHarvesterMutator = new UtilFinalizeHarvesterMutator();
67
+ var utilMutator = new UtilMutator();
68
+ var transformMutators = new List<UtilTransformMutator>();
69
+ var generateType = GenerateType.Components;
70
71
// select the harvester
72
switch (type)
@@ -94,9 +94,9 @@ namespace WixToolset.Harvesters
94
utilMutator.SetUniqueIdentifiers = true;
95
96
// parse the options
97
- for (int i = 0; i < args.Length; i++)
97
+ for (var i = 0; i < args.Length; i++)
98
{
99
- string commandSwitch = args[i];
99
+ var commandSwitch = args[i];
100
101
if (null == commandSwitch || 0 == commandSwitch.Length) // skip blank arguments
102
{
@@ -105,7 +105,7 @@ namespace WixToolset.Harvesters
105
106
if ('-' == commandSwitch[0] || '/' == commandSwitch[0])
107
{
108
- string truncatedCommandSwitch = commandSwitch.Substring(1);
108
+ var truncatedCommandSwitch = commandSwitch.Substring(1);
109
110
if ("ag" == truncatedCommandSwitch)
111
{
@@ -122,20 +122,20 @@ namespace WixToolset.Harvesters
122
}
123
else if ("dr" == truncatedCommandSwitch)
124
{
125
- string dr = this.GetArgumentParameter(args, i);
125
+ var dr = this.GetArgumentParameter(args, i);
126
127
if (this.Core.Messaging.EncounteredError)
128
{
129
return;
130
}
131
132
- if (harvesterExtension is DirectoryHarvester)
132
+ if (harvesterExtension is DirectoryHarvester directoryHarvester)
133
{
134
- ((DirectoryHarvester)harvesterExtension).RootedDirectoryRef = dr;
134
+ directoryHarvester.RootedDirectoryRef = dr;
135
}
136
- else if (harvesterExtension is FileHarvester)
136
+ else if (harvesterExtension is FileHarvester fileHarvester)
137
{
138
- ((FileHarvester)harvesterExtension).RootedDirectoryRef = dr;
138
+ fileHarvester.RootedDirectoryRef = dr;
139
}
140
}
141
else if ("gg" == truncatedCommandSwitch)
@@ -288,7 +288,7 @@ namespace WixToolset.Harvesters
288
{
289
if (harvesterExtension is DirectoryHarvester)
290
{
291
- string genType = this.GetArgumentParameter(args, i).ToUpperInvariant();
291
+ var genType = this.GetArgumentParameter(args, i).ToUpperInvariant();
292
switch (genType)
293
{
294
case "COMPONENTS":
@@ -349,7 +349,7 @@ namespace WixToolset.Harvesters
349
this.Core.Mutator.AddExtension(utilMutator);
350
351
// add the transforms
352
- foreach (UtilTransformMutator transformMutator in transformMutators)
352
+ foreach (var transformMutator in transformMutators)
353
{
354
this.Core.Mutator.AddExtension(transformMutator);
355
}
@@ -362,8 +362,8 @@ namespace WixToolset.Harvesters
362
363
private string GetArgumentParameter(string[] args, int index, bool allowSpaces)
364
{
365
- string truncatedCommandSwitch = args[index];
366
- string commandSwitchValue = args[index + 1];
365
+ var truncatedCommandSwitch = args[index];
366
+ var commandSwitchValue = args[index + 1];
367
368
//increment the index to the switch value
369
index++;
src/tools/heat/UtilMutator.cs
+36
-39
@@ -182,11 +182,11 @@ namespace WixToolset.Harvesters
182
// add the components to the product feature after all the identifiers have been set
183
if (TemplateType.Package == this.templateType)
184
{
185
- Wix.Feature feature = (Wix.Feature)this.features[0];
185
+ var feature = (Wix.Feature)this.features[0];
186
187
foreach (Wix.ComponentGroup group in this.componentGroups)
188
{
189
- Wix.ComponentGroupRef componentGroupRef = new Wix.ComponentGroupRef();
189
+ var componentGroupRef = new Wix.ComponentGroupRef();
190
componentGroupRef.Id = group.Id;
191
192
feature.AddChild(componentGroupRef);
@@ -200,7 +200,7 @@ namespace WixToolset.Harvesters
200
{
201
foreach (Wix.ComponentGroup group in this.componentGroups)
202
{
203
- Wix.ComponentGroupRef componentGroupRef = new Wix.ComponentGroupRef();
203
+ var componentGroupRef = new Wix.ComponentGroupRef();
204
componentGroupRef.Id = group.Id;
205
206
((Wix.IParentElement)element).AddChild(componentGroupRef);
@@ -223,24 +223,24 @@ namespace WixToolset.Harvesters
223
/// <param name="wix">The Wix document element.</param>
224
private void CreateComponentGroup(Wix.Wix wix)
225
{
226
- Wix.ComponentGroup componentGroup = new Wix.ComponentGroup();
226
+ var componentGroup = new Wix.ComponentGroup();
227
componentGroup.Id = this.componentGroupName;
228
this.componentGroups.Add(componentGroup);
229
230
- Wix.Fragment cgFragment = new Wix.Fragment();
230
+ var cgFragment = new Wix.Fragment();
231
cgFragment.AddChild(componentGroup);
232
wix.AddChild(cgFragment);
233
234
- int componentCount = 0;
234
+ var componentCount = 0;
235
for (; componentCount < this.components.Count; componentCount++)
236
{
237
- Wix.Component c = this.components[componentCount] as Wix.Component;
237
+ var c = this.components[componentCount] as Wix.Component;
238
239
if (this.createFragments)
240
{
241
if (c.ParentElement is Wix.Directory)
242
{
243
- Wix.Directory parentDirectory = c.ParentElement as Wix.Directory;
243
+ var parentDirectory = c.ParentElement as Wix.Directory;
244
245
componentGroup.AddChild(c);
246
c.Directory = parentDirectory.Id;
@@ -248,7 +248,7 @@ namespace WixToolset.Harvesters
248
}
249
else if (c.ParentElement is Wix.DirectoryRef)
250
{
251
- Wix.DirectoryRef parentDirectory = c.ParentElement as Wix.DirectoryRef;
251
+ var parentDirectory = c.ParentElement as Wix.DirectoryBase;
252
253
componentGroup.AddChild(c);
254
c.Directory = parentDirectory.Id;
@@ -257,8 +257,8 @@ namespace WixToolset.Harvesters
257
// Remove whole fragment if moving the component to the component group just leaves an empty DirectoryRef
258
if (0 < this.fragments.Count && parentDirectory.ParentElement is Wix.Fragment)
259
{
260
- Wix.Fragment parentFragment = parentDirectory.ParentElement as Wix.Fragment;
261
- int childCount = 0;
260
+ var parentFragment = parentDirectory.ParentElement as Wix.Fragment;
261
+ var childCount = 0;
262
foreach (Wix.ISchemaElement element in parentFragment.Children)
263
{
264
childCount++;
@@ -267,7 +267,7 @@ namespace WixToolset.Harvesters
267
// Component should always have an Id but the SortedList creation allows for null and bases the name on the fragment count which we cannot reverse engineer here.
268
if (1 == childCount && !String.IsNullOrEmpty(c.Id))
269
{
270
- int removeIndex = this.fragments.IndexOfKey(String.Concat("Component:", c.Id));
270
+ var removeIndex = this.fragments.IndexOfKey(String.Concat("Component:", c.Id));
271
if (0 <= removeIndex)
272
{
273
this.fragments.RemoveAt(removeIndex);
@@ -278,7 +278,7 @@ namespace WixToolset.Harvesters
278
}
279
else
280
{
281
- Wix.ComponentRef componentRef = new Wix.ComponentRef();
281
+ var componentRef = new Wix.ComponentRef();
282
componentRef.Id = c.Id;
283
componentGroup.AddChild(componentRef);
284
}
@@ -322,9 +322,9 @@ namespace WixToolset.Harvesters
322
}
323
324
// index the child elements
325
- if (element is Wix.IParentElement)
325
+ if (element is Wix.IParentElement parentElement)
326
{
327
- foreach (Wix.ISchemaElement childElement in ((Wix.IParentElement)element).Children)
327
+ foreach (Wix.ISchemaElement childElement in parentElement.Children)
328
{
329
this.IndexElement(childElement);
330
}
@@ -336,7 +336,7 @@ namespace WixToolset.Harvesters
336
/// </summary>
337
private void MutateComponents()
338
{
339
- IdentifierGenerator identifierGenerator = new IdentifierGenerator("Component", this.Core);
339
+ var identifierGenerator = new IdentifierGenerator("Component", this.Core);
340
if (TemplateType.Module == this.templateType)
341
{
342
identifierGenerator.MaxIdentifierLength = IdentifierGenerator.MaxModuleIdentifierLength;
@@ -346,7 +346,7 @@ namespace WixToolset.Harvesters
346
{
347
if (null == component.Id)
348
{
349
- string firstFileId = string.Empty;
349
+ var firstFileId = String.Empty;
350
351
// attempt to create a possible identifier from the first file identifier in the component
352
foreach (Wix.File file in component[typeof(Wix.File)])
@@ -355,7 +355,7 @@ namespace WixToolset.Harvesters
355
break;
356
}
357
358
- if (string.IsNullOrEmpty(firstFileId))
358
+ if (String.IsNullOrEmpty(firstFileId))
359
{
360
firstFileId = this.GetGuid();
361
}
@@ -375,10 +375,8 @@ namespace WixToolset.Harvesters
375
}
376
}
377
378
- if (this.createFragments && component.ParentElement is Wix.Directory)
378
+ if (this.createFragments && component.ParentElement is Wix.Directory directory)
379
{
380
- Wix.Directory directory = (Wix.Directory)component.ParentElement;
381
-
380
// parent directory must have an identifier to create a reference to it
381
if (null == directory.Id)
382
{
@@ -388,14 +386,14 @@ namespace WixToolset.Harvesters
386
if (this.rootElement is Wix.Module)
387
{
388
// add a ComponentRef for the Component
391
- Wix.ComponentRef componentRef = new Wix.ComponentRef();
389
+ var componentRef = new Wix.ComponentRef();
390
componentRef.Id = component.Id;
391
this.rootElement.AddChild(componentRef);
392
}
393
394
// create a new Fragment
397
- Wix.Fragment fragment = new Wix.Fragment();
398
- this.fragments.Add(String.Concat("Component:", (null != component.Id ? component.Id : this.fragments.Count.ToString())), fragment);
395
+ var fragment = new Wix.Fragment();
396
+ this.fragments.Add(String.Concat("Component:", component.Id ?? this.fragments.Count.ToString()), fragment);
397
398
// create a new DirectoryRef
399
var directoryRef = DirectoryHelper.CreateDirectoryReference(directory.Id);
@@ -416,7 +414,7 @@ namespace WixToolset.Harvesters
414
if (!this.setUniqueIdentifiers)
415
{
416
// assign all identifiers before fragmenting (because fragmenting requires them all to be present)
419
- IdentifierGenerator identifierGenerator = new IdentifierGenerator("Directory", this.Core);
417
+ var identifierGenerator = new IdentifierGenerator("Directory", this.Core);
418
if (TemplateType.Module == this.templateType)
419
{
420
identifierGenerator.MaxIdentifierLength = IdentifierGenerator.MaxModuleIdentifierLength;
@@ -446,7 +444,7 @@ namespace WixToolset.Harvesters
444
}
445
446
// create a new Fragment
449
- Wix.Fragment fragment = new Wix.Fragment();
447
+ var fragment = new Wix.Fragment();
448
this.fragments.Add(String.Concat("Directory:", ("TARGETDIR" == directory.Id ? null : (null != directory.Id ? directory.Id : this.fragments.Count.ToString()))), fragment);
449
450
// create a new DirectoryRef
@@ -457,11 +455,10 @@ namespace WixToolset.Harvesters
455
parentDirectory.RemoveChild(directory);
456
directoryRef.AddChild(directory);
457
}
460
- else if (directory.ParentElement is Wix.Fragment)
458
+ else if (directory.ParentElement is Wix.Fragment parent)
459
{
460
// When creating fragments, remove any top-level Directory elements;
461
// the fragments should be pulled in by their DirectoryRefs instead.
464
- Wix.Fragment parent = (Wix.Fragment)directory.ParentElement;
462
parent.RemoveChild(directory);
463
464
// Remove the fragment if it is empty.
@@ -473,7 +470,7 @@ namespace WixToolset.Harvesters
470
else if (directory.ParentElement == this.rootElement)
471
{
472
// create a new Fragment
476
- Wix.Fragment fragment = new Wix.Fragment();
473
+ var fragment = new Wix.Fragment();
474
this.fragments.Add(String.Concat("Directory:", ("TARGETDIR" == directory.Id ? null : (null != directory.Id ? directory.Id : this.fragments.Count.ToString()))), fragment);
475
476
// move the Directory from the root element to the Fragment
@@ -489,7 +486,7 @@ namespace WixToolset.Harvesters
486
/// </summary>
487
private void MutateFiles()
488
{
492
- IdentifierGenerator identifierGenerator = new IdentifierGenerator("File", this.Core);
489
+ var identifierGenerator = new IdentifierGenerator("File", this.Core);
490
if (TemplateType.Module == this.templateType)
491
{
492
identifierGenerator.MaxIdentifierLength = IdentifierGenerator.MaxModuleIdentifierLength;
@@ -518,7 +515,7 @@ namespace WixToolset.Harvesters
515
}
516
517
// create a package element although it won't always be used
521
- Wix.SummaryInformation package = new Wix.SummaryInformation();
518
+ var package = new Wix.SummaryInformation();
519
if (TemplateType.Module == this.templateType)
520
{
521
package.Id = this.GetGuid();
@@ -530,7 +527,7 @@ namespace WixToolset.Harvesters
527
528
package.InstallerVersion = 200;
529
533
- Wix.Directory targetDir = new Wix.Directory();
530
+ var targetDir = new Wix.Directory();
531
targetDir.Id = "TARGETDIR";
532
targetDir.Name = "SourceDir";
533
@@ -538,7 +535,7 @@ namespace WixToolset.Harvesters
535
{
536
if (String.Equals(directoryRef.Id, "TARGETDIR", StringComparison.OrdinalIgnoreCase))
537
{
541
- Wix.IParentElement parent = directoryRef.ParentElement as Wix.IParentElement;
538
+ var parent = directoryRef.ParentElement as Wix.IParentElement;
539
540
foreach (Wix.ISchemaElement element in directoryRef.Children)
541
{
@@ -549,7 +546,7 @@ namespace WixToolset.Harvesters
546
547
if (null != ((Wix.ISchemaElement)parent).ParentElement)
548
{
552
- int i = 0;
549
+ var i = 0;
550
551
foreach (Wix.ISchemaElement element in parent.Children)
552
{
@@ -558,7 +555,7 @@ namespace WixToolset.Harvesters
555
556
if (0 == i)
557
{
561
- Wix.IParentElement supParent = (Wix.IParentElement)((Wix.ISchemaElement)parent).ParentElement;
558
+ var supParent = (Wix.IParentElement)((Wix.ISchemaElement)parent).ParentElement;
559
supParent.RemoveChild((Wix.ISchemaElement)parent);
560
}
561
}
@@ -569,7 +566,7 @@ namespace WixToolset.Harvesters
566
567
if (TemplateType.Module == this.templateType)
568
{
572
- Wix.Module module = new Wix.Module();
569
+ var module = new Wix.Module();
570
module.Id = "PUT-MODULE-NAME-HERE";
571
module.Language = "1033";
572
module.Version = "1.0.0.0";
@@ -583,7 +580,7 @@ namespace WixToolset.Harvesters
580
}
581
else // product
582
{
586
- Wix.Package product = new Wix.Package();
583
+ var product = new Wix.Package();
584
product.Id = this.GetGuid();
585
product.Language = "1033";
586
product.Manufacturer = "PUT-COMPANY-NAME-HERE";
@@ -593,13 +590,13 @@ namespace WixToolset.Harvesters
590
product.AddChild(package);
591
product.AddChild(targetDir);
592
596
- Wix.Media media = new Wix.Media();
593
+ var media = new Wix.Media();
594
media.Id = "1";
595
media.Cabinet = "product.cab";
596
media.EmbedCab = Wix.YesNoType.yes;
597
product.AddChild(media);
598
602
- Wix.Feature feature = new Wix.Feature();
599
+ var feature = new Wix.Feature();
600
feature.Id = "ProductFeature";
601
feature.Title = "PUT-FEATURE-TITLE-HERE";
602
feature.Level = 1;