Change the DetectSHA2Support element to WindowsFeatureSearch. This will make it easier to add support for other Windows features in the future.

1 files changed, 38 insertions, 24 deletions

diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd
index bb7a1e39..b6f0365b 100644
--- a/src/wixext/util.xsd
+++ b/src/wixext/util.xsd
@@ -174,30 +174,6 @@
       <xs:attribute name="Id" type="xs:string" use="required" />
     </xs:complexType>
   </xs:element>
-  <xs:element name="DetectSHA2Support">
-    <xs:annotation>
-      <xs:documentation>Detects support for SHA2.</xs:documentation>
-      <xs:appinfo>
-        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
-        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
-      </xs:appinfo>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attributeGroup ref="SearchCommonAttributes" />
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DetectSHA2SupportRef">
-    <xs:annotation>
-      <xs:documentation>References a DetectSHA2Support.</xs:documentation>
-      <xs:appinfo>
-        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
-        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
-      </xs:appinfo>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attribute name="Id" type="xs:string" use="required" />
-    </xs:complexType>
-  </xs:element>
   <xs:element name="DirectorySearch">
     <xs:annotation>
       <xs:documentation>Describes a directory search.</xs:documentation>
@@ -1389,6 +1365,44 @@
       </xs:attribute>
     </xs:complexType>
   </xs:element>
+  <xs:element name="WindowsFeatureSearch">
+    <xs:annotation>
+      <xs:documentation>Detects the existence of a Windows feature.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+      </xs:appinfo>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="SearchCommonAttributes" />
+      <xs:attribute name="Feature" use="required">
+        <xs:annotation>
+          <xs:documentation>The feature to detect.</xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="sha2CodeSigning">
+              <xs:annotation>
+                <xs:documentation>The oldest OS with this feature is Win7 SP1 with KB3033929.</xs:documentation>
+              </xs:annotation>
+            </xs:enumeration>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="WindowsFeatureSearchRef">
+    <xs:annotation>
+      <xs:documentation>References a WindowsFeatureSearch.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+      </xs:appinfo>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="Id" type="xs:string" use="required" />
+    </xs:complexType>
+  </xs:element>
   <xs:element name="XmlFile">
     <xs:annotation>
       <xs:documentation>