Rename Output to WindowsInstallerData

8 files changed, 30 insertions, 60 deletions

diff --git a/src/WixToolset.Data/WindowsInstaller/Field.cs b/src/WixToolset.Data/WindowsInstaller/Field.cs
index ac8df9a4..84e8d543 100644
--- a/src/WixToolset.Data/WindowsInstaller/Field.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Field.cs
@@ -275,7 +275,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="writer">XmlWriter where the Field should persist itself as XML.</param>
         internal virtual void Write(XmlWriter writer)
         {
-            writer.WriteStartElement("field", Output.XmlNamespaceUri);
+            writer.WriteStartElement("field", WindowsInstallerData.XmlNamespaceUri);
 
             if (this.Modified)
             {
diff --git a/src/WixToolset.Data/WindowsInstaller/ObjectField.cs b/src/WixToolset.Data/WindowsInstaller/ObjectField.cs
index 4e654dde..f10837c1 100644
--- a/src/WixToolset.Data/WindowsInstaller/ObjectField.cs
+++ b/src/WixToolset.Data/WindowsInstaller/ObjectField.cs
@@ -130,7 +130,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="writer">XmlWriter where the Field should persist itself as XML.</param>
         internal override void Write(XmlWriter writer)
         {
-            writer.WriteStartElement("field", Output.XmlNamespaceUri);
+            writer.WriteStartElement("field", WindowsInstallerData.XmlNamespaceUri);
 
             if (this.EmbeddedFileIndex.HasValue)
             {
diff --git a/src/WixToolset.Data/WindowsInstaller/Row.cs b/src/WixToolset.Data/WindowsInstaller/Row.cs
index a267f04b..a7a63d58 100644
--- a/src/WixToolset.Data/WindowsInstaller/Row.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Row.cs
@@ -354,7 +354,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="writer">XmlWriter where the Row should persist itself as XML.</param>
         internal void Write(XmlWriter writer)
         {
-            writer.WriteStartElement("row", Output.XmlNamespaceUri);
+            writer.WriteStartElement("row", WindowsInstallerData.XmlNamespaceUri);
 
             if (RowOperation.None != this.Operation)
             {
diff --git a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
index c1981f1b..6aae1dd8 100644
--- a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
+++ b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// </summary>
         /// <param name="name">The substorage name.</param>
         /// <param name="data">The substorage data.</param>
-        public SubStorage(string name, Output data)
+        public SubStorage(string name, WindowsInstallerData data)
         {
             this.Name = name;
             this.Data = data;
@@ -30,7 +30,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// Gets the substorage data.
         /// </summary>
         /// <value>The substorage data.</value>
-        public Output Data { get; }
+        public WindowsInstallerData Data { get; }
 
         /// <summary>
         /// Creates a SubStorage from the XmlReader.
@@ -44,7 +44,7 @@ namespace WixToolset.Data.WindowsInstaller
                 throw new XmlException();
             }
 
-            Output data = null;
+            WindowsInstallerData data = null;
             bool empty = reader.IsEmptyElement;
             string name = null;
 
@@ -69,8 +69,8 @@ namespace WixToolset.Data.WindowsInstaller
                         case XmlNodeType.Element:
                             switch (reader.LocalName)
                             {
-                                case "wixOutput":
-                                    data = Output.Read(reader, true);
+                                case WindowsInstallerData.XmlElementName:
+                                    data = WindowsInstallerData.Read(reader, true);
                                     break;
                                 default:
                                     throw new XmlException();
@@ -97,7 +97,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="writer">XmlWriter where the SubStorage should persist itself as XML.</param>
         internal void Write(XmlWriter writer)
         {
-            writer.WriteStartElement("subStorage", Output.XmlNamespaceUri);
+            writer.WriteStartElement("subStorage", WindowsInstallerData.XmlNamespaceUri);
 
             writer.WriteAttributeString("name", this.Name);
 
diff --git a/src/WixToolset.Data/WindowsInstaller/Table.cs b/src/WixToolset.Data/WindowsInstaller/Table.cs
index c7f2c8f2..3325dd8b 100644
--- a/src/WixToolset.Data/WindowsInstaller/Table.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Table.cs
@@ -291,7 +291,7 @@ namespace WixToolset.Data.WindowsInstaller
                 throw new ArgumentNullException("writer");
             }
 
-            writer.WriteStartElement("table", Output.XmlNamespaceUri);
+            writer.WriteStartElement("table", WindowsInstallerData.XmlNamespaceUri);
             writer.WriteAttributeString("name", this.Name);
 
             if (TableOperation.None != this.Operation)
diff --git a/src/WixToolset.Data/WindowsInstaller/Output.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
index ee46c159..0855997c 100644
--- a/src/WixToolset.Data/WindowsInstaller/Output.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
@@ -11,17 +11,19 @@ namespace WixToolset.Data.WindowsInstaller
     /// <summary>
     /// Output is generated by the linker.
     /// </summary>
-    public sealed class Output
+    public sealed class WindowsInstallerData
     {
-        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wixout";
+        internal const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/windowsinstallerdata";
+        internal const string XmlElementName = "windowsInstallerData";
+
         private static readonly Version CurrentVersion = new Version("4.0.0.0");
-        private const string WixOutputStreamName = "wix-wi.xml";
+        private const string WixOutputStreamName = "wix-wid.xml";
 
         /// <summary>
         /// Creates a new empty output object.
         /// </summary>
         /// <param name="sourceLineNumbers">The source line information for the output.</param>
-        public Output(SourceLineNumber sourceLineNumbers)
+        public WindowsInstallerData(SourceLineNumber sourceLineNumbers)
         {
             this.SourceLineNumbers = sourceLineNumbers;
             this.SubStorages = new List<SubStorage>();
@@ -64,7 +66,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="path">Path to output file saved on disk.</param>
         /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
         /// <returns>Output object.</returns>
-        public static Output Load(string path, bool suppressVersionCheck)
+        public static WindowsInstallerData Load(string path, bool suppressVersionCheck)
         {
             using (var wixout = WixOutput.Read(path))
             using (var stream = wixout.GetDataStream(WixOutputStreamName))
@@ -73,7 +75,7 @@ namespace WixToolset.Data.WindowsInstaller
                 try
                 {
                     reader.MoveToContent();
-                    return Output.Read(reader, suppressVersionCheck);
+                    return WindowsInstallerData.Read(reader, suppressVersionCheck);
                 }
                 catch (XmlException xe)
                 {
@@ -102,15 +104,15 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="reader">Reader to get data from.</param>
         /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
         /// <returns>The Output represented by the Xml.</returns>
-        internal static Output Read(XmlReader reader, bool suppressVersionCheck)
+        internal static WindowsInstallerData Read(XmlReader reader, bool suppressVersionCheck)
         {
-            if (!reader.LocalName.Equals("wixOutput"))
+            if (!reader.LocalName.Equals(WindowsInstallerData.XmlElementName))
             {
                 throw new XmlException();
             }
 
             var empty = reader.IsEmptyElement;
-            var output = new Output(SourceLineNumber.CreateFromUri(reader.BaseURI));
+            var output = new WindowsInstallerData(SourceLineNumber.CreateFromUri(reader.BaseURI));
             Version version = null;
 
             while (reader.MoveToNextAttribute())
@@ -151,9 +153,9 @@ namespace WixToolset.Data.WindowsInstaller
                 }
             }
 
-            if (!suppressVersionCheck && null != version && !Output.CurrentVersion.Equals(version))
+            if (!suppressVersionCheck && null != version && !WindowsInstallerData.CurrentVersion.Equals(version))
             {
-                throw new WixException(ErrorMessages.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixOutput", version.ToString(), Output.CurrentVersion.ToString()));
+                throw new WixException(ErrorMessages.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), WindowsInstallerData.XmlElementName, version.ToString(), WindowsInstallerData.CurrentVersion.ToString()));
             }
 
             // loop through the rest of the xml building up the Output object
@@ -227,7 +229,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>
         internal void Write(XmlWriter writer)
         {
-            writer.WriteStartElement("wixOutput", XmlNamespaceUri);
+            writer.WriteStartElement(WindowsInstallerData.XmlElementName, XmlNamespaceUri);
 
             writer.WriteAttributeString("type", this.Type.ToString());
 
@@ -236,7 +238,7 @@ namespace WixToolset.Data.WindowsInstaller
                 writer.WriteAttributeString("codepage", this.Codepage.ToString(CultureInfo.InvariantCulture));
             }
 
-            writer.WriteAttributeString("version", Output.CurrentVersion.ToString());
+            writer.WriteAttributeString("version", WindowsInstallerData.CurrentVersion.ToString());
 
             // Collect all the table definitions and write them.
             var tableDefinitions = new TableDefinitionCollection();
diff --git a/src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
index 00e20f12..a3dc7e2b 100644
--- a/src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd
+++ b/src/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
@@ -3,20 +3,20 @@
 
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://wixtoolset.org/schemas/v4/wixout"
-              xmlns="http://wixtoolset.org/schemas/v4/wixout"
+    targetNamespace="http://wixtoolset.org/schemas/v4/windowsinstallerdata"
+              xmlns="http://wixtoolset.org/schemas/v4/windowsinstallerdata"
          xmlns:objs="http://wixtoolset.org/schemas/v4/wixobj"
          xmlns:tbls="http://wixtoolset.org/schemas/v4/wi/tables">
     <xs:annotation>
         <xs:documentation>
-            Schema for describing WiX Output files (.wixout).
+            Schema for describing WiX Windows Installer Data files.
         </xs:documentation>
     </xs:annotation>
 
     <xs:import namespace="http://wixtoolset.org/schemas/v4/wixobj" schemaLocation="objects.xsd" />
     <xs:import namespace="http://wixtoolset.org/schemas/v4/wi/tables" schemaLocation="tables.xsd" />
 
-    <xs:element name="wixOutput">
+    <xs:element name="windowsInstallerData">
         <xs:complexType>
             <xs:sequence>
                 <xs:element ref="tbls:tableDefinitions" />
@@ -54,7 +54,7 @@
     <xs:element name="subStorage">
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="1">
-                <xs:element ref="wixOutput" />
+                <xs:element ref="windowsInstallerData" />
             </xs:sequence>
             <xs:attribute name="name" type="xs:string">
                 <xs:annotation>
diff --git a/src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd
deleted file mode 100644
index c1d1756d..00000000
--- a/src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://wixtoolset.org/schemas/v4/wixpdb"
-              xmlns="http://wixtoolset.org/schemas/v4/wixpdb"
-         xmlns:outs="http://wixtoolset.org/schemas/v4/wixout">
-    <xs:annotation>
-        <xs:documentation>
-            Schema for describing WiX Pdb files (.wixpdb).
-        </xs:documentation>
-    </xs:annotation>
-
-    <xs:import namespace="http://wixtoolset.org/schemas/v4/wixobj" schemaLocation="objects.xsd" />
-    <xs:import namespace="http://wixtoolset.org/schemas/v4/wixout" schemaLocation="outputs.xsd" />
-    <xs:import namespace="http://wixtoolset.org/schemas/v4/wi/tables" schemaLocation="tables.xsd" />
-
-    <xs:element name="wixPdb">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element ref="outs:wixOutput" minOccurs="0" maxOccurs="unbounded" />
-            </xs:sequence>
-
-            <xs:attribute name="version" type="xs:string" use="required">
-                <xs:annotation>
-                    <xs:documentation>Version of WiX used to create this pdb file</xs:documentation>
-                </xs:annotation>
-            </xs:attribute>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>