X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkHeaders.xsd;h=7dd823aa1558cb28e43581710a52d658bfaa78f1;hb=1f0032d8b9afa0f8a270639bf3b6131d802ccac1;hp=ca8d13ca3c5c79d01d1ea639eeb09a06181c38f8;hpb=4688cb14d5ff74cd1ed6bdfcf314865989f596f5;p=mirror_edk2.git

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index ca8d13ca3c..7dd823aa15 100644
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -108,36 +108,45 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="BaseName"/>
                     <!-- BaseName needs to be removed  -->
-                    <xs:element minOccurs="0" maxOccurs="1" name="ModuleName" type="xs:NCName"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="BaseName"/>
+                    <!-- ModuleName needs to be required -->
+                    <xs:element minOccurs="0" maxOccurs="1" name="ModuleName" type="UiNameType"/>
                 </xs:choice>
                 <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="ComponentType"/>
                 <xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                     <!-- Guid needs to be removed -->
-                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                     <!-- GuidValue needs to be required -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                 </xs:choice>
+                <!-- Version needs to be a decimal in final -->
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
                     <!-- Created needs to be removed -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
+                    <!-- CreatedDate needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
-                    <!-- CreatedDate needs to be required -->
                 </xs:choice>
                 <xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
                     <!-- Updated needs to be removed -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                    <!-- ModifiedDate needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
                 </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="1" name="SupportedArchitectures">
+                    <xs:simpleType>
+                        <xs:list itemType="SupportedArchitectures"/>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element default="false" minOccurs="0" name="BinaryModule" type="xs:boolean"/>
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>
-                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -179,71 +188,80 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                     <!-- GuidValue needs to be required -->
                 </xs:choice>
+                <!-- Version needs to be xs:decimal in final -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
                     <!-- DO NOT USE Created needs to be removed -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
+                    <!-- DO NOT USE CreatedDate needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
-                    <!-- CreatedDate needs to be required -->
                 </xs:choice>
-                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy"/>
                 <!-- DO NOT USE CreatedBy needs to be removed -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy"/>
                 <xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
                     <!-- DO NOT USE Updated needs to be removed -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                    <!-- DO NOT USE ModifiedDate needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
                 </xs:choice>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>
                 <!-- DO NOT USE PackageType needs to be removed -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>
+                <!-- DO NOT USE BuildTarget needs to be removed -->
                 <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget" type="BuildTargets"/>
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
-                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     <xs:element name="SpdHeader">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This head is for the Surface Area Package Description file (SPD) The Guid may change when the contents of the file are changed.</xs:documentation>
+            <xs:documentation xml:lang="en">This head is for the Surface Area Package Description file (SPD)</xs:documentation>
+            <xs:documentation xml:lang="en">The Guid MUST change when the contents of the file undergo MAJOR FUNCTIONALITY changes.</xs:documentation>
+            <xs:documentation xml:lang="en">The Version MUST change when the contents of the file undergo MINOR FUNCTIONALITY changes.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="PackageName" type="UiNameType"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
+                    <!-- DO NOT USE! Guid needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
-                    <!-- Guid needs to be removed -->
-                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                     <!-- GuidValue needs to be required -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                 </xs:choice>
-                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="Version" type="xs:decimal"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
                     <!-- Created needs to be removed -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
+                    <!-- CreatedDate needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
-                    <!-- CreatedDate needs to be required -->
                 </xs:choice>
+                <!-- E_Mail needs to be removed -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>
                 <xs:choice minOccurs="0" maxOccurs="1">
+                    <!-- Updated needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
-                    <!-- Created needs to be removed -->
+                    <!-- UpdatedDate needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
-                    <!-- CreatedDate needs to be required -->
                 </xs:choice>
+                <!-- URL needs to be removed -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>
+                <!-- PackageType needs to be removed -->
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageType"/>
+                <!-- ReadOnly and RePackage remain in final -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
-                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>
                 <!-- OutputDirectory needs to be removed -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>