Merge pull request #277 from OVAL-Community/5.12.2_develop

Merge minor windows wuaupdatesearcher fixes into master.

Author: vanderpol

oval-schemas/oval-definitions-schema.xsd

@@ -1684,6 +1684,22 @@
             </xsd:restriction>
         </xsd:simpleContent>
     </xsd:complexType>
+	
+    <xsd:complexType name="EntityStateDateType">
+        <xsd:annotation>
+            <xsd:documentation>The EntityDateType type is extended by the entities of an individual OVAL State. This type provides uniformity to each state entity by including the attributes found in the EntityStateSimpleBaseType. This specific type is an XML date.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:simpleContent>
+            <xsd:restriction base="oval-def:EntityStateSimpleBaseType">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:date"/>
+                </xsd:simpleType>
+                <xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="optional" fixed="string"/>
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+
     <xsd:complexType name="EntityStateBinaryType">
         <xsd:annotation>
             <xsd:documentation>The EntityStateBinaryType type is extended by the entities of an individual OVAL State. This type provides uniformity to each state entity by including the attributes found in the EntityStateSimpleBaseType. This specific type describes simple binary data. The empty string is also allowed when using a variable reference with an element.</xsd:documentation>

oval-schemas/oval-system-characteristics-schema.xsd

@@ -471,6 +471,21 @@
             </xsd:restriction>
         </xsd:simpleContent>
     </xsd:complexType>
+	
+    <xsd:complexType name="EntityItemDateType">
+        <xsd:annotation>
+            <xsd:documentation>The EntityDateType type is extended by the entities of an individual OVAL State.   This type provides uniformity to each entity by including the attributes found in the EntityItemSimpleBaseType. This specific type is an XML date.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:simpleContent>
+            <xsd:restriction base="oval-sc:EntityItemSimpleBaseType">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:date"/>
+                </xsd:simpleType>
+                <xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="optional" fixed="string"/>
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+	
     <xsd:complexType name="EntityItemBinaryType">
         <xsd:annotation>
             <xsd:documentation>The EntityItemBinaryType type is extended by the entities of an individual item. This type provides uniformity to each entity by including the attributes found in the EntityItemSimpleBaseType. This specific type describes simple binary data. The empty string is also allowed for cases where there was an error in the data collection of an entity and a status needs to be reported.</xsd:documentation>

oval-schemas/windows-definitions-schema.xsd

@@ -9441,7 +9441,7 @@
                                  <xsd:documentation>The Microsoft Security Response Center (MSRC) rating provided by Microsoft related to this update ID, includes 'Critical', 'Important', 'Moderate', 'Low', 'Unspecified', ''</xsd:documentation>
                              </xsd:annotation>
                          </xsd:element>
-						 <xsd:element name="last_deployment_change_time" type="xsd:date" minOccurs="0" maxOccurs="1">
+						 <xsd:element name="last_deployment_change_time" type="oval-def:EntityStateDateType" minOccurs="0" maxOccurs="1">
                              <xsd:annotation>
                                  <xsd:documentation>The last published date of the update, provided by Microsoft related to this update ID</xsd:documentation>
                              </xsd:annotation>
@@ -9495,6 +9495,11 @@
                               <xsd:documentation>Indicates the source for the wuaupdatesearcher_item is from wsusscn2.cab file download from Microsoft</xsd:documentation>
                          </xsd:annotation>
                     </xsd:enumeration>
+					<xsd:enumeration value="">
+						  <xsd:annotation>
+								<xsd:documentation>The empty string value is permitted here to allow for empty elements associated with variable references.</xsd:documentation>
+						  </xsd:annotation>
+					</xsd:enumeration>
                </xsd:restriction>
           </xsd:simpleContent>
      </xsd:complexType>

oval-schemas/windows-system-characteristics-schema.xsd

@@ -3780,7 +3780,7 @@
                                  <xsd:documentation>The Microsoft Security Response Center (MSRC) rating provided by Microsoft related to this update ID, includes 'Critical', 'Important', 'Moderate', 'Low', 'Unspecified', ''</xsd:documentation>
                              </xsd:annotation>
                          </xsd:element>
-						 <xsd:element name="last_deployment_change_time" type="xsd:date" minOccurs="0" maxOccurs="1">
+						 <xsd:element name="last_deployment_change_time" type="oval-sc:EntityItemDateType" minOccurs="0" maxOccurs="1">
                              <xsd:annotation>
                                  <xsd:documentation>The last published date of the update, provided by Microsoft related to this update ID</xsd:documentation>
                              </xsd:annotation>