From f680e915f065026efd0301a76fd524f87b8c5f06 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 19 Dec 2017 12:24:16 -0800
Subject: Simplify message handling

---
 src/WixToolset.Data/WindowsInstaller/Output.cs     |   2 +-
 src/WixToolset.Data/WindowsInstaller/Pdb.cs        |   2 +-
 .../WindowsInstaller/Rows/FileRow.cs               |   2 +-
 src/WixToolset.Data/WindowsInstaller/Table.cs      |   2 +-
 .../WindowsInstaller/TableDefinition.cs            |   2 +-
 .../WindowsInstaller/TableDefinitionCollection.cs  |   2 +-
 .../WixMissingTableDefinitionException.cs          |   2 +-
 .../WindowsInstaller/Xsd/libraries.xsd             |  66 ++++++++++
 .../WindowsInstaller/Xsd/objects.xsd               | 143 +++++++++++++++++++++
 .../WindowsInstaller/Xsd/outputs.xsd               |  66 ++++++++++
 src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd  |  32 +++++
 11 files changed, 314 insertions(+), 7 deletions(-)
 create mode 100644 src/WixToolset.Data/WindowsInstaller/Xsd/libraries.xsd
 create mode 100644 src/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
 create mode 100644 src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd
 create mode 100644 src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd

(limited to 'src/WixToolset.Data/WindowsInstaller')

diff --git a/src/WixToolset.Data/WindowsInstaller/Output.cs b/src/WixToolset.Data/WindowsInstaller/Output.cs
index 6164622d..7f2990f4 100644
--- a/src/WixToolset.Data/WindowsInstaller/Output.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Output.cs
@@ -165,7 +165,7 @@ namespace WixToolset.Data.WindowsInstaller
 
             if (!suppressVersionCheck && null != version && !Output.CurrentVersion.Equals(version))
             {
-                throw new WixException(WixDataErrors.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixOutput", version.ToString(), Output.CurrentVersion.ToString()));
+                throw new WixException(ErrorMessages.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixOutput", version.ToString(), Output.CurrentVersion.ToString()));
             }
 
             // loop through the rest of the xml building up the Output object
diff --git a/src/WixToolset.Data/WindowsInstaller/Pdb.cs b/src/WixToolset.Data/WindowsInstaller/Pdb.cs
index 41700b0d..d3fea0fe 100644
--- a/src/WixToolset.Data/WindowsInstaller/Pdb.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Pdb.cs
@@ -107,7 +107,7 @@ namespace WixToolset.Data.WindowsInstaller
 
             if (!suppressVersionCheck && null != version && !Pdb.CurrentVersion.Equals(version))
             {
-                throw new WixException(WixDataErrors.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixPdb", version.ToString(), Pdb.CurrentVersion.ToString()));
+                throw new WixException(ErrorMessages.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixPdb", version.ToString(), Pdb.CurrentVersion.ToString()));
             }
 
             // loop through the rest of the pdb building up the Output object
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
index 7fc34b3d..673d2315 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
@@ -179,7 +179,7 @@ namespace WixToolset.Data.WindowsInstaller.Rows
 
                 if (compressedFlag && noncompressedFlag)
                 {
-                    throw new WixException(WixDataErrors.IllegalFileCompressionAttributes(this.SourceLineNumbers));
+                    throw new WixException(ErrorMessages.IllegalFileCompressionAttributes(this.SourceLineNumbers));
                 }
                 else if (compressedFlag)
                 {
diff --git a/src/WixToolset.Data/WindowsInstaller/Table.cs b/src/WixToolset.Data/WindowsInstaller/Table.cs
index 7fcc1b31..ccdcb40b 100644
--- a/src/WixToolset.Data/WindowsInstaller/Table.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Table.cs
@@ -323,7 +323,7 @@ namespace WixToolset.Data.WindowsInstaller
 
                 if (primaryKeys.TryGetValue(primaryKey, out var collisionSourceLineNumber))
                 {
-                    throw new WixException(WixDataErrors.DuplicatePrimaryKey(collisionSourceLineNumber, primaryKey, this.Definition.Name));
+                    throw new WixException(ErrorMessages.DuplicatePrimaryKey(collisionSourceLineNumber, primaryKey, this.Definition.Name));
                 }
 
                 primaryKeys.Add(primaryKey, row.SourceLineNumbers);
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
index 518f0926..2fb655e5 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
@@ -175,7 +175,7 @@ namespace WixToolset.Data.WindowsInstaller
 
                 if (!unreal && !bootstrapperApplicationData && !hasPrimaryKeyColumn)
                 {
-                    throw new WixException(WixDataErrors.RealTableMissingPrimaryKeyColumn(SourceLineNumber.CreateFromUri(reader.BaseURI), name));
+                    throw new WixException(ErrorMessages.RealTableMissingPrimaryKeyColumn(SourceLineNumber.CreateFromUri(reader.BaseURI), name));
                 }
 
                 if (!done)
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
index 0954e9de..619a5206 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
@@ -59,7 +59,7 @@ namespace WixToolset.Data.WindowsInstaller
             {
                 if (!this.collection.TryGetValue(tableName, out var table))
                 {
-                    throw new WixMissingTableDefinitionException(WixDataErrors.MissingTableDefinition(tableName));
+                    throw new WixMissingTableDefinitionException(ErrorMessages.MissingTableDefinition(tableName));
                 }
 
                 return table;
diff --git a/src/WixToolset.Data/WindowsInstaller/WixMissingTableDefinitionException.cs b/src/WixToolset.Data/WindowsInstaller/WixMissingTableDefinitionException.cs
index 4b15c0e5..9f7e5fa8 100644
--- a/src/WixToolset.Data/WindowsInstaller/WixMissingTableDefinitionException.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WixMissingTableDefinitionException.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// Instantiate new WixMissingTableDefinitionException.
         /// </summary>
         /// <param name="error">Localized error information.</param>
-        public WixMissingTableDefinitionException(MessageEventArgs error)
+        public WixMissingTableDefinitionException(Message error)
             : base(error)
         {
         }
diff --git a/src/WixToolset.Data/WindowsInstaller/Xsd/libraries.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/libraries.xsd
new file mode 100644
index 00000000..a4504c01
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Xsd/libraries.xsd
@@ -0,0 +1,66 @@
+<?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/wixlib"
+              xmlns="http://wixtoolset.org/schemas/v4/wixlib"
+          xmlns:loc="http://wixtoolset.org/schemas/v4/wxl"
+         xmlns:objs="http://wixtoolset.org/schemas/v4/wixobj">
+    <xs:annotation>
+        <xs:documentation>
+            Schema for describing WiX Library files (.wixlib).
+        </xs:documentation>
+    </xs:annotation>
+
+    <xs:import namespace="http://wixtoolset.org/schemas/v4/wixobj" schemaLocation="objects.xsd" />
+
+    <xs:element name="wixLibrary">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="localization" minOccurs="0" maxOccurs="unbounded" />
+                <xs:element ref="objs:section" minOccurs="0" maxOccurs="unbounded" />
+            </xs:sequence>
+
+            <xs:attribute name="id" type="xs:string" use="required" />
+            <xs:attribute name="version" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Version of WiX used to create this library file</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+  <xs:element name="localization">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="string" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="ui" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+
+      <xs:attribute name="codepage" type="xs:string" use="required" />
+      <xs:attribute name="culture" type="xs:string" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="string">
+    <xs:complexType mixed="true">
+      <xs:attribute name="id" type="xs:string" use="required" />
+      <xs:attribute name="overridable" type="xs:string" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="ui">
+    <xs:complexType>
+      <xs:attribute name="dialog" type="xs:string" />
+      <xs:attribute name="control" type="xs:string" />
+      <xs:attribute name="x" type="xs:int" />
+      <xs:attribute name="y" type="xs:int" />
+      <xs:attribute name="width" type="xs:int" />
+      <xs:attribute name="height" type="xs:int" />
+      <xs:attribute name="rightToLeft" type="xs:string" />
+      <xs:attribute name="rightAligned" type="xs:string" />
+      <xs:attribute name="leftScroll" type="xs:string" />
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/src/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
new file mode 100644
index 00000000..5d95a59c
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
@@ -0,0 +1,143 @@
+<?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/wixobj"
+              xmlns="http://wixtoolset.org/schemas/v4/wixobj">
+    <xs:annotation>
+        <xs:documentation>
+            Schema for describing WiX Object files (.wixobj).
+        </xs:documentation>
+    </xs:annotation>
+
+    <xs:element name="wixObject">
+        <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="section" />
+            </xs:sequence>
+            <xs:attribute name="id" type="xs:string" use="required" />
+            <xs:attribute name="version" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Version of WiX used to create this object file.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="section">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="table" minOccurs="0" maxOccurs="unbounded" />
+            </xs:sequence>
+            <xs:attribute name="id" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Identifier for section (optional for Fragments)</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="type" type="SectionType" use="required">
+                <xs:annotation>
+                    <xs:documentation>Type of section</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="codepage" type="xs:integer" use="optional">
+                <xs:annotation>
+                    <xs:documentation>Codepage for output file, only valid on entry sections.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="table">
+        <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="row" />
+            </xs:sequence>
+            <xs:attribute name="name" type="TableNameType" use="required">
+                <xs:annotation>
+                    <xs:documentation>Name of table in Windows Installer database</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="op">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="add" />
+                        <xs:enumeration value="drop" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="row">
+        <xs:annotation>
+            <xs:documentation>Row in a table</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element ref="field" />
+            </xs:sequence>
+            <xs:attribute name="access">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="public" />
+                        <xs:enumeration value="internal" />
+                        <xs:enumeration value="protected" />
+                        <xs:enumeration value="private" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="op">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="add" />
+                        <xs:enumeration value="delete" />
+                        <xs:enumeration value="modify" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="redundant" type="YesNoType" />
+            <xs:attribute name="sectionId" type="xs:string" />
+            <xs:attribute name="sourceLineNumber" type="xs:string" />
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="field">
+        <xs:annotation>
+            <xs:documentation>Data for a particular field in a row.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:attribute name="cabinetFileId" type="xs:string" />
+            <xs:attribute name="modified" type="YesNoType" />
+            <xs:attribute name="previousData" type="xs:string" />
+           <xs:attribute name="unresolvedData" type="xs:string" />
+           <xs:attribute name="unresolvedPreviousData" type="xs:string" />
+            <xs:attribute name="previousCabinetFileId" type="xs:string" />
+        </xs:complexType>
+    </xs:element>
+
+    <xs:simpleType name="SectionType">
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="bundle"/>
+            <xs:enumeration value="fragment" />
+            <xs:enumeration value="module" />
+            <xs:enumeration value="product" />
+            <xs:enumeration value="patchCreation" />
+            <xs:enumeration value="patch" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="TableNameType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1" />
+            <xs:maxLength value="62" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="YesNoType">
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="yes" />
+            <xs:enumeration value="no" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd
new file mode 100644
index 00000000..00e20f12
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd
@@ -0,0 +1,66 @@
+<?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/wixout"
+              xmlns="http://wixtoolset.org/schemas/v4/wixout"
+         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).
+        </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:complexType>
+            <xs:sequence>
+                <xs:element ref="tbls:tableDefinitions" />
+                <xs:element ref="objs:table" maxOccurs="unbounded" />
+                <xs:element ref="subStorage" minOccurs="0" maxOccurs="unbounded" />
+            </xs:sequence>
+            <xs:attribute name="codepage" type="xs:unsignedInt">
+                <xs:annotation>
+                    <xs:documentation>Codepage of the output.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="type" use="required">
+                <xs:annotation>
+                    <xs:documentation>Type of the output.</xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                    <xs:restriction base="xs:NMTOKEN">
+                        <xs:enumeration value="Bundle" />
+                        <xs:enumeration value="Module" />
+                        <xs:enumeration value="Patch" />
+                        <xs:enumeration value="PatchCreation" />
+                        <xs:enumeration value="Product" />
+                        <xs:enumeration value="Transform" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="version" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Version of WiX used to create this output file.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="subStorage">
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="1">
+                <xs:element ref="wixOutput" />
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Name of the substorage.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd
new file mode 100644
index 00000000..c1d1756d
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd
@@ -0,0 +1,32 @@
+<?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>
-- 
cgit v1.2.3-55-g6feb