Small cleanup

5 files changed, 7 insertions, 293 deletions

diff --git a/src/WixToolset.Data/IntermediateFieldExtensions.cs b/src/WixToolset.Data/IntermediateFieldExtensions.cs
index 2c856e65..c70eb230 100644
--- a/src/WixToolset.Data/IntermediateFieldExtensions.cs
+++ b/src/WixToolset.Data/IntermediateFieldExtensions.cs
@@ -45,21 +45,7 @@ namespace WixToolset.Data
                 return null;
             }
 
-            switch (field.Definition.Type)
-            {
-            case IntermediateFieldType.Bool:
-                return field.Value.AsBool();
-
-            case IntermediateFieldType.LargeNumber:
-            case IntermediateFieldType.Number:
-                return field.Value.AsLargeNumber() != 0;
-
-            case IntermediateFieldType.String:
-                return !String.IsNullOrEmpty(field.Value.AsString());
-
-            default:
-                throw new InvalidCastException($"Cannot convert field {field.Name} with type {field.Type} to boolean");
-            }
+            return field.AsBool();
         }
 
         public static long AsLargeNumber(this IntermediateField field)
@@ -93,21 +79,7 @@ namespace WixToolset.Data
                 return null;
             }
 
-            switch (field.Definition.Type)
-            {
-            case IntermediateFieldType.Bool:
-                return field.Value.AsBool() ? 1 : 0;
-
-            case IntermediateFieldType.LargeNumber:
-            case IntermediateFieldType.Number:
-                return field.Value.AsLargeNumber();
-
-            case IntermediateFieldType.String:
-                return Convert.ToInt64(field.Value.AsString());
-
-            default:
-                throw new InvalidCastException($"Cannot convert field {field.Name} with type {field.Type} to large number");
-            }
+            return field.AsLargeNumber();
         }
 
         public static int AsNumber(this IntermediateField field)
@@ -141,21 +113,7 @@ namespace WixToolset.Data
                 return null;
             }
 
-            switch (field.Definition.Type)
-            {
-            case IntermediateFieldType.Bool:
-                return field.Value.AsBool() ? 1 : 0;
-
-            case IntermediateFieldType.LargeNumber:
-            case IntermediateFieldType.Number:
-                return field.Value.AsNumber();
-
-            case IntermediateFieldType.String:
-                return Convert.ToInt32(field.Value.AsString());
-
-            default:
-                throw new InvalidCastException($"Cannot convert field {field.Name} with type {field.Type} to number");
-            }
+            return field.AsNumber();
         }
 
         public static IntermediateFieldPathValue AsPath(this IntermediateField field)
diff --git a/src/WixToolset.Data/IntermediateSymbol.cs b/src/WixToolset.Data/IntermediateSymbol.cs
index 4030df5d..408be37c 100644
--- a/src/WixToolset.Data/IntermediateSymbol.cs
+++ b/src/WixToolset.Data/IntermediateSymbol.cs
@@ -165,7 +165,6 @@ namespace WixToolset.Data
             var id = (idJson == null) ? null : Identifier.Deserialize(idJson);
             var sourceLineNumbers = (sourceLineNumbersJson == null) ? null : SourceLineNumber.Deserialize(sourceLineNumbersJson);
 
-            // TODO: this isn't sufficient.
             if (!creator.TryGetSymbolDefinitionByName(definitionName, out var definition))
             {
                 throw new WixException(ErrorMessages.UnknownSymbolType(definitionName));
diff --git a/src/WixToolset.Data/Json/JsonObjectExtensions.cs b/src/WixToolset.Data/Json/JsonObjectExtensions.cs
index e9e170ee..bc52333c 100644
--- a/src/WixToolset.Data/Json/JsonObjectExtensions.cs
+++ b/src/WixToolset.Data/Json/JsonObjectExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 namespace WixToolset.Data
 {
@@ -64,13 +64,13 @@ namespace WixToolset.Data
 
         public static T GetValueOrDefault<T>(this JsonObject jsonObject, string key, T defaultValue = default(T)) where T : class
         {
-            return jsonObject.TryGetValue(key, out var value) ? value as T: defaultValue;
+            return jsonObject.TryGetValue(key, out var value) ? value as T : defaultValue;
         }
 
         public static T GetEnumOrDefault<T>(this JsonObject jsonObject, string key, T defaultValue) where T : struct
         {
 #if DEBUG
-            if (!typeof(T).IsEnum) throw new ArgumentException("This method is designed to only only support enums.", nameof(T));
+            if (!typeof(T).IsEnum) { throw new ArgumentException("This method only supports enums.", nameof(T)); }
 #endif
             var value = jsonObject.GetValueOrDefault<string>(key);
             return Enum.TryParse(value, true, out T e) ? e : defaultValue;
diff --git a/src/WixToolset.Data/Library.cs b/src/WixToolset.Data/Library.cs
deleted file mode 100644
index 13a670b0..00000000
--- a/src/WixToolset.Data/Library.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Data
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Xml;
-
-    /// <summary>
-    /// Object that represents a library file.
-    /// </summary>
-    public sealed class Library
-    {
-        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wixlib";
-        private static readonly Version CurrentVersion = new Version("4.0.0.0");
-
-#if false
-        private string id;
-        private List<string> embedFilePaths;
-        private Dictionary<string, Localization> localizations;
-        private List<Section> sections;
-
-        /// <summary>
-        /// Instantiates a new empty library which is only useful from static creating methods.
-        /// </summary>
-        private Library()
-        {
-            this.embedFilePaths = new List<string>();
-            this.localizations = new Dictionary<string, Localization>();
-            this.sections = new List<Section>();
-        }
-
-        /// <summary>
-        /// Instantiate a new library populated with sections.
-        /// </summary>
-        /// <param name="sections">Sections to add to the library.</param>
-        /// <param name="localizationsByCulture"></param>
-        public Library(IEnumerable<Section> sections, IDictionary<string, Localization> localizationsByCulture, IEnumerable<string> embedFilePaths)
-        {
-            this.id = Convert.ToBase64String(Guid.NewGuid().ToByteArray()).TrimEnd('=').Replace('+', '.').Replace('/', '_');
-            this.embedFilePaths = new List<string>(embedFilePaths);
-            this.localizations = new Dictionary<string, Localization>(localizationsByCulture);
-            this.sections = new List<Section>(sections);
-
-            foreach (Section section in this.sections)
-            {
-                section.LibraryId = this.id;
-            }
-        }
-
-        /// <summary>
-        /// Get the sections contained in this library.
-        /// </summary>
-        /// <value>Sections contained in this library.</value>
-        public IEnumerable<Section> Sections => this.sections;
-
-        /// <summary>
-        /// Gets localization files from this library that match the cultures passed in, in the order of the array of cultures.
-        /// </summary>
-        /// <param name="cultures">The list of cultures to get localizations for.</param>
-        /// <returns>All localizations contained in this library that match the set of cultures provided, in the same order.</returns>
-        public IEnumerable<Localization> GetLocalizations(string[] cultures)
-        {
-            foreach (string culture in cultures ?? new string[0])
-            {
-                if (this.localizations.TryGetValue(culture, out var localization))
-                {
-                    yield return localization;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Loads a library from a path on disk.
-        /// </summary>
-        /// <param name="path">Path to library file saved on disk.</param>
-        /// <param name="tableDefinitions">Collection containing TableDefinitions to use when reconstituting the intermediates.</param>
-        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
-        /// <returns>Returns the loaded library.</returns>
-        public static Library Load(string path, TableDefinitionCollection tableDefinitions, bool suppressVersionCheck)
-        {
-            using (FileStream stream = File.OpenRead(path))
-            {
-                return Load(stream, new Uri(Path.GetFullPath(path)), tableDefinitions, suppressVersionCheck);
-            }
-        }
-
-        /// <summary>
-        /// Loads a library from a stream.
-        /// </summary>
-        /// <param name="stream">Stream containing the library file.</param>
-        /// <param name="uri">Uri for finding this stream.</param>
-        /// <param name="tableDefinitions">Collection containing TableDefinitions to use when reconstituting the intermediates.</param>
-        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
-        /// <returns>Returns the loaded library.</returns>
-        public static Library Load(Stream stream, Uri uri, TableDefinitionCollection tableDefinitions, bool suppressVersionCheck)
-        {
-            using (FileStructure fs = FileStructure.Read(stream))
-            {
-                if (FileFormat.Wixlib != fs.FileFormat)
-                {
-                    throw new WixUnexpectedFileFormatException(uri.LocalPath, FileFormat.Wixlib, fs.FileFormat);
-                }
-
-                using (XmlReader reader = XmlReader.Create(fs.GetDataStream(), null, uri.AbsoluteUri))
-                {
-                    try
-                    {
-                        reader.MoveToContent();
-                        return Library.Read(reader, tableDefinitions, suppressVersionCheck);
-                    }
-                    catch (XmlException xe)
-                    {
-                        throw new WixCorruptFileException(uri.LocalPath, fs.FileFormat, xe);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Saves a library to a path on disk.
-        /// </summary>
-        /// <param name="path">Path to save library file to on disk.</param>
-        /// <param name="resolver">The WiX path resolver.</param>
-        public void Save(string path)
-        {
-            Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(path)));
-
-            using (FileStream stream = File.Create(path))
-            using (FileStructure fs = FileStructure.Create(stream, FileFormat.Wixlib, embedFilePaths))
-            using (XmlWriter writer = XmlWriter.Create(fs.GetDataStream()))
-            {
-                writer.WriteStartDocument();
-
-                this.Write(writer);
-
-                writer.WriteEndDocument();
-            }
-        }
-
-        /// <summary>
-        /// Parse the root library element.
-        /// </summary>
-        /// <param name="reader">XmlReader with library persisted as Xml.</param>
-        /// <param name="tableDefinitions">Collection containing TableDefinitions to use when reconstituting the intermediates.</param>
-        /// <param name="suppressVersionCheck">Suppresses check for wix.dll version mismatch.</param>
-        /// <returns>The parsed Library.</returns>
-        private static Library Read(XmlReader reader, TableDefinitionCollection tableDefinitions, bool suppressVersionCheck)
-        {
-            if (!reader.LocalName.Equals("wixLibrary"))
-            {
-                throw new XmlException();
-            }
-
-            bool empty = reader.IsEmptyElement;
-            Library library = new Library();
-            Version version = null;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "version":
-                        version = new Version(reader.Value);
-                        break;
-                    case "id":
-                        library.id = reader.Value;
-                        break;
-                }
-            }
-
-            if (!suppressVersionCheck && null != version && !Library.CurrentVersion.Equals(version))
-            {
-                throw new WixException(WixDataErrors.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "library", version.ToString(), Library.CurrentVersion.ToString()));
-            }
-
-            if (!empty)
-            {
-                bool done = false;
-
-                while (!done && (XmlNodeType.Element == reader.NodeType || reader.Read()))
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "localization":
-                                    Localization localization = Localization.Read(reader);
-                                    library.localizations.Add(localization.Culture, localization);
-                                    break;
-                                case "section":
-                                    Section section = Section.Read(reader, tableDefinitions);
-                                    section.LibraryId = library.id;
-                                    library.sections.Add(section);
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            return library;
-        }
-
-        /// <summary>
-        /// Persists a library in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the library should persist itself as XML.</param>
-        private void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("wixLibrary", XmlNamespaceUri);
-
-            writer.WriteAttributeString("version", CurrentVersion.ToString());
-
-            writer.WriteAttributeString("id", this.id);
-
-            foreach (Localization localization in this.localizations.Values)
-            {
-                localization.Write(writer);
-            }
-
-            foreach (Section section in this.sections)
-            {
-                section.Write(writer);
-            }
-
-            writer.WriteEndElement();
-        }
-#endif
-    }
-}
diff --git a/src/WixToolset.Data/WarningMessages.cs b/src/WixToolset.Data/WarningMessages.cs
index a28b0fc3..edd06981 100644
--- a/src/WixToolset.Data/WarningMessages.cs
+++ b/src/WixToolset.Data/WarningMessages.cs
@@ -589,7 +589,7 @@ namespace WixToolset.Data
 
         public static Message DefiningWellKnownDirectoryDeprecated(SourceLineNumber sourceLineNumbers, string directoryId)
         {
-            return Message(null, Ids.DefiningWellKnownDirectoryDeprecated, "It is no longer necessary to define Directory with Id '{0}'. One will be provided automatically. Remove the Directory element.", directoryId);
+            return Message(sourceLineNumbers, Ids.DefiningWellKnownDirectoryDeprecated, "It is no longer necessary to define Directory with Id '{0}'. One will be provided automatically. Remove the Directory element.", directoryId);
         }
 
         public static Message TooManyProgIds(SourceLineNumber sourceLineNumbers, string clsId, string progId, string otherClsId)