From fe689d65adcb20c5f1cfc0eedfe75559c686adbb Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 6 Feb 2022 09:38:13 -0800
Subject: Quick automated code clean up
---
.../CreateWindowsInstallerDataFromIRCommand.cs | 13 ++++++++-----
.../WixToolset.Core.WindowsInstaller/MspBackend.cs | 5 ++++-
src/wix/heat/RegFileHarvester.cs | 22 +++++++++++-----------
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index d34ca3fe..98950a05 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -1552,12 +1552,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind
}
}
- private Row CreateRow(IntermediateSymbol symbol, string tableDefinitionName) =>
- this.CreateRow(symbol, this.TableDefinitions[tableDefinitionName]);
-
- private Row CreateRow(IntermediateSymbol symbol, TableDefinition tableDefinition) =>
- this.BackendHelper.CreateRow(this.Section, symbol, this.Data, tableDefinition);
+ private Row CreateRow(IntermediateSymbol symbol, string tableDefinitionName)
+ {
+ return this.CreateRow(symbol, this.TableDefinitions[tableDefinitionName]);
+ }
+ private Row CreateRow(IntermediateSymbol symbol, TableDefinition tableDefinition)
+ {
+ return this.BackendHelper.CreateRow(this.Section, symbol, this.Data, tableDefinition);
+ }
private string CreateShortName(string longName, bool keepExtension, params string[] args)
{
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs b/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs
index 76328bb1..1ef9671b 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs
@@ -69,7 +69,10 @@ namespace WixToolset.Core.WindowsInstaller
}
}
- public IDecompileResult Decompile(IDecompileContext context) => throw new NotImplementedException();
+ public IDecompileResult Decompile(IDecompileContext context)
+ {
+ throw new NotImplementedException();
+ }
public Intermediate Unbind(IUnbindContext context)
{
diff --git a/src/wix/heat/RegFileHarvester.cs b/src/wix/heat/RegFileHarvester.cs
index 1377d413..b7ad8c7b 100644
--- a/src/wix/heat/RegFileHarvester.cs
+++ b/src/wix/heat/RegFileHarvester.cs
@@ -141,19 +141,19 @@ namespace WixToolset.Harvesters
{
string name = null;
string value = null;
- Wix.RegistryValue.TypeType type;
- Wix.RegistryKey registryKey = new Wix.RegistryKey();
-
- registryKey.Root = root;
- registryKey.Key = line;
+ var registryKey = new Wix.RegistryKey
+ {
+ Root = root,
+ Key = line
+ };
- while (this.GetValue(sr, ref name, ref value, out type))
+ while (this.GetValue(sr, ref name, ref value, out var type))
{
Wix.RegistryValue registryValue = new Wix.RegistryValue();
ArrayList charArray;
// Don't specifiy name for default attribute
- if (!string.IsNullOrEmpty(name))
+ if (!String.IsNullOrEmpty(name))
{
registryValue.Name = name;
}
@@ -163,7 +163,7 @@ namespace WixToolset.Harvesters
switch (type)
{
case Wix.RegistryValue.TypeType.binary:
- registryValue.Value = value.Replace(",", string.Empty).ToUpper();
+ registryValue.Value = value.Replace(",", String.Empty).ToUpper();
break;
case Wix.RegistryValue.TypeType.integer:
@@ -172,7 +172,7 @@ namespace WixToolset.Harvesters
case Wix.RegistryValue.TypeType.expandable:
charArray = this.ConvertCharList(value);
- value = string.Empty;
+ value = String.Empty;
// create the string, remove the terminating null
for (int i = 0; i < charArray.Count; i++)
@@ -188,7 +188,7 @@ namespace WixToolset.Harvesters
case Wix.RegistryValue.TypeType.multiString:
charArray = this.ConvertCharList(value);
- value = string.Empty;
+ value = String.Empty;
// Convert the character array to a string so we can simply split it at the nulls, ignore the final null null.
for (int i = 0; i < (charArray.Count - 2); i++)
@@ -399,7 +399,7 @@ namespace WixToolset.Harvesters
/// <returns>Array of characters.</returns>
private ArrayList ConvertCharList(string charList)
{
- if (string.IsNullOrEmpty(charList))
+ if (String.IsNullOrEmpty(charList))
{
return new ArrayList();
}
--
cgit v1.2.3-55-g6feb