From df8f367c7bc515be7f5652338f1e64e6a9e6acd8 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 5 Feb 2020 14:36:35 -0800 Subject: Code cleanup --- .../WindowsInstaller/Rows/FileRow.cs | 525 ++------------------- src/WixToolset.Data/WindowsInstaller/SubStorage.cs | 8 +- .../WindowsInstaller/TableDefinitionCollection.cs | 61 +-- .../WindowsInstaller/TableIndexedCollection.cs | 62 +-- .../WindowsInstaller/WindowsInstallerData.cs | 67 +-- 5 files changed, 117 insertions(+), 606 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs index cd3660e4..1cf8cf12 100644 --- a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs +++ b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs @@ -2,41 +2,13 @@ namespace WixToolset.Data.WindowsInstaller.Rows { - using System; using System.Diagnostics; - using System.Globalization; /// /// Specialization of a row for the file table. /// - public sealed class FileRow : Row //, IComparable + public sealed class FileRow : Row { - //private string assemblyApplication; - //private string assemblyManifest; - //private FileAssemblyType assemblyType; - //private string directory; - //private int diskId; - //private bool fromModule; - //private bool isGeneratedShortFileName; - //private int patchGroup; - //private string processorArchitecture; - //private string source; - //private Row hashRow; - //private List assemblyNameRows; - //private string[] previousSource; - //private string symbols; - //private string[] previousSymbols; - //private PatchAttributeType patchAttributes; - //private string retainOffsets; - //private string retainLengths; - //private string ignoreOffsets; - //private string ignoreLengths; - //private string[] previousRetainOffsets; - //private string[] previousRetainLengths; - //private string[] previousIgnoreOffsets; - //private string[] previousIgnoreLengths; - //private string patch; - /// /// Creates a File row that belongs to a table. /// @@ -45,13 +17,6 @@ namespace WixToolset.Data.WindowsInstaller.Rows public FileRow(SourceLineNumber sourceLineNumbers, Table table) : base(sourceLineNumbers, table) { - //this.assemblyType = FileAssemblyType.NotAnAssembly; - //this.previousSource = new string[1]; - //this.previousSymbols = new string[1]; - //this.previousRetainOffsets = new string[1]; - //this.previousRetainLengths = new string[1]; - //this.previousIgnoreOffsets = new string[1]; - //this.previousIgnoreLengths = new string[1]; } /// @@ -62,13 +27,6 @@ namespace WixToolset.Data.WindowsInstaller.Rows public FileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) : base(sourceLineNumbers, tableDefinition) { - //this.assemblyType = FileAssemblyType.NotAnAssembly; - //this.previousSource = new string[1]; - //this.previousSymbols = new string[1]; - //this.previousRetainOffsets = new string[1]; - //this.previousRetainLengths = new string[1]; - //this.previousIgnoreOffsets = new string[1]; - //this.previousIgnoreLengths = new string[1]; } /// @@ -77,8 +35,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// Primary key of the file row. public string File { - get { return (string)this.Fields[0].Data; } - set { this.Fields[0].Data = value; } + get => this.FieldAsString(0); + set => this.Fields[0].Data = value; } /// @@ -87,8 +45,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// Component this file row belongs to. public string Component { - get { return (string)this.Fields[1].Data; } - set { this.Fields[1].Data = value; } + get => this.FieldAsString(1); + set => this.Fields[1].Data = value; } /// @@ -97,8 +55,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// Name of the file. public string FileName { - get { return (string)this.Fields[2].Data; } - set { this.Fields[2].Data = value; } + get => this.FieldAsString(2); + set => this.Fields[2].Data = value; } /// @@ -110,18 +68,12 @@ namespace WixToolset.Data.WindowsInstaller.Rows { get { - string fileName = this.FileName; - int index = fileName.IndexOf('|'); + var fileName = this.FileName; + var index = fileName.IndexOf('|'); // If it doesn't contain a pipe, just return the whole string - if (-1 == index) - { - return fileName; - } - else // otherwise, extract the part of the string after the pipe - { - return fileName.Substring(index + 1); - } + // otherwise, extract the part of the string after the pipe. + return (-1 == index) ? fileName : fileName.Substring(index + 1); } } @@ -131,8 +83,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// Size of the file. public int FileSize { - get { return (int)this.Fields[3].Data; } - set { this.Fields[3].Data = value; } + get => this.FieldAsInteger(3); + set => this.Fields[3].Data = value; } /// @@ -141,8 +93,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// Version of the file. public string Version { - get { return (string)this.Fields[4].Data; } - set { this.Fields[4].Data = value; } + get => this.FieldAsString(4); + set => this.Fields[4].Data = value; } /// @@ -151,8 +103,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// LCID of the file. public string Language { - get { return (string)this.Fields[5].Data; } - set { this.Fields[5].Data = value; } + get => this.FieldAsString(5); + set => this.Fields[5].Data = value; } /// @@ -161,8 +113,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// Attributes on a file. public int Attributes { - get { return Convert.ToInt32(this.Fields[6].Data, CultureInfo.InvariantCulture); } - set { this.Fields[6].Data = value; } + get => this.FieldAsInteger(6); + set => this.Fields[6].Data = value; } /// @@ -173,8 +125,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows { get { - bool compressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed)); - bool noncompressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed)); + var compressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed)); + var noncompressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed)); if (compressedFlag && noncompressedFlag) { @@ -225,415 +177,38 @@ namespace WixToolset.Data.WindowsInstaller.Rows /// Sequence of the file row. public int Sequence { - get { return (int)this.Fields[7].Data; } - set { this.Fields[7].Data = value; } + get => this.FieldAsInteger(7); + set => this.Fields[7].Data = value; } - /////// - /////// Gets or sets the type of assembly of file row. - /////// - /////// Assembly type for file row. - ////public FileAssemblyType AssemblyType - ////{ - //// get { return this.assemblyType; } - //// set { this.assemblyType = value; } - ////} - - /////// - /////// Gets or sets the identifier for the assembly application. - /////// - /////// Identifier for the assembly application. - ////public string AssemblyApplication - ////{ - //// get { return this.assemblyApplication; } - //// set { this.assemblyApplication = value; } - ////} - - /////// - /////// Gets or sets the identifier for the assembly manifest. - /////// - /////// Identifier for the assembly manifest. - ////public string AssemblyManifest - ////{ - //// get { return this.assemblyManifest; } - //// set { this.assemblyManifest = value; } - ////} - - /////// - /////// Gets or sets the directory of the file. - /////// - /////// Directory of the file. - ////public string Directory - ////{ - //// get { return this.directory; } - //// set { this.directory = value; } - ////} - - /////// - /////// Gets or sets the disk id for this file. - /////// - /////// Disk id for the file. - ////public int DiskId - ////{ - //// get { return this.diskId; } - //// set { this.diskId = value; } - ////} - - /////// - /////// Gets or sets the source location to the file. - /////// - /////// Source location to the file. - ////public string Source - ////{ - //// get { return this.source; } - //// set { this.source = value; } - ////} - - /////// - /////// Gets or sets the source location to the previous file. - /////// - /////// Source location to the previous file. - ////public string PreviousSource - ////{ - //// get { return this.previousSource[0]; } - //// set { this.previousSource[0] = value; } - ////} - - /////// - /////// Gets the source location to the previous files. - /////// - /////// Source location to the previous files. - ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")] - ////public string[] PreviousSourceArray - ////{ - //// get { return this.previousSource; } - ////} - - /////// - /////// Gets or sets the architecture the file executes on. - /////// - /////// Architecture the file executes on. - ////public string ProcessorArchitecture - ////{ - //// get { return this.processorArchitecture; } - //// set { this.processorArchitecture = value; } - ////} - - /////// - /////// Gets of sets the patch group of a patch-added file. - /////// - /////// The patch group of a patch-added file. - ////public int PatchGroup - ////{ - //// get { return this.patchGroup; } - //// set { this.patchGroup = value; } - ////} - - /////// - /////// Gets or sets the patch header of the file. - /////// - /////// Patch header of the file. - ////public string Patch - ////{ - //// get { return this.patch; } - //// set { this.patch = value; } - ////} - - /////// - /////// Gets or sets the locations to find the file's symbols. - /////// - /////// Symbol paths for the file. - ////public string Symbols - ////{ - //// get { return this.symbols; } - //// set { this.symbols = value; } - ////} - - /////// - /////// Gets or sets the locations to find the file's previous symbols. - /////// - /////// Symbol paths for the previous file. - ////public string PreviousSymbols - ////{ - //// get { return this.previousSymbols[0]; } - //// set { this.previousSymbols[0] = value; } - ////} - - /////// - /////// Gets the locations to find the files' previous symbols. - /////// - /////// Symbol paths for the previous files. - ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")] - ////public string[] PreviousSymbolsArray - ////{ - //// get { return this.previousSymbols; } - ////} - - /////// - /////// Gets or sets the generated short file name attribute. - /////// - /////// The generated short file name attribute. - ////public bool IsGeneratedShortFileName - ////{ - //// get { return this.isGeneratedShortFileName; } - - //// set { this.isGeneratedShortFileName = value; } - ////} - - /////// - /////// Gets or sets whether this row came from a merge module. - /////// - /////// Whether this row came from a merge module. - ////public bool FromModule - ////{ - //// get { return this.fromModule; } - //// set { this.fromModule = value; } - ////} - - /////// - /////// Gets or sets the MsiFileHash row created for this FileRow. - /////// - /////// Row for MsiFileHash table. - ////public Row HashRow - ////{ - //// get { return this.hashRow; } - //// set { this.hashRow = value; } - ////} - - /////// - /////// Gets or sets the set of MsiAssemblyName rows created for this FileRow. - /////// - /////// RowCollection of MsiAssemblyName table. - ////[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - ////public List AssemblyNameRows - ////{ - //// get { return this.assemblyNameRows; } - //// set { this.assemblyNameRows = value; } - ////} - - /////// - /////// Gets or sets the patching attributes to the file. - /////// - /////// Patching attributes of the file. - ////public PatchAttributeType PatchAttributes - ////{ - //// get { return this.patchAttributes; } - //// set { this.patchAttributes = value; } - ////} - - /////// - /////// Gets or sets the delta patch retain-length list for the file. - /////// - /////// RetainLength list for the file. - ////public string RetainLengths - ////{ - //// get { return this.retainLengths; } - //// set { this.retainLengths = value; } - ////} - - /////// - /////// Gets or sets the delta patch ignore-offset list for the file. - /////// - /////// IgnoreOffset list for the file. - ////public string IgnoreOffsets - ////{ - //// get { return this.ignoreOffsets; } - //// set { this.ignoreOffsets = value; } - ////} - - /////// - /////// Gets or sets the delta patch ignore-length list for the file. - /////// - /////// IgnoreLength list for the file. - ////public string IgnoreLengths - ////{ - //// get { return this.ignoreLengths; } - //// set { this.ignoreLengths = value; } - ////} - - /////// - /////// Gets or sets the delta patch retain-offset list for the file. - /////// - /////// RetainOffset list for the file. - ////public string RetainOffsets - ////{ - //// get { return this.retainOffsets; } - //// set { this.retainOffsets = value; } - ////} - - /////// - /////// Gets or sets the delta patch retain-length list for the previous file. - /////// - /////// RetainLength list for the previous file. - ////public string PreviousRetainLengths - ////{ - //// get { return this.previousRetainLengths[0]; } - //// set { this.previousRetainLengths[0] = value; } - ////} - - /////// - /////// Gets the delta patch retain-length list for the previous files. - /////// - /////// RetainLength list for the previous files. - ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")] - ////public string[] PreviousRetainLengthsArray - ////{ - //// get { return this.previousRetainLengths; } - ////} - - /////// - /////// Gets or sets the delta patch ignore-offset list for the previous file. - /////// - /////// IgnoreOffset list for the previous file. - ////public string PreviousIgnoreOffsets - ////{ - //// get { return this.previousIgnoreOffsets[0]; } - //// set { this.previousIgnoreOffsets[0] = value; } - ////} - - /////// - /////// Gets the delta patch ignore-offset list for the previous files. - /////// - /////// IgnoreOffset list for the previous files. - ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")] - ////public string[] PreviousIgnoreOffsetsArray - ////{ - //// get { return this.previousIgnoreOffsets; } - ////} - - /////// - /////// Gets or sets the delta patch ignore-length list for the previous file. - /////// - /////// IgnoreLength list for the previous file. - ////public string PreviousIgnoreLengths - ////{ - //// get { return this.previousIgnoreLengths[0]; } - //// set { this.previousIgnoreLengths[0] = value; } - ////} - - /////// - /////// Gets the delta patch ignore-length list for the previous files. - /////// - /////// IgnoreLength list for the previous files. - ////[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")] - ////public string[] PreviousIgnoreLengthsArray - ////{ - //// get { return this.previousIgnoreLengths; } - ////} - - /////// - /////// Gets or sets the delta patch retain-offset list for the previous file. - /////// - /////// RetainOffset list for the previous file. - ////public string PreviousRetainOffsets - ////{ - //// get { return this.previousRetainOffsets[0]; } - //// set { this.previousRetainOffsets[0] = value; } - ////} - - /////// - /////// Gets the delta patch retain-offset list for the previous files. - /////// - /////// RetainOffset list for the previous files. - ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")] - ////public string[] PreviousRetainOffsetsArray - ////{ - //// get { return this.previousRetainOffsets; } - ////} - - /////// - /////// Compares the current FileRow with another object of the same type. - /////// - /////// An object to compare with this instance. - /////// An integer that indicates the relative order of the comparands. - ////[SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.ArgumentException.#ctor(System.String)")] - ////[SuppressMessage("Microsoft.Globalization", "CA1309:UseOrdinalStringComparison")] - ////public int CompareTo(object obj) - ////{ - //// if (this == obj) - //// { - //// return 0; - //// } - - //// FileRow fileRow = obj as FileRow; - //// if (null == fileRow) - //// { - //// throw new ArgumentException(WixDataStrings.EXP_OtherObjectIsNotFileRow); - //// } - - //// int compared = this.DiskId - fileRow.DiskId; - //// if (0 == compared) - //// { - //// compared = this.patchGroup - fileRow.patchGroup; - - //// if (0 == compared) - //// { - //// compared = String.Compare(this.File, fileRow.File, StringComparison.InvariantCulture); - //// } - //// } - - //// return compared; - ////} - - /////// - /////// Copies data from another FileRow object. - /////// - /////// An row to get data from. - ////public void CopyFrom(FileRow src) - ////{ - //// for (int i = 0; i < src.Fields.Length; i++) - //// { - //// this[i] = src[i]; - //// } - //// this.assemblyManifest = src.assemblyManifest; - //// this.assemblyType = src.assemblyType; - //// this.directory = src.directory; - //// this.diskId = src.diskId; - //// this.fromModule = src.fromModule; - //// this.isGeneratedShortFileName = src.isGeneratedShortFileName; - //// this.patchGroup = src.patchGroup; - //// this.processorArchitecture = src.processorArchitecture; - //// this.source = src.source; - //// this.PreviousSource = src.PreviousSource; - //// this.Operation = src.Operation; - //// this.symbols = src.symbols; - //// this.PreviousSymbols = src.PreviousSymbols; - //// this.patchAttributes = src.patchAttributes; - //// this.retainOffsets = src.retainOffsets; - //// this.retainLengths = src.retainLengths; - //// this.ignoreOffsets = src.ignoreOffsets; - //// this.ignoreLengths = src.ignoreLengths; - //// this.PreviousRetainOffsets = src.PreviousRetainOffsets; - //// this.PreviousRetainLengths = src.PreviousRetainLengths; - //// this.PreviousIgnoreOffsets = src.PreviousIgnoreOffsets; - //// this.PreviousIgnoreLengths = src.PreviousIgnoreLengths; - ////} + /// + /// Gets or sets the disk id for this file. + /// + /// Disk id for the file. + public int DiskId + { + get => this.FieldAsInteger(8); + set => this.Fields[8].Data = value; + } - /////// - /////// Appends previous data from another FileRow object. - /////// - /////// An row to get data from. - ////public void AppendPreviousDataFrom(FileRow src) - ////{ - //// AppendStringToArray(ref this.previousSource, src.previousSource[0]); - //// AppendStringToArray(ref this.previousSymbols, src.previousSymbols[0]); - //// AppendStringToArray(ref this.previousRetainOffsets, src.previousRetainOffsets[0]); - //// AppendStringToArray(ref this.previousRetainLengths, src.previousRetainLengths[0]); - //// AppendStringToArray(ref this.previousIgnoreOffsets, src.previousIgnoreOffsets[0]); - //// AppendStringToArray(ref this.previousIgnoreLengths, src.previousIgnoreLengths[0]); - ////} + /// + /// Gets or sets the source location to the file. + /// + /// Source location to the file. + public string Source + { + get => this.FieldAsString(9); + set => this.Fields[9].Data = value; + } - /////// - /////// Helper method for AppendPreviousDataFrom. - /////// - /////// Destination array. - /////// Source string. - ////private static void AppendStringToArray(ref string[] destination, string source) - ////{ - //// string[] result = new string[destination.Length + 1]; - //// destination.CopyTo(result, 0); - //// result[destination.Length] = source; - //// destination = result; - ////} + /// + /// Gets or sets the source location to the previous file. + /// + /// Source location to the previous file. + public string PreviousSource + { + get => this.Fields[9].PreviousData; + set => this.Fields[9].PreviousData = value; + } } } diff --git a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs index 6aae1dd8..e24839c0 100644 --- a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs +++ b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs @@ -39,15 +39,16 @@ namespace WixToolset.Data.WindowsInstaller /// New SubStorage object. internal static SubStorage Read(XmlReader reader) { - if (!reader.LocalName.Equals("subStorage" == reader.LocalName)) + if (reader.LocalName != "subStorage") { throw new XmlException(); } WindowsInstallerData data = null; - bool empty = reader.IsEmptyElement; string name = null; + var empty = reader.IsEmptyElement; + while (reader.MoveToNextAttribute()) { switch (reader.LocalName) @@ -60,7 +61,7 @@ namespace WixToolset.Data.WindowsInstaller if (!empty) { - bool done = false; + var done = false; while (!done && reader.Read()) { @@ -76,6 +77,7 @@ namespace WixToolset.Data.WindowsInstaller throw new XmlException(); } break; + case XmlNodeType.EndElement: done = true; break; diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs index 80303913..96c5f74f 100644 --- a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs +++ b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs @@ -36,18 +36,12 @@ namespace WixToolset.Data.WindowsInstaller /// Gets the number of items in the collection. /// /// Number of items in collection. - public int Count - { - get { return this.collection.Count; } - } + public int Count => this.collection.Count; /// /// Table definition collections are never read-only. /// - public bool IsReadOnly - { - get { return false; } - } + public bool IsReadOnly => false; /// /// Gets a table definition by name. @@ -72,10 +66,7 @@ namespace WixToolset.Data.WindowsInstaller /// Name of table to locate. /// Table definition if found. /// True if table definition was found otherwise false. - public bool TryGet(string tableName, out TableDefinition table) - { - return this.collection.TryGetValue(tableName, out table); - } + public bool TryGet(string tableName, out TableDefinition table) => this.collection.TryGetValue(tableName, out table); /// /// Load a table definition collection from an XmlReader. @@ -95,76 +86,52 @@ namespace WixToolset.Data.WindowsInstaller /// /// Table definition to add to the collection. /// Indexes by table definition name. - public void Add(TableDefinition tableDefinition) - { - this.collection.Add(tableDefinition.Name, tableDefinition); - } + public void Add(TableDefinition tableDefinition) => this.collection.Add(tableDefinition.Name, tableDefinition); /// /// Removes all table definitions from the collection. /// - public void Clear() - { - this.collection.Clear(); - } + public void Clear() => this.collection.Clear(); /// /// Checks if the collection contains a table name. /// /// The table to check in the collection. /// True if collection contains the table. - public bool Contains(string tableName) - { - return this.collection.ContainsKey(tableName); - } + public bool Contains(string tableName) => this.collection.ContainsKey(tableName); /// /// Checks if the collection contains a table. /// /// The table to check in the collection. /// True if collection contains the table. - public bool Contains(TableDefinition table) - { - return this.collection.ContainsKey(table.Name); - } + public bool Contains(TableDefinition table) => this.collection.ContainsKey(table.Name); /// /// Copies table definitions to an arry. /// /// Array to copy the table definitions to. /// Index in the array to start copying at. - public void CopyTo(TableDefinition[] array, int index) - { - this.collection.Values.CopyTo(array, index); - } + public void CopyTo(TableDefinition[] array, int index) => this.collection.Values.CopyTo(array, index); /// /// Removes a table definition from the collection. /// /// Table to remove from the collection. /// True if the table definition existed in the collection and was removed. - public bool Remove(TableDefinition table) - { - return this.collection.Remove(table.Name); - } + public bool Remove(TableDefinition table) => this.collection.Remove(table.Name); /// /// Gets enumerator for the collection. /// /// Enumerator for the collection. - public IEnumerator GetEnumerator() - { - return this.collection.Values.GetEnumerator(); - } + public IEnumerator GetEnumerator() => this.collection.Values.GetEnumerator(); /// /// Gets the untyped enumerator for the collection. /// /// Untyped enumerator for the collection. - IEnumerator IEnumerable.GetEnumerator() - { - return this.collection.Values.GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() => this.collection.Values.GetEnumerator(); /// /// Loads a collection of table definitions from a XmlReader in memory. @@ -178,8 +145,8 @@ namespace WixToolset.Data.WindowsInstaller throw new XmlException(); } - bool empty = reader.IsEmptyElement; - TableDefinitionCollection tableDefinitionCollection = new TableDefinitionCollection(); + var empty = reader.IsEmptyElement; + var tableDefinitionCollection = new TableDefinitionCollection(); while (reader.MoveToNextAttribute()) { @@ -188,7 +155,7 @@ namespace WixToolset.Data.WindowsInstaller // parse the child elements if (!empty) { - bool done = false; + var done = false; while (!done && reader.Read()) { diff --git a/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs index 57ba19d1..a399c6fa 100644 --- a/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs +++ b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs @@ -15,19 +15,13 @@ namespace WixToolset.Data.WindowsInstaller /// /// Instantiate a new empty collection. /// - public TableIndexedCollection() - { - this.collection = new Dictionary(); - } + public TableIndexedCollection() => this.collection = new Dictionary(); /// /// Instantiate a new collection populated with a set of tables. /// /// Set of tables. - public TableIndexedCollection(IEnumerable tables) - { - this.collection = tables.ToDictionary(t => t.Name); - } + public TableIndexedCollection(IEnumerable
tables) => this.collection = tables.ToDictionary(t => t.Name); /// /// Gets the number of items in the collection. @@ -45,18 +39,12 @@ namespace WixToolset.Data.WindowsInstaller /// /// Table to add to the collection. /// Indexes the table by name. - public void Add(Table table) - { - this.collection.Add(table.Name, table); - } + public void Add(Table table) => this.collection.Add(table.Name, table); /// /// Clear the tables from the collection. /// - public void Clear() - { - this.collection.Clear(); - } + public void Clear() => this.collection.Clear(); /// /// Determines if a table is in the collection. @@ -70,46 +58,31 @@ namespace WixToolset.Data.WindowsInstaller /// /// Array to copy the collection into. /// Index to start copying from. - public void CopyTo(Table[] array, int arrayIndex) - { - this.collection.Values.CopyTo(array, arrayIndex); - } + public void CopyTo(Table[] array, int arrayIndex) => this.collection.Values.CopyTo(array, arrayIndex); /// /// Remove a table from the collection by name. /// /// Table name to remove from the collection. - public void Remove(string tableName) - { - this.collection.Remove(tableName); - } + public void Remove(string tableName) => _ = this.collection.Remove(tableName); /// /// Remove a table from the collection. /// /// Table with matching name to remove from the collection. - public bool Remove(Table table) - { - return this.collection.Remove(table.Name); - } + public bool Remove(Table table) => this.collection.Remove(table.Name); /// /// Gets an enumerator over the whole collection. /// /// Collection enumerator. - public IEnumerator
GetEnumerator() - { - return this.collection.Values.GetEnumerator(); - } + public IEnumerator
GetEnumerator() => this.collection.Values.GetEnumerator(); /// /// Gets an untyped enumerator over the whole collection. /// /// Untyped collection enumerator. - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { - return this.collection.Values.GetEnumerator(); - } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => this.collection.Values.GetEnumerator(); /// /// Gets a table by name. @@ -117,16 +90,8 @@ namespace WixToolset.Data.WindowsInstaller /// Name of table to locate. public Table this[string tableName] { - get - { - Table table; - return this.collection.TryGetValue(tableName, out table) ? table : null; - } - - set - { - this.collection[tableName] = value; - } + get => this.collection.TryGetValue(tableName, out var table) ? table : null; + set => this.collection[tableName] = value; } /// @@ -135,9 +100,6 @@ namespace WixToolset.Data.WindowsInstaller /// Table name to locate. /// Found table. /// True if table with table name was found, otherwise false. - public bool TryGetTable(string tableName, out Table table) - { - return this.collection.TryGetValue(tableName, out table); - } + public bool TryGetTable(string tableName, out Table table) => this.collection.TryGetValue(tableName, out table); } } diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs index 0855997c..ac593152 100644 --- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs +++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs @@ -60,6 +60,42 @@ namespace WixToolset.Data.WindowsInstaller /// Collection of tables. public TableIndexedCollection Tables { get; private set; } + /// + /// Ensure this output contains a particular table. + /// + /// Definition of the table that should exist. + /// Optional section to use for the table. If one is not provided, the entry section will be used. + /// The table in this output. + public Table EnsureTable(TableDefinition tableDefinition) + { + if (!this.Tables.TryGetTable(tableDefinition.Name, out var table)) + { + table = new Table(tableDefinition); + this.Tables.Add(table); + } + + return table; + } + + /// + /// Saves an output to a WixOutput container. + /// + /// Container to save to. + public void Save(WixOutput wixout) + { + using (var writer = XmlWriter.Create(wixout.CreateDataStream(WixOutputStreamName))) + { + writer.WriteStartDocument(); + this.Write(writer); + writer.WriteEndDocument(); + } + } + + /// + /// Gets table by name. + /// + public bool TryGetTable(string tableName, out Table table) => this.Tables.TryGetTable(tableName, out table); + /// /// Loads an output from a path on disk. /// @@ -84,20 +120,6 @@ namespace WixToolset.Data.WindowsInstaller } } - /// - /// Saves an output to a WixOutput container. - /// - /// Container to save to. - public void Save(WixOutput wixout) - { - using (var writer = XmlWriter.Create(wixout.CreateDataStream(WixOutputStreamName))) - { - writer.WriteStartDocument(); - this.Write(writer); - writer.WriteEndDocument(); - } - } - /// /// Processes an XmlReader and builds up the output object. /// @@ -206,23 +228,6 @@ namespace WixToolset.Data.WindowsInstaller return output; } - /// - /// Ensure this output contains a particular table. - /// - /// Definition of the table that should exist. - /// Optional section to use for the table. If one is not provided, the entry section will be used. - /// The table in this output. - public Table EnsureTable(TableDefinition tableDefinition) - { - if (!this.Tables.TryGetTable(tableDefinition.Name, out var table)) - { - table = new Table(tableDefinition); - this.Tables.Add(table); - } - - return table; - } - /// /// Persists an output in an XML format. /// -- cgit v1.2.3-55-g6feb