From 94da334adaafa4444fb278991aa01cce58d9f758 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 26 Oct 2019 13:35:15 -0700
Subject: Rename Output to WindowsInstallerData

---
 src/WixToolset.Data/WindowsInstaller/Xsd/data.xsd  | 66 ++++++++++++++++++++++
 .../WindowsInstaller/Xsd/outputs.xsd               | 66 ----------------------
 src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd  | 32 -----------
 3 files changed, 66 insertions(+), 98 deletions(-)
 create mode 100644 src/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
 delete mode 100644 src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd
 delete mode 100644 src/WixToolset.Data/WindowsInstaller/Xsd/pdbs.xsd

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

diff --git a/src/WixToolset.Data/WindowsInstaller/Xsd/data.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
new file mode 100644
index 00000000..a3dc7e2b
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Xsd/data.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/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 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="windowsInstallerData">
+        <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="windowsInstallerData" />
+            </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/outputs.xsd b/src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd
deleted file mode 100644
index 00e20f12..00000000
--- a/src/WixToolset.Data/WindowsInstaller/Xsd/outputs.xsd
+++ /dev/null
@@ -1,66 +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/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
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>
-- 
cgit v1.2.3-55-g6feb