9 files changed, 0 insertions, 2449 deletions
diff --git a/BaseTools/Conf/XMLSchema/FarManifest.xsd b/BaseTools/Conf/XMLSchema/FarManifest.xsd
deleted file mode 100644
index 6e8c34ae9a..0000000000
--- a/BaseTools/Conf/XMLSchema/FarManifest.xsd
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Filename: FarManifest.xsd
-
-Copyright (c) 2007, Intel Corporation. All rights reserved.
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which may be found at http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">
-  <xs:include schemaLocation="FrameworkHeaders.xsd"/>  
-  <xs:annotation>
-    <xs:documentation xml:lang="en">
-      The Framework Archive File Format is defined as a Java Archive file, with a special xml file called FrameworkArchiveManifest.xml at the top of the archive. The FrameworkArchiveManifest.xml must be an instance of this schema.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:element name="FrameworkArchiveManifest">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        This schema defines the Framework Archive Manifest. 
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="FarHeader"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="FarPackageList">   
-          <xs:annotation>
-            <xs:documentation>
-              The list of packages in this FAR.
-            </xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Contents">   
-          <xs:annotation>
-            <xs:documentation>
-              Extra contents that are not part of any Package. These file paths are WORKSPACE relative.  If a file exists in the workspace at this location, then the user should be asked whether to overwrite.  When the user removes the far, these should be removed also, unless they have been modified (per md5sum).
-            </xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="FarPackageList">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" ref="FarPackage"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="FarPackage">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="FarFilename">
-          <xs:annotation>
-            <xs:documentation>
-              This is the name of the .spd or file that describes the package. It must exist in the directory identified by DefaultPath.
-            </xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="GuidValue"></xs:element>
-        <xs:element ref="Version"></xs:element>
-        <xs:element ref="DefaultPath">
-          <xs:annotation>
-            <xs:documentation>
-              This is the default installation location within the workspace. This also serves as the location within the far itself of the package root. The Contents of the pacakage will be found there. The user may choose some other location within the workspace to install the package, as long as it does not overlap a package that is already installed.
-            </xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="Contents">
-          <xs:annotation>
-            <xs:documentation>
-              This is the list of files that belong to the package. They are specified by relative path from the root of the pacakge.                            
-            </xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"></xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DefaultPath" type="PathAndFilename"/>
-  <xs:element name="FarFilename" type="DbPathAndFilename">
-    <xs:annotation>
-      <xs:documentation>
-        The FarFilename is used to build up the Contents list. It has an md5sum attribute for keeping track of whether the file is changed after it is installed. The Md5sum can also be used to check the integrity of a far before it is installed into the workspace.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="GuidValue" type="GuidType">
-    <xs:annotation>
-      <xs:documentation>
-        The purpose of this element is to allow Guids to be assigned to or used by other elements in the schema.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Contents">
-    <xs:annotation>
-      <xs:documentation>
-        This tag allows us to specify a tree of files all having a common root. All the files specified are relative to that common root.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="FarFilename"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:annotation>
-    <xs:documentation xml:lang="en">
-      Definitions and rules for creating, installing, updating and removing fars within the workspace.
-    </xs:documentation>
-    <xs:documentation>
-      1.  A module m is said to depend upon a package p, iff there exists a tuple (PackageGuid, PackageVerion) in the set m->PackageDependencies for which p->Guid==PackageGuid, and if PackageVersion is not empty, then p->Version== PackageVersion.
-    </xs:documentation>
-    <xs:documentation>
-      2.  A far f is said to depend on a far g, iff there is a module in a package in f that depends on a package in g.
-    </xs:documentation>
-    <xs:documentation>
-      3.  A far f is said to depend on a package p, iff there is a module m contained in f that depends on p.
-    </xs:documentation>
-    <xs:documentation>
-      4.  A far f may be installed into the workspace w, iff for each module m in f, m's dependencies are met by the packages in w or f.
-    </xs:documentation>
-    <xs:documentation>
-      a.  It is supported to "partially" install a far. A partial installation of a far means that 1 or more packages are installed into the workspace from the far. For each package p in f, p's dependencies must be satisfied by a package in the workspace.
-    </xs:documentation>
-    <xs:documentation>
-      5.  A far f may be removed from the workspace w, iff for each module m in w, and for each package p in f, m does not depend on p.
-    </xs:documentation>
-    <xs:documentation>
-      a.  It is supported to "partially" remove a far. In this case, one or more of the packages in the far can be removed, provided that for each package p in the workspace w, there does not exist a module m such that m depends on p.
-    </xs:documentation>
-    <xs:documentation>
-      6.  When installing a far f into workspace w, for each package p in f, allow the user to install in p's default location, or choose a new location l (which must be unoccupied) within the workspace. Record this location l in the database. Each package p in f will be recorded in the database, associated with the GUID of f, as well as the actual install location l. (So we will know which far each package belongs to.)
-    </xs:documentation>
-    <xs:documentation>
-      7.  When installing a far f into workspace w, if there exists a package p in w, and p is in f, then the user must be prompted to choose a location that does not collide with the location of p in workspace w. We will end up with two instances of p in w at two distinct locations. Alternately, the user may elect to partially install the far, leaving out the redundant package.
-    </xs:documentation>
-    <xs:documentation>
-      8.  A far f may replace a far g in the workspace w, iff for each module m contained in w, if m depends on a package p, and p is only contained in g, then there must exist a package q in f, such that m depends on q. The net effect is that g is removed and f is installed, in one operation. The normal rules for installing f still apply--the dependencies of the modules of f must be satisfied. After the replacement, it must be the case that all the modules dependencies in the workspace are satisfied. Note that it is possible to backrev a package in this way. 
-    </xs:documentation>
-    <xs:documentation>
-          (If we find that the replace is not permitted, then the user may install f and keep g. Next, he could _port_ every module m in w that depends on g, to f and eventually remove g.)
-    </xs:documentation>
-    <xs:documentation>
-      9.  A special case of the above rule is that a far f may be reinstalled into the workspace. (This would allow the user to get a fresh copy, or change the location in the workspace where one or more of the packages of f are installed.)
-    </xs:documentation>
-    <xs:documentation>
-      10. When a far f is removed from the workspace w, for each package p in f, we will remove p from w.
-    </xs:documentation>
-    <xs:documentation>
-      11. If a package p belongs to a far f, then it is legal to remove p from the workspace w iff, there does not exist a module m in w such that m depends on p.
-    </xs:documentation>
-    <xs:documentation>
-      12. When a far f is removed from the workspace, the we will remove all the files in f from the workspace tree. If a file has been modified from the original as installed from the far (per md5sum) then the user should be asked if he is "sure" he wants to remove it.
-    </xs:documentation>
-    <xs:documentation>
-      13. When a far is created, a GUID is generated and assigned to the far. If a far is created from the same components at a later time, it would have a different GUID.
-    </xs:documentation>
-    <xs:documentation>
-      14. If a package p is marked with p->RePackage==false, then p may not be added to a far.
-    </xs:documentation>
-    <xs:documentation>
-      15. A far f is identical to a far g, iff f->Guid == g->Guid.
-    </xs:documentation>
-    <xs:documentation>
-      17. A far f may be installed into the workspace w, iff there is no far g in w such that f->Guid==g->Guid. In that case, it is called "updating" the far in the workspace. The user may select some subset of packages to reinstall or update, to ensure that the files in the workspace are correct.
-    </xs:documentation>
-  </xs:annotation>
-</xs:schema>
diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
deleted file mode 100644
index eeb48d9a8a..0000000000
--- a/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2007/Edk2.1" targetNamespace="http://www.TianoCore.org/2007/Edk2.1">
-  <!--
-    Filename: FrameworkDataAttributes.xsd
-    
-    Copyright (c) 2007, Intel Corporation. All rights reserved.
-    This program and the accompanying materials
-    are licensed and made available under the terms and conditions of the BSD License
-    which may be found at http://opensource.org/licenses/bsd-license.php
-    
-    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    
-  -->
-  <xs:annotation>
-    <xs:documentation xml:lang="en">This schema defines EFI and Framework Attribute. Only attributeGroups are specified in this file. </xs:documentation>
-  </xs:annotation>
-  <xs:include schemaLocation="NamingConvention.xsd"/>
-  <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
-  <!-- Fix Name data type from xs:string -->
-  <xs:attributeGroup name="BinaryFileAttributes">
-    <xs:attribute name="FileType" type="BinFileType" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="Target" type="ToolsNameConvention" use="optional"/>
-    <xs:attribute name="TagName" type="ToolsNameConvention" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="BootModeAttributes">
-    <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>
-    <xs:attribute name="Usage" type="BootModeUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="DataHubAttributes">
-    <xs:attribute name="Usage" type="DataHubUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="EventAttributes">
-    <xs:attribute name="Usage" type="EventUsage" use="required"/>
-    <xs:attribute name="EventGuidCName" type="C_NameType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="ExternAttributes">
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="FilenameAttributes">
-    <xs:attribute name="TagName" type="ToolsNameConvention" use="optional"/>
-    <xs:attribute name="ToolCode" type="ToolsNameConvention" use="optional"/>
-    <xs:attribute name="ToolChainFamily" type="ToolsNameConvention" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="GuidAttributes">
-    <xs:attribute name="Usage" type="GuidUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="GuidDeclarationAttributes">
-    <xs:attribute name="Name" type="UiNameType" use="required"/>
-    <xs:attribute name="GuidTypeList" type="GuidListType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="HiiPackageAttributes">
-    <xs:attribute name="Usage" type="HiiPackageUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="HobAttributes">
-    <xs:attribute name="Usage" type="HobUsage" use="required"/>
-    <xs:attribute name="HobGuidCName" type="C_NameType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="IncludeHeaderAttributes">
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="IndustryStdHeaderAttributes">
-    <xs:attribute name="Name" type="KeywordType" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="LibraryClassAttributes">
-    <xs:attribute name="Usage" type="LibraryUsage" use="required"/>
-    <xs:attribute name="RecommendedInstanceVersion" type="VersionDataType" use="optional"/>
-    <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="LibraryClassDeclarationAttributes">
-    <xs:attribute name="Name" type="KeywordType" use="required"/>
-    <xs:attribute name="RecommendedInstanceVersion" type="VersionDataType" use="optional"/>
-    <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="OptionAttributes">
-    <xs:attribute name="BuildTargets" type="BuildTargetList" use="optional"/>
-    <xs:attribute name="ToolChainFamily" type="ToolsNameConvention" use="optional"/>
-    <xs:attribute name="TagName" type="ToolsNameConvention" use="optional"/>
-    <xs:attribute name="ToolCode" type="ToolsNameConvention" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="PackageHeaderAttributes">
-    <xs:attribute name="ModuleType" type="ModuleTypeDef" use="required"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="PackageAttributes">
-    <!-- Used with the MSA File, PackageDependencies.Package -->
-    <xs:attribute name="PackageGuid" type="GuidType" use="required"/>
-    <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="PackageNameAttributes">
-    <!--Used with the FrameworkDatabase PackageList.Packagename  -->
-    <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>
-    <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-  </xs:attributeGroup>
-   <xs:attributeGroup name="PcdCodedAttributes">
-    <!-- We need to modify ALL the MSA files that have PcdCoded sections to 
-      set the PcdUsage.  Once we modify all the MSA files and we modify the 
-      wizard and the build tools, we need to make this required. -->
-    <xs:attribute name="Usage" type="PcdUsage" use="optional"/>
-    <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="PcdDeclarationAttributes">
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="PpiDeclarationAttributes">
-    <xs:attribute name="Name" type="UiNameType" use="required"/>
-    <xs:attribute name="GuidTypeList" type="GuidListType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="PpiAttributes">
-    <xs:attribute name="Usage" type="PpiUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="PpiNotifyAttributes">
-    <xs:attribute name="Usage" type="PpiNotifyUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="ProtocolAttributes">
-    <xs:attribute name="Usage" type="ProtocolUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="ProtocolDeclarationAttributes">
-    <xs:attribute name="Name" type="UiNameType" use="required"/>
-    <xs:attribute name="GuidTypeList" type="GuidListType" use="optional"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="ProtocolNotifyAttributes">
-    <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="SystemTableAttributes">
-    <xs:attribute name="Usage" type="SystemTableUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="VariableAttributes">
-    <xs:attribute name="Usage" type="VariableUsage" use="required"/>
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
deleted file mode 100644
index e094c1b626..0000000000
--- a/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
+++ /dev/null
@@ -1,728 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2007/Edk2.1" targetNamespace="http://www.TianoCore.org/2007/Edk2.1">
-  <!--
-    Filename: FrameworkDataElements.xsd
-    
-    Copyright (c) 2007, Intel Corporation. All rights reserved.
-    This program and the accompanying materials
-    are licensed and made available under the terms and conditions of the BSD License
-    which may be found at http://opensource.org/licenses/bsd-license.php
-    
-    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    
-  -->
-  <xs:annotation>
-    <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>
-  </xs:annotation>
-  <xs:include schemaLocation="NamingConvention.xsd"/>
-  <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
-    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>
-  <xs:element name="Abstract" type="Sentence">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>
-      <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="BootModes">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">BootModes is valid for all Description Files</xs:documentation>
-      <xs:documentation xml:lang="en">This is a list of BootModes Supported by the Module</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="BootMode">
-          <xs:complexType>
-            <xs:sequence minOccurs="0">
-              <xs:element name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="BootModeAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-   <xs:element name="Copyright" type="Paragraph"/>
-  <xs:element name="DataHubs">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is a list of DataHubRecord elements.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="DataHubRecord">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="DataHubCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="DataHubAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DefaultValue">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">The default setting of a PCD entry.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="xs:normalizedString"/>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Depex">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This section is used to describe the DXE or PEI Dependency code</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="Define" type="xs:normalizedString"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="Expression" type="xs:string"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Description" type="Paragraph">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This section is required for new modules and libraries and must contain more information than the Abstract.</xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="BinaryFiles">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Multiple Filenames may be specified, and they may also be scoped to a specific Architecture.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename">
-          <xs:complexType>
-            <xs:simpleContent>
-              <xs:extension base="PathAndFilename"> 
-                <xs:attributeGroup ref="BinaryFileAttributes"/>
-              </xs:extension>
-            </xs:simpleContent>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-   <xs:element name="Events">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is a list of MSA Events</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="1" name="CreateEvents">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="unbounded" name="EventTypes">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>
-                    <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-                  </xs:sequence>
-                  <xs:attributeGroup ref="EventAttributes"/>
-                </xs:complexType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element minOccurs="0" maxOccurs="1" name="SignalEvents">
-          <xs:annotation>
-            <xs:documentation xml:lang="en">Module has an event that is waiting to be signaled. Event is named by GUID.</xs:documentation>
-          </xs:annotation>
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="unbounded" name="EventTypes">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>
-                    <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-                  </xs:sequence>
-                  <xs:attributeGroup ref="EventAttributes"/>
-                </xs:complexType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Externs">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is a child of MSA files.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence minOccurs="1">
-        <xs:element minOccurs="0" maxOccurs="1" name="PcdIsDriver" type="PcdDriverTypes"/>
-        <xs:element minOccurs="0" maxOccurs="1" name="TianoR8FlashMap_h" type="xs:boolean" default="false"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="Specification" type="Sentence"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">
-          <xs:complexType>
-            <xs:choice minOccurs="1" maxOccurs="1">
-              <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:annotation>
-                  <xs:documentation xml:lang="en">Driver Module</xs:documentation>
-                </xs:annotation>
-                <xs:element minOccurs="0" maxOccurs="1" name="ModuleEntryPoint" type="C_NameType"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="ModuleUnloadImage" type="C_NameType"/>
-              </xs:sequence>
-              <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:annotation>
-                  <xs:documentation xml:lang="en">Library Module</xs:documentation>
-                </xs:annotation>
-                <xs:element minOccurs="0" maxOccurs="1" name="Constructor" type="C_NameType"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="Destructor" type="C_NameType"/>
-              </xs:sequence>
-              <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:annotation>
-                  <xs:documentation xml:lang="en">Allow multiple entries for DriverBinding, ComponentName, DriverConfig and DriverDiag elements. For ComponentName, DriverConfig and/or DriverDiag - you must have a 1:1 mapping to DriverBinding if the element is defined.</xs:documentation>
-                  <xs:documentation xml:lang="en">Permit User Defined Extern Tags</xs:documentation>
-                </xs:annotation>
-                <xs:element minOccurs="1" maxOccurs="1" name="DriverBinding" type="C_NameType"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="ComponentName" type="C_NameType"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="DriverConfig" type="C_NameType"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="DriverDiag" type="C_NameType"/>
-              </xs:sequence>
-              <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:annotation>
-                  <xs:documentation xml:lang="en"> Module Call Backs</xs:documentation>
-                </xs:annotation>
-                <xs:element minOccurs="0" maxOccurs="1" name="SetVirtualAddressMapCallBack" type="C_NameType"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="ExitBootServicesCallBack" type="C_NameType"/>
-              </xs:sequence>
-            </xs:choice>
-            <xs:attributeGroup ref="ExternAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Filename">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Describe the valid content of a filename This should extend PathAndFilename - Variable names not allowed here!</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="PathAndFilename">
-          <xs:attributeGroup ref="FilenameAttributes"/>
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Filenames">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is a list of Filenames</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence minOccurs="1">
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="GuidDeclarations">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is a child of PackageSurfaceArea (SPD) </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="GuidDeclarationAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Guids">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="GuidCNames">
-          <xs:annotation>
-            <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>
-          </xs:annotation>
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="GuidCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="GuidAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="HiiPackages">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Describe the list of a HiiPackage elements</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="HiiPackage">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="HiiCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="HiiPackageAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Hobs">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="HobTypes">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="HobType" type="HobTypes"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="HobAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="IncludeHeader">
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="PathAndFilename">
-          <xs:attributeGroup ref="IncludeHeaderAttributes"/>
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="IndustryStdIncludes">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" ref="IndustryStdHeader"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="IndustryStdHeader">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="IncludeHeader" type="PathAndFilename"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="IndustryStdHeaderAttributes"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LibraryClass">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Used in MSA files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="Keyword" type="KeywordType"/>
-        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="LibraryClassAttributes"/>
-    </xs:complexType>
-  </xs:element>
-  <!-- LAH This is SPD LibraryClassDeclarations FINAL version -->
-  <xs:element name="LibraryClassDeclarations">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="LibraryClass">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="IncludeHeader" type="PathAndFilename"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="LibraryClassDeclarationAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LibraryClassDefinitions">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This section defines what Classes of Library that this library supports. A Library may belong to multiple different library classes.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" ref="LibraryClass"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="License">
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="Paragraph">
-          <xs:attribute name="URL" type="xs:anyURI" use="optional"/>
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ModuleBuildOptions">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ModuleDefinitions">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="SupportedArchitectures" type="ArchListType"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="BinaryModule" type="xs:boolean" default="false"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="OutputFileBasename" type="FileNameConvention"/>
-        <xs:element minOccurs="0" maxOccurs="1" name="ClonedFrom">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="unbounded" name="Cloned">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element minOccurs="1" maxOccurs="1" name="PackageGuid" type="GuidType"/>
-                    <xs:element minOccurs="1" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>
-                    <xs:element minOccurs="1" maxOccurs="1" name="ModuleGuid" type="GuidType"/>
-                    <xs:element minOccurs="1" maxOccurs="1" name="ModuleVersion" type="VersionDataType"/>
-                  </xs:sequence>
-                  <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->
-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>
-                  <!-- If the original module was installed from a FAR, track the FAR it came from. -->
-                  <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
-                </xs:complexType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ModuleType" type="ModuleTypeDef">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Describe the valid EFI Phase that the Module is designed to execute under.</xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- Use in Final -->
-  <xs:element name="MsaFiles">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">MsaFiles is a child of Surface Area Package Description (SPD) files</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename" type="PathAndFilename"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Options">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" ref="Option"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NonProcessedFiles">
-    <xs:complexType>
-      <xs:sequence minOccurs="1" maxOccurs="unbounded">
-        <xs:element name="Filename" type="PathAndFilename"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Option">
-    <!-- This element is used to store flags from the Tools -->
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="xs:normalizedString">
-          <xs:attributeGroup ref="OptionAttributes"/>
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PackageDefinitions">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="ReadOnly" type="xs:boolean" default="false"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="RePackage" type="xs:boolean" default="false"/>
-        <xs:element minOccurs="0" maxOccurs="1" name="ClonedFrom">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="unbounded" name="Cloned">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element minOccurs="1" maxOccurs="1" name="PackageGuid" type="GuidType"/>
-                    <xs:element minOccurs="1" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>
-                  </xs:sequence>
-                  <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->
-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>
-                  <!-- If the original Package was installed from a FAR, track the FAR it came from. -->
-                  <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
-                </xs:complexType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PackageDependencies">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This tag is used in the Module Surface Area Description File (MSA) to track package dependencies for a module.</xs:documentation>
-      <xs:documentation xml:lang="en">Attributes to PackageName include Required: Usage PackageGuid PackageVesion, Optional: FeatureFlag</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Package">
-          <xs:complexType>
-            <xs:attributeGroup ref="PackageAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PackageHeaders">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">PackageHeaders is a child of PackageSurfaceArea (SPD) </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="IncludePkgHeader">
-          <xs:complexType>
-            <xs:simpleContent>
-              <xs:extension base="PathAndFilename">
-                <xs:attributeGroup ref="PackageHeaderAttributes"/>
-              </xs:extension>
-            </xs:simpleContent>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PackageList">
-    <!-- Valid for DB usage only! -->
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all packages (SPD files) installed in a workspace. (Database)</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename">
-          <xs:complexType>
-            <xs:simpleContent>
-              <xs:extension base="PathAndFilename"> 
-                <xs:attributeGroup ref="PackageNameAttributes"/>
-              </xs:extension>
-            </xs:simpleContent>
-          </xs:complexType>
-          </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PcdCoded">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="PcdEntry">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->
-            <xs:attributeGroup ref="PcdCodedAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <!-- LAH This is PcdDeclarations FINAL version -->
-  <xs:element name="PcdDeclarations">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">PcdDeclaratins is a child of Package Surface Area Description (SPD)</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence minOccurs="1">
-        <xs:element maxOccurs="unbounded" name="PcdEntry">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="PcdDeclarationAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="FarList">
-    <!-- Valid for DB usage only! -->
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all DISTRIBUTION packages (FAR files) installed in a workspace. (Database)</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename" type="DbPathAndFilename"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PpiDeclarations">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">PpiDeclarations is a child of PackageSurfaceArea (SPD) </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="PpiDeclarationAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PPIs">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Provide for one or more Ppi or PpiNotify sections. </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence minOccurs="1">
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="Ppi">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="PpiCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="PpiAttributes"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="PpiNotify">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="PpiNotifyCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="PpiNotifyAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ProtocolDeclarations">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">ProtocolDeclarations is a child of PackageSurfaceArea (SPD) </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="ProtocolDeclarationAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Protocols">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">If either Protocol or ProtocolNotify sections are needed, one or more of them should be specified within this section</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="ProtocolCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="ProtocolAttributes"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="ProtocolNotifyCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="ProtocolNotifyAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SourceFiles">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Multiple Filenames may be specified, and they may also be scoped to a specific Architecture.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" ref="Filename"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SystemTables">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is list of System Table elements.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="SystemTableCNames">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="SystemTableCName" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="SystemTableAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="UserExtensions">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
-      </xs:sequence>
-      <xs:attribute name="UserID" type="xs:NCName" use="required"/>
-      <xs:attribute name="Identifier" type="xs:string" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Variables">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">An MSA FILE list of EFI Variables described by string pair.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Variable">
-          <xs:annotation>
-            <xs:documentation xml:lang="en">This is an EFI Variable Entry</xs:documentation>
-          </xs:annotation>
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="HexWordArrayType"/>
-              <xs:element minOccurs="1" maxOccurs="1" name="GuidC_Name" type="C_NameType"/>
-              <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="VariableAttributes"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Version" type="VersionDataType"/>
-</xs:schema>
diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
deleted file mode 100644
index 9a46a02a2e..0000000000
--- a/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
+++ /dev/null
@@ -1,581 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2007/Edk2.1" targetNamespace="http://www.TianoCore.org/2007/Edk2.1">
-  <!--
-    Filename: FrameworkDataTypes.xsd
-    
-    Copyright (c) 2007, Intel Corporation. All rights reserved.
-    This program and the accompanying materials
-    are licensed and made available under the terms and conditions of the BSD License
-    which may be found at http://opensource.org/licenses/bsd-license.php
-    
-    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    
-  -->
-  <xs:annotation>
-    <xs:documentation xml:lang="en">This schema defines EFI and Framework Data Types. Only simpleType are specified in this file. </xs:documentation>
-  </xs:annotation>
-  <xs:include schemaLocation="NamingConvention.xsd"/>
-  <xs:simpleType name="PrimaryArchListType">
-    <xs:list itemType="SupportedArchitectures"/>
-  </xs:simpleType>
-  <xs:simpleType name="ArchListType">
-    <xs:restriction base="PrimaryArchListType">
-      <xs:minLength value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="BinFileType">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="LIB"/>
-      <xs:enumeration value="UNI_UI"/>
-      <xs:enumeration value="UNI_VER"/>
-      <xs:enumeration value="PE32"/>
-      <xs:enumeration value="FW"/>
-      <xs:enumeration value="GUID"/>
-      <xs:enumeration value="FREEFORM"/>
-      <xs:enumeration value="UEFI_APP"/>
-      <xs:enumeration value="PIC"/>
-      <xs:enumeration value="PEI_DEPEX"/>
-      <xs:enumeration value="DXE_DEPEX"/>
-      <xs:enumeration value="TE"/>
-      <xs:enumeration value="VER"/>
-      <xs:enumeration value="UI"/>
-      <xs:enumeration value="BIN"/>
-      <xs:enumeration value="FV"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="BlockNameType">
-    <xs:restriction base="UCNameType">
-      <xs:pattern value="\s*BLOCK[A-F0-9]{2}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="BootModeNames">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="FULL"/>
-      <xs:enumeration value="MINIMAL"/>
-      <xs:enumeration value="NO_CHANGE"/>
-      <xs:enumeration value="DIAGNOSTICS"/>
-      <xs:enumeration value="DEFAULT"/>
-      <xs:enumeration value="S2_RESUME"/>
-      <xs:enumeration value="S3_RESUME"/>
-      <xs:enumeration value="S4_RESUME"/>
-      <xs:enumeration value="S5_RESUME"/>
-      <xs:enumeration value="FLASH_UPDATE"/>
-      <xs:enumeration value="RECOVERY_FULL"/>
-      <xs:enumeration value="RECOVERY_MINIMAL"/>
-      <xs:enumeration value="RECOVERY_NO_CHANGE"/>
-      <xs:enumeration value="RECOVERY_DIAGNOSTICS"/>
-      <xs:enumeration value="RECOVERY_DEFAULT"/>
-      <xs:enumeration value="RECOVERY_S2_RESUME"/>
-      <xs:enumeration value="RECOVERY_S3_RESUME"/>
-      <xs:enumeration value="RECOVERY_S4_RESUME"/>
-      <xs:enumeration value="RECOVERY_S5_RESUME"/>
-      <xs:enumeration value="RECOVERY_FLASH_UPDATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="BootModeUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="BuildTargetList">
-    <xs:restriction base="BuildTargetUList">
-      <xs:minLength value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="BuildTargetUList">
-    <xs:list itemType="BrUType"/>
-  </xs:simpleType>
-  <xs:simpleType name="BrUType">
-    <xs:union memberTypes="BrType UCNameType"/>
-  </xs:simpleType>
-  <xs:simpleType name="BrType">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="DEBUG"/>
-      <xs:enumeration value="RELEASE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ComponentExecutionPhase">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="MDE"/>
-      <xs:enumeration value="SEC"/>
-      <xs:enumeration value="PEI_CORE"/>
-      <xs:enumeration value="PEIM"/>
-      <xs:enumeration value="DXE_CORE"/>
-      <xs:enumeration value="DXE_DRIVER"/>
-      <xs:enumeration value="DXE_RUNTIME_DRIVER"/>
-      <xs:enumeration value="DXE_SAL_DRIVER"/>
-      <xs:enumeration value="DXE_SMM_DRIVER"/>
-      <xs:enumeration value="UEFI"/>
-      <xs:enumeration value="UEFI_APPLICATION"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="DataHubUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="DatumSizeLimitation">
-    <xs:restriction base="xs:nonNegativeInteger">
-      <xs:maxExclusive value="13777216"/>
-      <xs:pattern value="(\s)*[1-9][0-9]*(\s)*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="DefaultValueType">
-    <xs:union memberTypes="xs:normalizedString Hex64BitDataType UnicodeString HexByteArrayType"/>
-  </xs:simpleType>
-  <xs:simpleType name="EfiSectionType">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="EFI_SECTION_FREEFORM_SUBTYPE_GUID"/>
-      <xs:enumeration value="EFI_SECTION_VERSION"/>
-      <xs:enumeration value="EFI_SECTION_USER_INTERFACE"/>
-      <xs:enumeration value="EFI_SECTION_DXE_DEPEX"/>
-      <xs:enumeration value="EFI_SECTION_PEI_DEPEX"/>
-      <xs:enumeration value="EFI_SECTION_PE32"/>
-      <xs:enumeration value="EFI_SECTION_PIC"/>
-      <xs:enumeration value="EFI_SECTION_TE"/>
-      <xs:enumeration value="EFI_SECTION_RAW"/>
-      <xs:enumeration value="EFI_SECTION_COMPRESSION"/>
-      <xs:enumeration value="EFI_SECTION_GUID_DEFINED"/>
-      <xs:enumeration value="EFI_SECTION_COMPATIBILITY16"/>
-      <xs:enumeration value="EFI_SECTION_FIRMWARE_VOLUME_IMAGE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="EventTypes">
-    <xs:restriction base="UCNameType">
-       <xs:enumeration value="EVENT_GROUP_GUID"/>
-      <xs:enumeration value="EVENT_TYPE_PERIODIC_TIMER"/>
-      <xs:enumeration value="EVENT_TYPE_RELATIVE_TIMER"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="EventUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ExecutionType">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="REL" id="Relocatable"/>
-      <xs:enumeration value="NREL" id="Non-Relocatable"/>
-      <xs:enumeration value="XIP" id="Execute_In_Place"/>
-      <xs:enumeration value="PIC" id="Position_Independent_Code"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ExternType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:minLength value="1"/>
-      <!--<xs:pattern value="((\w)+(\W)*(\s)*)+"/>-->
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ExternUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="FileNameUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="FeatureFlagExpressionType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:minLength value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="FrameworkComponentListType">
-    <xs:list itemType="FrameworkComponentTypes"/>
-  </xs:simpleType>
-  <xs:simpleType name="FrameworkComponentTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="APRIORI"/>
-      <xs:enumeration value="SEC"/>
-      <xs:enumeration value="LIBRARY"/>
-      <xs:enumeration value="FV_IMAGE_FILE"/>
-      <xs:enumeration value="BS_DRIVER"/>
-      <xs:enumeration value="RT_DRIVER"/>
-      <xs:enumeration value="SAL_RT_DRIVER"/>
-      <xs:enumeration value="PE32_PEIM"/>
-      <xs:enumeration value="PIC_PEIM"/>
-      <xs:enumeration value="COMBINED_PEIM_DRIVER"/>
-      <xs:enumeration value="PEI_CORE"/>
-      <xs:enumeration value="DXE_CORE"/>
-      <xs:enumeration value="BS_DRIVER_EFI"/>
-      <xs:enumeration value="SHELLAPP"/>
-      <xs:enumeration value="BINARY"/>
-      <xs:enumeration value="LOGO"/>
-      <xs:enumeration value="USER_DEFINED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="FrameworkModuleTypes">
-    <xs:restriction base="ModuleTypeDef">
-      <xs:enumeration value="BASE"/>
-      <xs:enumeration value="SEC"/>
-      <xs:enumeration value="PEI_CORE"/>
-      <xs:enumeration value="PEIM"/>
-      <xs:enumeration value="DXE_CORE"/>
-      <xs:enumeration value="DXE_DRIVER"/>
-      <xs:enumeration value="DXE_RUNTIME_DRIVER"/>
-      <xs:enumeration value="DXE_SAL_DRIVER"/>
-      <xs:enumeration value="DXE_SMM_DRIVER"/>
-      <xs:enumeration value="UEFI_DRIVER"/>
-      <xs:enumeration value="UEFI_APPLICATION"/>
-      <xs:enumeration value="USER_DEFINED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="FvRegionTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="FV_MAIN"/>
-      <xs:enumeration value="FV_MAIN_COMPACT"/>
-      <xs:enumeration value="NV_STORAGE"/>
-      <xs:enumeration value="FV_RECOVERY"/>
-      <xs:enumeration value="FV_RECOVERY_FLOPPY"/>
-      <xs:enumeration value="FV_FILE"/>
-      <xs:enumeration value="CAPSULE_CARGO"/>
-      <xs:enumeration value="NULL"/>
-      <xs:enumeration value="USER_DEFINED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PrimaryGuidListType">
-    <xs:list itemType="GuidTypes"/>
-  </xs:simpleType>
-  <xs:simpleType name="GuidListType">
-    <xs:restriction base="PrimaryGuidListType">
-      <xs:minLength value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="GuidTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="DATA_HUB_RECORD"/>
-      <xs:enumeration value="EFI_EVENT"/>
-      <xs:enumeration value="EFI_SYSTEM_CONFIGURATION_TABLE"/>
-      <xs:enumeration value="EFI_VARIABLE"/>
-      <xs:enumeration value="GUID"/>
-      <xs:enumeration value="HII_PACKAGE_LIST"/>
-      <xs:enumeration value="HOB"/>
-      <xs:enumeration value="TOKEN_SPACE_GUID"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="GuidUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexByteArrayListType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:minLength value="4"/>
-      <xs:pattern value="\s*((( )?0x[a-fA-F0-9]{2})(,)?)+( )?"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexByteArrayType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:minLength value="4"/>
-      <xs:pattern value="((\s)*0x([a-fA-F0-9]){2}(,)?(\s)*)+"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexWordArrayType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:minLength value="6"/>
-      <xs:pattern value="((\s)*0x([a-fA-F0-9]){4}(,)?(\s)*)+"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HiiPackageUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HobTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="PHIT"/>
-      <xs:enumeration value="MEMORY_ALLOCATION"/>
-      <xs:enumeration value="RESOURCE_DESCRIPTOR"/>
-      <xs:enumeration value="GUID_EXTENSION"/>
-      <xs:enumeration value="FIRMWARE_VOLUME"/>
-      <xs:enumeration value="CPU"/>
-      <xs:enumeration value="POOL"/>
-      <xs:enumeration value="CAPSULE_VOLUME"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HobUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="IntermediateOutputType">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="MODULE"/>
-      <xs:enumeration value="UNIFIED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="LibraryUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ModuleTypeDef">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="BASE"/>
-      <xs:enumeration value="SEC"/>
-      <xs:enumeration value="PEI_CORE"/>
-      <xs:enumeration value="PEIM"/>
-      <xs:enumeration value="DXE_CORE"/>
-      <xs:enumeration value="DXE_DRIVER"/>
-      <xs:enumeration value="DXE_RUNTIME_DRIVER"/>
-      <xs:enumeration value="DXE_SAL_DRIVER"/>
-      <xs:enumeration value="DXE_SMM_DRIVER"/>
-      <xs:enumeration value="TOOL"/>
-      <xs:enumeration value="UEFI_DRIVER"/>
-      <xs:enumeration value="UEFI_APPLICATION"/>
-      <xs:enumeration value="USER_DEFINED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="Md5sumType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:pattern value="\s*[a-fA-F0-9]{32}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PrimaryModuleListType">
-    <xs:list itemType="FrameworkModuleTypes"/>
-  </xs:simpleType>
-  <xs:simpleType name="ModuleListType">
-    <xs:restriction base="PrimaryModuleListType">
-      <xs:minLength value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PackageType">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="SOURCE"/>
-      <xs:enumeration value="BINARY"/>
-      <xs:enumeration value="MIXED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PackageUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PcdListType">
-    <xs:restriction base="PrimaryPcdListType">
-      <xs:minLength value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PrimaryPcdListType">
-    <xs:list itemType="PcdItemTypes"/>
-  </xs:simpleType>
-  <xs:simpleType name="PcdTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="FIXED_AT_BUILD"/>
-      <xs:enumeration value="FEATURE_FLAG"/>
-      <xs:enumeration value="PATCHABLE_IN_MODULE"/>
-      <xs:enumeration value="DYNAMIC"/>
-      <xs:enumeration value="DYNAMIC_EX"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PcdDriverTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="PEI_PCD_DRIVER"/>
-      <xs:enumeration value="DXE_PCD_DRIVER"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PcdDataTypes">
-    <xs:restriction base="xs:normalizedString">
-      <xs:enumeration value="UINT8"/>
-      <xs:enumeration value="UINT16"/>
-      <xs:enumeration value="UINT32"/>
-      <xs:enumeration value="UINT64"/>
-      <xs:enumeration value="VOID*"/>
-      <xs:enumeration value="BOOLEAN"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PcdFeatureFlagUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PcdItemTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="FEATURE_FLAG"/>
-      <xs:enumeration value="FIXED_AT_BUILD"/>
-      <xs:enumeration value="PATCHABLE_IN_MODULE"/>
-      <xs:enumeration value="DYNAMIC"/>
-      <xs:enumeration value="DYNAMIC_EX"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PcdUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PpiNotifyUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PpiUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ProtocolNotifyUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ProtocolUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="TO_START"/>
-      <xs:enumeration value="BY_START"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="SkuListType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:minLength value="1"/>
-      <xs:pattern value="\s*(\d)+((,)?(\s)*(\d)+)*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="SupportedArchitectures">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="EBC"/>
-      <xs:enumeration value="IA32"/>
-      <xs:enumeration value="X64"/>
-      <xs:enumeration value="IPF"/>
-      <xs:enumeration value="ARM"/>
-      <xs:enumeration value="PPC"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="SystemTableUsage">
-    <xs:restriction base="UsageTypes">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="TokenDataType">
-    <xs:union memberTypes="HexDoubleWordDataType  xs:nonNegativeInteger"/>
-  </xs:simpleType>
-  <xs:simpleType name="ToolChains">
-    <xs:restriction base="UCNameType">
-      <xs:minLength value="2"/>
-      <xs:enumeration value="MSFT"/>
-      <xs:enumeration value="INTEL"/>
-      <xs:enumeration value="GCC"/>
-      <xs:enumeration value="CYGWIN"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="UiNameType">
-    <xs:restriction base="xs:string">
-      <xs:minLength value="1"/>
-      <xs:pattern value="[^ ].*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="UnicodeString">
-    <xs:restriction base="xs:normalizedString">
-      <xs:minLength value="3"/>
-      <xs:pattern value="(\s)*L(\:)?&quot;[^&quot;]*&quot;(\s)*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="UsageListType">
-    <xs:restriction base="PrimaryUsageList">
-      <xs:minLength value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PrimaryUsageList">
-    <xs:list itemType="UsageTypes"/>
-  </xs:simpleType>
-  <!-- UsageTypes describes all of the Usage Attributes that are defined in the Module Surface Area Specification -->
-  <xs:simpleType name="UsageTypes">
-    <xs:restriction base="UCNameType">
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <xs:enumeration value="TO_START"/>
-      <xs:enumeration value="BY_START"/>
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="VariableOffsetValues">
-    <xs:restriction base="xs:string">
-      <xs:minLength value="1"/>
-      <xs:pattern value="\s*\d+(:)?\d*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="VariableUsage">
-    <xs:restriction base="UsageTypes">
-      <!-- Module requires the variable entry to be set -->
-      <xs:enumeration value="ALWAYS_CONSUMED"/>
-      <!-- Module will use the variable entry if it's set -->
-      <xs:enumeration value="SOMETIMES_CONSUMED"/>
-      <!-- Module Always will write the variable -->
-      <xs:enumeration value="ALWAYS_PRODUCED"/>
-      <!-- Module sometimes writes the variable -->
-      <xs:enumeration value="SOMETIMES_PRODUCED"/>
-      <!-- Variable is produced and consumed only by this module -->
-      <xs:enumeration value="PRIVATE"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <!-- Complex Data Types -->
-  <xs:complexType name="DbPathAndFilename">
-    <xs:simpleContent>
-      <xs:extension base="PathAndFilename">
-        <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
-        <xs:attribute name="Md5sum" type="Md5sumType"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="ArgsType">
-    <xs:sequence minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="Arg" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ToolType">
-    <xs:sequence>
-      <xs:element name="ToolName" type="xs:string"/>
-      <xs:element name="ToolArgs" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
diff --git a/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd b/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
deleted file mode 100644
index e2745af378..0000000000
--- a/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">
-  <!--
-    Filename: FrameworkHeaders.xsd
-    
-    Copyright (c) 2007, Intel Corporation. All rights reserved.
-
-    This program and the accompanying materials
-    are licensed and made available under the terms and conditions of the BSD License
-    which may be found at http://opensource.org/licenses/bsd-license.php
-    
-    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    
-    APPROVED: 05-Jun-2007
-  -->
-  <xs:include schemaLocation="FrameworkDataElements.xsd"/>
-  <xs:element name="FdbHeader">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is the header for the Framework Package Database (DB) file.</xs:documentation>
-      <xs:documentation xml:lang="en">The Guid MUST change if backward compatibility breaks caused by a new release of XML Schema.</xs:documentation>
-      <xs:documentation xml:lang="en">The Version will change if a minor change to XML Schema has been made, but backward compatiblity is maintained.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="DatabaseName" type="UiNameType" fixed="FrameworkDatabase"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType" default="DD6913E0-3E4E-4B83-8838-57EE7FB71DD1"/>
-        <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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_PACKAGING_SPECIFICATION   0x00090000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="FarHeader">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is the header for the Framework Archive Manifest file.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="FarName" type="UiNameType"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>
-        <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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_PACKAGING_SPECIFICATION   0x00090000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="MsaHeader">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This header is for the Module Surface Area Description (MSA) files</xs:documentation>
-      <xs:documentation xml:lang="en">The Guid MUST change if the Module changes break backward compatibility.</xs:documentation>
-      <xs:documentation xml:lang="en">The Version MUST change if the Module changes, however, backward compatiblity is maintained.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="ModuleName" type="UiNameType"/>
-        <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>
-        <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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_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)</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" name="PackageName" type="UiNameType"/>
-        <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>
-        <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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_PACKAGING_SPECIFICATION   0x00090000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/BaseTools/Conf/XMLSchema/NamingConvention.xsd b/BaseTools/Conf/XMLSchema/NamingConvention.xsd
deleted file mode 100644
index 8a76639777..0000000000
--- a/BaseTools/Conf/XMLSchema/NamingConvention.xsd
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">
-  <!--
-    Filename: NamingConvention.xsd
-    
-    Copyright (c) 2007, Intel Corporation. All rights reserved.
-    This program and the accompanying materials
-    are licensed and made available under the terms and conditions of the BSD License
-    which may be found at http://opensource.org/licenses/bsd-license.php
-    
-    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    
-  -->
-  <xs:annotation>
-    <xs:documentation xml:lang="en"> This schema defines various data types and naming conventions including: base name, filename and directory naming conventions. These are all simple data types.</xs:documentation>
-  </xs:annotation>
-  <xs:simpleType name="C_NameType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> C_Names must start with either an underscore (_) character followed by one or more alpha characters, followed by any combination of underscore or alphanumeric characters.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*(_)*[a-zA-Z]+((_)*[a-zA-Z0-9]*)*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="FileNameConvention">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> This defines what a Filename is: Alphanumeric characters and optional underscore (_) or dash (-) characters, followed by a optional dot and more alphanumeric characters. </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*[a-zA-Z](\.?[\-_a-zA-Z0-9]+)*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="GuidType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> The GUID data was a union of GuidType1 and GuidType2; standardizing on GuidType2. </xs:documentation>
-    </xs:annotation>
-    <xs:union memberTypes="GuidType2"/>
-  </xs:simpleType>
-  <xs:simpleType name="GuidType1">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> This defines the minimum specification for a GUID Array which is 8 Hex Digits - 4 Hex Digits - 4 Hex Digits - 8 Hex Bytes, the last 16 Hex Digits can be enclosed in sqiggle {} brackets.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\})?\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="GuidType2">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> A GUID must contain five different Hexadecimal character sets that are separated by a dash (-) character. </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="Hex64BitDataType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define a Hex 64 Bit Value to be 0x[a-f0-9]{16}</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*(0x)?[a-fA-F0-9]{1,16}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexAddressType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define a Hex Address, 0x[a-fA-F0-9]{1,16}</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*0x[a-fA-F0-9]{1,16}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexByteDataType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define a Hex Byte Value to be 0x[a-f0-9]{2}</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*(0x)?[a-fA-F0-9]{1,2}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexDataType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define a Hex Value to be 0x[a-f0-9]+</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*0x[a-fA-F0-9]+\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexDigitType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define a Hex Diget to be 0x[a-f0-9]</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*[a-fA-F0-9]{1}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexDoubleWordDataType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define a Hex Double Word Value to be 0x[a-f0-9]{8}</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*0x[a-fA-F0-9]{1,8}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HexWordDataType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define a Hex Word Value to be 0x[a-f0-9]{4}</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*0x[a-fA-F0-9]{1,4}\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="KeywordList">
-    <xs:restriction base="xs:string">
-      <xs:minLength value="1"/>
-      <xs:pattern value="\s*[a-zA-Z]+(\ *_*[a-zA-Z0-9]*)*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="KeywordType">
-    <xs:restriction base="xs:normalizedString">
-      <xs:pattern value="\s*[a-zA-Z]+(_*[a-zA-Z0-9]*)*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="Paragraph">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This describes the normal text of a paragraph that can be used in a license or description tag.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-  <xs:simpleType name="PathAndFilename">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> Naming convention for a path and file name</xs:documentation>
-    </xs:annotation>
-    <xs:union memberTypes="xs:normalizedString xs:anyURI"/>
-  </xs:simpleType>
-  <xs:simpleType name="Polarity">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Limit Polarity vaild values to 0 and 1</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:int">
-      <xs:pattern value="\s*0|1\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="Sentence">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> This data type requires two or more words </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:normalizedString">
-      <xs:pattern value="\s*(\w+\W*)+( )+(\W*\w*\W*\s*)*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ToolsNameConvention">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This data type is used for ToolCommand, ToolChainFamily and TagName.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:NCName">
-      <xs:pattern value="\s*[a-zA-Z][a-zA-Z0-9]*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="UCNameType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> Definition of a UpperCase Name, which can be any combination of upper case characters followed by zero or more underscore and/or uppercase alphanumeric characters </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*[A-Z]+(_*[A-Z0-9]*)*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="VersionDataType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"> Definition of a Version Number, which is one or more strings of decimal digits separated by dots. </xs:documentation>
-      <xs:documentation>
-        The algorithm to compare two versions A and B is as follows. if A==B, then A is the same version as B. Otherwise, say A is a1.a2.a3...an and B is b1.b2.b3...bn. For the first pair (ai, bi), for i less than n and i less than m, where ai is not equal to bi, if ai is less than bi, then A is less than B. If ai is greater than bi, then A is greater than B.   
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="\s*\d+(\.\d+)*\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="Zero">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Define Zero as a vaild value</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:int">
-      <xs:pattern value="\s*0\s*"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:schema>
diff --git a/BaseTools/Conf/XMLSchema/SurfaceArea.xsd b/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
deleted file mode 100644
index c941be81e7..0000000000
--- a/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">
-  <!--
-    Filename: SurfaceArea.xsd
-    
-    Copyright (c) 2007, Intel Corporation. All rights reserved.
-    This program and the accompanying materials
-    are licensed and made available under the terms and conditions of the BSD License
-    which may be found at http://opensource.org/licenses/bsd-license.php
-    
-    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    
-    APPROVED: 05-Jun-2007
-  -->
-  <xs:include schemaLocation="FrameworkHeaders.xsd"/>
-  <xs:include schemaLocation="FrameworkDataElements.xsd"/>
-  <xs:annotation>
-    <xs:documentation xml:lang="en">This describes the valid content of a FrameworkDatabase (DB) File.</xs:documentation>
-  </xs:annotation>
-  <xs:element name="FrameworkDatabase">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>
-        <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="FarList"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:annotation>
-    <xs:documentation xml:lang="en">This describes the valid content for a Module Surface Area Description (MSA) file.</xs:documentation>
-  </xs:annotation>
-  <xs:element name="ModuleSurfaceArea">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>
-        <xs:element minOccurs="1" maxOccurs="1" ref="ModuleDefinitions"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BinaryFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="NonProcessedFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="HiiPackages"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Depex"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="ModuleBuildOptions"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:annotation>
-    <xs:documentation xml:lang="en">This describes the valid content for a Package Surface Area Description (SPD) file.</xs:documentation>
-  </xs:annotation>
-  <xs:element name="PackageSurfaceArea">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>
-        <xs:element minOccurs="1" maxOccurs="1" ref="PackageDefinitions"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdIncludes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PpiDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PcdDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig b/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
deleted file mode 100644
index 5d86b98fe7..0000000000
--- a/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2007, Intel Corporation. All rights reserved.
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which may be found at http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
-  <xb:namespace uri="http://www.TianoCore.org/2007/Edk2.1">
-    <xb:package>org.tianocore</xb:package>
-  </xb:namespace>
-</xb:config>
-
diff --git a/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd b/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
deleted file mode 100644
index 1c9491a5e6..0000000000
--- a/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
+++ /dev/null
@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Filename: WorkspaceContent.xsd
-    
-    Copyright (c) 2008, Intel Corporation. All rights reserved.
-    
-    This program and the accompanying materials are licensed and made available 
-    under the terms and conditions of the BSD License which may be found at 
-    http://opensource.org/licenses/bsd-license.php
-    
-    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified"
-	targetNamespace="http://edk2.TianoCore.org/2008/1.0"
-	xmlns="http://edk2.TianoCore.org/2008/1.0">
-	<xs:annotation>
-		<xs:documentation xml:lang="en-us">This document covers the
-			WorkspaceContent.xml file that tracks what has been installed into an EDK
-			II development WORKSPACE.</xs:documentation>
-	</xs:annotation>
-	<xs:element name="WorkspaceContent">
-		<xs:annotation>
-			<xs:documentation xml:lang="en-us"> This file describes the distributions,
-				packages, stand-alone (non-package) modules and miscellaneous files that
-				have been installed in THIS WORKSPACE. Additionally, any tools that are
-				installed as part of a distribution are tracked (tools are not required
-				to be installed within a WORKSPACE.) </xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="Header" minOccurs="1" maxOccurs="1">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This section tracks required
-							information about this WORKSPACE. </xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element ref="DistributionPackage" minOccurs="1"
-					maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> The list of UEFI/PI distribution
-							packages that have been installed in this WORKSPACE.
-						</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="Header">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element minOccurs="0" maxOccurs="1" name="Name"
-					type="xs:normalizedString">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This User Interface Name can be
-							entered during initialization of a WORKSPACE to permit a developer
-							to uniquely identify a WORKSPACE. </xs:documentation>
-						<xs:documentation xml:lang="en-us"> This value can be used by report
-							generators. </xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element minOccurs="1" maxOccurs="1" name="AbsolutePath"
-					type="xs:anyURI">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> When the WORKSPACE is first
-							initialized, this is the absolute path to the WORKSPACE. If the
-							user moves or re-names the directory, the RmPkg tool will need to
-							verify the content of this WORKSPACE before removing any content.
-						</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element minOccurs="1" maxOccurs="1" name="LastModifiedDate"
-					type="xs:dateTime">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> The date and time of the last
-							Package Installation or Removal. The format is:
-							YYYY-MM-DDThh:mm:ss, for example: 2001-01-31T13:30:00 (note the T
-							character separator between the calendar date and the time.
-						</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element minOccurs="1" maxOccurs="1"
-					name="WorkspaceContentSpecification" default="1.0" type="xs:decimal"
-				 />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-
-
-	<xs:element name="ModuleList">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element minOccurs="1" maxOccurs="unbounded" name="Module">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Name" minOccurs="1" maxOccurs="1">
-								<xs:annotation>
-									<xs:documentation xml:lang="en-us"> The User Interface Name of
-										the module. </xs:documentation>
-								</xs:annotation>
-								<xs:complexType>
-									<xs:simpleContent>
-										<xs:extension base="xs:normalizedString">
-											<xs:attribute name="BaseName" type="xs:NCName"
-												use="required">
-												<xs:annotation>
-													<xs:documentation xml:lang="en-us"> The BaseName is
-														used to create files and folders during a build, and
-														is used by packaging tools as a keyword to create
-														the INF file. </xs:documentation>
-												</xs:annotation>
-											</xs:attribute>
-										</xs:extension>
-									</xs:simpleContent>
-								</xs:complexType>
-							</xs:element>
-							<xs:element ref="GUID" minOccurs="1" maxOccurs="1">
-								<xs:annotation>
-									<xs:documentation xml:lang="en-us"> This is the GUID of the
-										module. Backward compatible versions of a module can use the
-										same GUID, however the version attribute must be changed
-										(incrementally.) Non-backward compatible versions of a
-										module must also provide a new GUID, while resetting the
-										version attribute is optional. </xs:documentation>
-								</xs:annotation>
-							</xs:element>
-							<xs:element name="InstalledFolder" minOccurs="1" maxOccurs="1"
-								type="xs:anyURI">
-								<xs:annotation>
-									<xs:documentation xml:lang="en-us"> This is the WORKSPACE
-										relative path that the Module was installed in.
-									</xs:documentation>
-								</xs:annotation>
-							</xs:element>
-							<xs:element name="InfFilename" minOccurs="1" maxOccurs="1"
-								type="xs:anyURI">
-								<xs:annotation>
-									<xs:documentation xml:lang="en-us"> This is filename of the
-										INF file created in the InstalledFolder (listed above)
-										during installation. </xs:documentation>
-								</xs:annotation>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="DistributionPackage">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element minOccurs="1" maxOccurs="1" name="Name">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> The User Interface Name of the
-							distribution. </xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:simpleContent>
-							<xs:extension base="xs:normalizedString">
-								<xs:attribute name="BaseName" type="xs:NCName" use="required">
-									<xs:annotation>
-										<xs:documentation xml:lang="en-us"> This is the actual
-											BaseName used during the installation. Since users may
-											change the Distribution Package's default BaseName (used
-											to create the PKG and MANIFEST files) this is the real
-											name used to create the files. </xs:documentation>
-									</xs:annotation>
-								</xs:attribute>
-							</xs:extension>
-						</xs:simpleContent>
-					</xs:complexType>
-				</xs:element>
-				<xs:element ref="GUID" minOccurs="1" maxOccurs="1">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This is the GUID of the
-							distribution, backward compatible versions of a distribution can
-							use the same GUID, however the version attribute must be changed
-							(incrementally.) Non-backward compatible versions of a
-							distribution must also provide a new GUID, while resetting the
-							version attribute is optional. </xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element minOccurs="1" maxOccurs="1" name="PkgFilename"
-					type="xs:anyURI">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This is the filename of the XML
-							distribution package surface area (PKG) file that was stored in
-							the Conf/Pkgs folder of the WORKSPACE for this distribution
-							package. </xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element minOccurs="1" maxOccurs="1" name="ManifestFilename"
-					type="xs:anyURI">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This is the filename of the
-							distribution package manifest (.manifest) file that was created
-							and stored in the Conf/Pkgs folder of the WORKSPACE for this
-							distribution package. The InstallPkg tool must create this file
-							using the extracted locations of the content zip file (or,
-							alternatively, the user can create the file by redirecting the
-							output of the zip -Tv Contents.zip.) </xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element minOccurs="1" maxOccurs="1" name="InstalledDate"
-					type="xs:dateTime" />
-				<xs:element name="DistributionProperties" minOccurs="0" maxOccurs="1"
-					nillable="true">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This section tracks information
-							and content that is not associated with either packages or
-							modules, or is not required for building packages or modules.
-						</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="ReadOnly" type="xs:boolean" default="false"
-							use="optional">
-							<xs:annotation>
-								<xs:documentation xml:lang="en-us">If set to true, all content
-									within this distribution package should NOT be
-								modified.</xs:documentation>
-							</xs:annotation>
-						</xs:attribute>
-						<xs:attribute name="RePackage" type="xs:boolean" default="false"
-							use="optional">
-							<xs:annotation>
-								<xs:documentation xml:lang="en-us">If set to true, then the
-									content can be repackaged into another distribution
-								package.</xs:documentation>
-							</xs:annotation>
-						</xs:attribute>
-						<xs:attribute name="ModifiedToolsDef" type="xs:boolean"
-							default="false" use="optional">
-							<xs:annotation>
-								<xs:documentation xml:lang="en-us">If set to true, then either
-									the distribution or one of its packages has a user extensions
-									section that modified the tools_def.txt file.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:attribute>
-						<xs:attribute name="ProvidesTools" type="xs:boolean" default="false"
-							use="optional">
-							<xs:annotation>
-								<xs:documentation xml:lang="en-us"> This is used to identify a
-									distribution that provides tools that may or may not be
-									installed in a WORKSPACE. </xs:documentation>
-							</xs:annotation>
-						</xs:attribute>
-						<xs:attribute name="ProvidesMiscellaneousFiles" type="xs:boolean"
-							default="false" use="optional">
-							<xs:annotation>
-								<xs:documentation xml:lang="en-us"> This is used to identify a
-									distribution that provides miscellaneous files that must be
-									installed in a WORKSPACE. </xs:documentation>
-							</xs:annotation>
-						</xs:attribute>
-						<xs:attribute name="UnknownUserExtensions" type="xs:boolean"
-							default="false" use="optional">
-							<xs:annotation>
-								<xs:documentation xml:lang="en-us"> This is used to identify a
-									distribution that has a UserExtensions section at the
-									Distribution, Package or Module level that uses an Identifier
-									other than BuildOptions, ToolsDef or DistributionPackage.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:attribute>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="PackageList" minOccurs="0" maxOccurs="1">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This section tracks individual
-							packages (collections of related items.) Each package listed in
-							this section must have a DEC file associated with it.
-						</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Package" minOccurs="1" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="Name" minOccurs="1" maxOccurs="1">
-											<xs:annotation>
-												<xs:documentation xml:lang="en-us"> The User Interface
-													Name of the package. </xs:documentation>
-											</xs:annotation>
-											<xs:complexType>
-												<xs:simpleContent>
-													<xs:extension base="xs:normalizedString">
-														<xs:attribute name="BaseName" type="xs:NCName"
-															use="required">
-															<xs:annotation>
-																<xs:documentation xml:lang="en-us"> The BaseName
-																	is used to create files and folders during a
-																	build, and is used by packaging tools as a
-																	keyword to create the DEC file.
-																</xs:documentation>
-															</xs:annotation>
-														</xs:attribute>
-													</xs:extension>
-												</xs:simpleContent>
-											</xs:complexType>
-										</xs:element>
-										<xs:element ref="GUID" minOccurs="1" maxOccurs="1">
-											<xs:annotation>
-												<xs:documentation xml:lang="en-us"> This is the GUID of
-													the package, backward compatible versions of a package
-													can use the same GUID, however the version attribute
-													must be changed (incrementally.) Non-backward
-													compatible versions of a package must also provide a
-													new GUID, while resetting the version attribute is
-													optional. </xs:documentation>
-											</xs:annotation>
-										</xs:element>
-										<xs:element name="InstalledFolder" type="xs:anyURI"
-											minOccurs="1" maxOccurs="1">
-											<xs:annotation>
-												<xs:documentation xml:lang="en-us"> This is used to
-													track the actual installation location, relative to
-													the WORKSPACE. During an installation, the user may be
-													presented with an option to relocate package content
-													from the ZIP portion of the archive into a different
-													location. </xs:documentation>
-												<xs:documentation> Any installation tools must modify
-													this value if the location is different from the
-													default location. </xs:documentation>
-												<xs:documentation> Any removal tools must check this
-													value to locate correctly, the items that will be
-													removed. </xs:documentation>
-											</xs:annotation>
-										</xs:element>
-										<xs:element name="DecFilename" minOccurs="1" maxOccurs="1"
-											type="xs:anyURI">
-											<xs:annotation>
-												<xs:documentation xml:lang="en-us"> This is the filename
-													of the package declaration (DEC) filename created
-													during installation in the InstalledFolder listed
-													above. </xs:documentation>
-											</xs:annotation>
-										</xs:element>
-										<xs:element ref="ModuleList" minOccurs="0" maxOccurs="1">
-											<xs:annotation>
-												<xs:documentation xml:lang="en-us"> This section is used
-													to track the actual installation location, relative to
-													the WORKSPACE. Every module that is part of this
-													package must be listed here. During an installation,
-													the user may be presented with an option to relocate
-													module content from the ZIP portion of the archive
-													into a different location, the installation tools must
-													modify this value if the location is different from
-													the default location. Any removal tools must check
-													this value to locate correctly, the items that will be
-													removed. </xs:documentation>
-												<xs:documentation xml:lang="en-us"> The name of any INF
-													files that were created during the installation of a
-													distribution must also be listed in this section.
-												</xs:documentation>
-											</xs:annotation>
-										</xs:element>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element ref="ModuleList" minOccurs="0" maxOccurs="1">
-					<xs:annotation>
-						<xs:documentation xml:lang="en-us"> This section is used to record
-							distribution packages that contain modules that are not part of a
-							package. Modules that are part of packages are listed under the
-							Package element of the PackageList section. </xs:documentation>
-						<xs:documentation xml:lang="en-us"> Module only distribution will
-							typically be for binary only modules, like the enhanced FAT
-							driver. </xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="GUID">
-		<xs:complexType>
-			<xs:simpleContent>
-				<xs:extension base="RegistryFormatGuid">
-					<xs:attribute name="Version" type="xs:decimal" use="required" />
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-	</xs:element>
-
-	<!-- Simple Types that further restrict allowed content. -->
-
-	<xs:simpleType name="RegistryFormatGuid">
-		<xs:annotation>
-			<xs:documentation xml:lang="en-us"> A Registry format GUID must contain
-				five different Hexadecimal character sets that are separated by a dash
-				(-) character. </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:normalizedString">
-			<xs:pattern
-				value="\s*[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\s*"
-			 />
-		</xs:restriction>
-	</xs:simpleType>
-
-</xs:schema>