Updated MsaFiles to be a choice of <Filename> [1..*] or <MsaFile> [1..*] and added...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@505 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 5e6bf5bcbf5a4d78e7a62de5d5a3dc7d4f0a6051..4fdd9883c36ea5e0951a2bf9cac789c817df5adb 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -132,6 +132,9 @@
         <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>\r
+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
         <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 69ff209f46473794e500192da38bee98965bb1e2..c6bf6b2d0982e3858b5c6469b22bbb1c86e99dcd 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -858,6 +858,7 @@
     <xs:element name="ModuleUnloadImage" type="xs:normalizedString"/>\r
     <xs:element name="MsaFiles">\r
         <xs:complexType>\r
+          <xs:choice minOccurs="1" maxOccurs="unbounded">\r
             <xs:sequence minOccurs="1">\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="MsaFile">\r
                     <xs:annotation>\r
@@ -892,6 +893,8 @@
                     </xs:complexType>\r
                 </xs:element>\r
             </xs:sequence>\r
+            <xs:element minOccurs="1" maxOccurs="unbounded" ref="Filename"/>\r
+          </xs:choice>\r
         </xs:complexType>\r
     </xs:element>\r
     <!-- Use in Final -->\r