From f866ab77f8fd0790f4d6628f54dcdf0bd66fccb6 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 10 Jul 2020 21:25:44 +1000
Subject: Change the DetectSHA2Support element to WindowsFeatureSearch. This
 will make it easier to add support for other Windows features in the future.

---
 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs | 6 +++---
 src/test/WixToolsetTest.Util/UtilExtensionFixture.cs                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/test')

diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
index 56eba137..c8f7205f 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
@@ -1,11 +1,11 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <util:RegistrySearchRef Id="RegistrySearchId" />
         <util:ProductSearchRef Id="ProductSearchId" />
         <util:FileSearchRef Id="FileSearchId" />
-        <util:DetectSHA2SupportRef Id="DetectSHA2SupportId" />
+        <util:WindowsFeatureSearchRef Id="DetectSHA2SupportId" />
 
         <Chain>
             <MsiPackage SourceFile="test.msi">
@@ -33,6 +33,6 @@
     </Fragment>
 
     <Fragment>
-        <util:DetectSHA2Support Id="DetectSHA2SupportId" Variable="IsSHA2Supported" />
+        <util:WindowsFeatureSearch Id="DetectSHA2SupportId" Variable="IsSHA2Supported" Feature="sha2CodeSigning" />
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index aa03d068..78a9f967 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -172,7 +172,7 @@ namespace WixToolsetTest.Util
                 var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']");
                 Assert.Equal(1, bundleExtensionDatas.Count);
                 Assert.Equal("<BundleExtension Id='Wix4UtilBundleExtension_X86'>" +
-                    "<WixDetectSHA2Support Id='DetectSHA2SupportId' />" +
+                    "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" +
                     "</BundleExtension>", bundleExtensionDatas[0].GetTestXml());
 
                 var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]");
-- 
cgit v1.2.3-55-g6feb