Intermediate Check-in this MSA schema handles both old and new elements.

[mirror_edk2.git] / Tools / XMLSchema / FrameworkHeaders.xsd

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index a798526839f2cec129cdce7b3888e95cec7e9928..a68e260df966e7a253c36704b3e5afee8e1dc475 100644 (file)
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -108,32 +108,35 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:choice>\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="BaseName"/>\r
                     <!-- BaseName needs to be removed  -->\r
-                    <xs:element minOccurs="0" maxOccurs="1" name="ModuleName" type="xs:NCName"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="BaseName"/>\r
+                    <!-- ModuleName needs to be required -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" name="ModuleName" type="UiNameType"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="ComponentType"/>\r
                 <xs:choice>\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
                     <!-- Guid needs to be removed -->\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
                     <!-- GuidValue needs to be required -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                 </xs:choice>\r
+                <!-- Version needs to be a decimal in final -->\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
                 <xs:choice minOccurs="1" maxOccurs="1">\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
                     <!-- Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <!-- CreatedDate needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
-                    <!-- CreatedDate needs to be required -->\r
                 </xs:choice>\r
                 <xs:choice>\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                     <!-- Updated needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                    <!-- ModifiedDate needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="SupportedArchitectures">\r
@@ -141,8 +144,9 @@
                         <xs:list itemType="SupportedArchitectures"/>\r
                     </xs:simpleType>\r
                 </xs:element>\r
+                <xs:element default="false" minOccurs="0" name="BinaryModule" type="xs:boolean"/>\r
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
-                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r