Rename Output to WindowsInstallerData

2 files changed, 5 insertions, 37 deletions

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>