diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs | 6 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 |
2 files changed, 4 insertions, 4 deletions
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 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
| 2 | <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 2 | <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
| 3 | <BootstrapperApplication SourceFile="fakeba.dll" /> | 3 | <BootstrapperApplication SourceFile="fakeba.dll" /> |
| 4 | 4 | ||
| 5 | <util:RegistrySearchRef Id="RegistrySearchId" /> | 5 | <util:RegistrySearchRef Id="RegistrySearchId" /> |
| 6 | <util:ProductSearchRef Id="ProductSearchId" /> | 6 | <util:ProductSearchRef Id="ProductSearchId" /> |
| 7 | <util:FileSearchRef Id="FileSearchId" /> | 7 | <util:FileSearchRef Id="FileSearchId" /> |
| 8 | <util:DetectSHA2SupportRef Id="DetectSHA2SupportId" /> | 8 | <util:WindowsFeatureSearchRef Id="DetectSHA2SupportId" /> |
| 9 | 9 | ||
| 10 | <Chain> | 10 | <Chain> |
| 11 | <MsiPackage SourceFile="test.msi"> | 11 | <MsiPackage SourceFile="test.msi"> |
| @@ -33,6 +33,6 @@ | |||
| 33 | </Fragment> | 33 | </Fragment> |
| 34 | 34 | ||
| 35 | <Fragment> | 35 | <Fragment> |
| 36 | <util:DetectSHA2Support Id="DetectSHA2SupportId" Variable="IsSHA2Supported" /> | 36 | <util:WindowsFeatureSearch Id="DetectSHA2SupportId" Variable="IsSHA2Supported" Feature="sha2CodeSigning" /> |
| 37 | </Fragment> | 37 | </Fragment> |
| 38 | </Wix> | 38 | </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 | |||
| 172 | var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']"); | 172 | var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']"); |
| 173 | Assert.Equal(1, bundleExtensionDatas.Count); | 173 | Assert.Equal(1, bundleExtensionDatas.Count); |
| 174 | Assert.Equal("<BundleExtension Id='Wix4UtilBundleExtension_X86'>" + | 174 | Assert.Equal("<BundleExtension Id='Wix4UtilBundleExtension_X86'>" + |
| 175 | "<WixDetectSHA2Support Id='DetectSHA2SupportId' />" + | 175 | "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" + |
| 176 | "</BundleExtension>", bundleExtensionDatas[0].GetTestXml()); | 176 | "</BundleExtension>", bundleExtensionDatas[0].GetTestXml()); |
| 177 | 177 | ||
| 178 | var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); | 178 | var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); |