diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-14 07:38:48 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-14 07:47:48 -0700 |
| commit | 3ccd5e439da4296d6f2b66ce47075ab20d039676 (patch) | |
| tree | b5546552613b869367d09f444492a0bbcfadcfe0 /src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs | |
| parent | 574785ab1421c9b67336c13ade5c2263e665ca07 (diff) | |
| download | wix-3ccd5e439da4296d6f2b66ce47075ab20d039676.tar.gz wix-3ccd5e439da4296d6f2b66ce47075ab20d039676.tar.bz2 wix-3ccd5e439da4296d6f2b66ce47075ab20d039676.zip | |
Minimize public surface area of Core
Fixes wixtoolset/issues#6374
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs index 968ab387..20606a77 100644 --- a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs +++ b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs | |||
| @@ -181,7 +181,7 @@ namespace WixToolset.Extensibility | |||
| 181 | throw new ArgumentNullException("message"); | 181 | throw new ArgumentNullException("message"); |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | string[] messageParts = message.Split('\t'); | 184 | var messageParts = message.Split('\t'); |
| 185 | if (3 > messageParts.Length) | 185 | if (3 > messageParts.Length) |
| 186 | { | 186 | { |
| 187 | if (null == action) | 187 | if (null == action) |
| @@ -194,10 +194,10 @@ namespace WixToolset.Extensibility | |||
| 194 | } | 194 | } |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | SourceLineNumber messageSourceLineNumbers = null; | 197 | SourceLineNumber messageSourceLineNumbers; |
| 198 | if (6 < messageParts.Length) | 198 | if (6 < messageParts.Length) |
| 199 | { | 199 | { |
| 200 | string[] primaryKeys = new string[messageParts.Length - 6]; | 200 | var primaryKeys = new string[messageParts.Length - 6]; |
| 201 | 201 | ||
| 202 | Array.Copy(messageParts, 6, primaryKeys, 0, primaryKeys.Length); | 202 | Array.Copy(messageParts, 6, primaryKeys, 0, primaryKeys.Length); |
| 203 | 203 | ||
| @@ -242,7 +242,7 @@ namespace WixToolset.Extensibility | |||
| 242 | this.indexedSourceLineNumbers = new Hashtable(); | 242 | this.indexedSourceLineNumbers = new Hashtable(); |
| 243 | 243 | ||
| 244 | // index each real table | 244 | // index each real table |
| 245 | foreach (Table table in this.output.Tables) | 245 | foreach (var table in this.output.Tables) |
| 246 | { | 246 | { |
| 247 | // skip unreal tables | 247 | // skip unreal tables |
| 248 | if (table.Definition.Unreal) | 248 | if (table.Definition.Unreal) |
| @@ -251,7 +251,7 @@ namespace WixToolset.Extensibility | |||
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | // index each row | 253 | // index each row |
| 254 | foreach (Row row in table.Rows) | 254 | foreach (var row in table.Rows) |
| 255 | { | 255 | { |
| 256 | // skip rows that don't contain source line information | 256 | // skip rows that don't contain source line information |
| 257 | if (null == row.SourceLineNumbers) | 257 | if (null == row.SourceLineNumbers) |
| @@ -260,10 +260,10 @@ namespace WixToolset.Extensibility | |||
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | // index the row using its table name and primary key | 262 | // index the row using its table name and primary key |
| 263 | string primaryKey = row.GetPrimaryKey(';'); | 263 | var primaryKey = row.GetPrimaryKey(';'); |
| 264 | if (null != primaryKey) | 264 | if (null != primaryKey) |
| 265 | { | 265 | { |
| 266 | string key = String.Concat(table.Name, ":", primaryKey); | 266 | var key = String.Concat(table.Name, ":", primaryKey); |
| 267 | 267 | ||
| 268 | if (this.indexedSourceLineNumbers.ContainsKey(key)) | 268 | if (this.indexedSourceLineNumbers.ContainsKey(key)) |
| 269 | { | 269 | { |
