diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-11-26 08:24:48 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2019-11-26 08:30:11 +1000 |
| commit | dda4a326407eb8a0fb5d094ee1e2b5b85d419042 (patch) | |
| tree | 2e29c663282ed3cd93bbbe7636e4cca662c56777 /src/test | |
| parent | 2c73e671599f4d05bb98b38dbc79750a1cf04b45 (diff) | |
| download | wix-dda4a326407eb8a0fb5d094ee1e2b5b85d419042.tar.gz wix-dda4a326407eb8a0fb5d094ee1e2b5b85d419042.tar.bz2 wix-dda4a326407eb8a0fb5d094ee1e2b5b85d419042.zip | |
Fix decompiling multiple AppSearches with nested searches.
Diffstat (limited to 'src/test')
2 files changed, 20 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs index 6d78b2db..26649485 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 3 | <Product Id="{F71CC1C8-8EDC-4FCD-8946-D92AE30B3ABE}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0"> | 3 | <Product Id="{33C58183-7333-4257-AEFD-6705DA66E617}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0"> |
| 4 | <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" /> | 4 | <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" /> |
| 5 | <Directory Id="TARGETDIR" Name="SourceDir"> | 5 | <Directory Id="TARGETDIR" Name="SourceDir"> |
| 6 | <Directory Id="ProgramFilesFolder"> | 6 | <Directory Id="ProgramFilesFolder"> |
| @@ -17,6 +17,25 @@ | |||
| 17 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 17 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
| 18 | <Media Id="1" /> | 18 | <Media Id="1" /> |
| 19 | <Property Id="ALLUSERS" Value="1" /> | 19 | <Property Id="ALLUSERS" Value="1" /> |
| 20 | <Property Id="SAMPLEREGFOUND"> | ||
| 21 | <RegistrySearch Id="RegSearch" Root="HKLM" Key="Reg" Type="raw" Win64="no" /> | ||
| 22 | </Property> | ||
| 23 | <Property Id="NESTEDDIRFOUND"> | ||
| 24 | <RegistrySearch Id="ARegKeySearch" Root="HKLM" Key="ARegKey" Type="raw" Win64="no"> | ||
| 25 | <DirectorySearch Id="TopDirSearch" Path="TopDir"> | ||
| 26 | <DirectorySearch Id="SecondDirSearch" Path="SecondDir"> | ||
| 27 | <DirectorySearch Id="ThirdDirSearch" Path="ThirdDir"> | ||
| 28 | <DirectorySearch Id="FourthDirSearch" Path="FourthDir" /> | ||
| 29 | </DirectorySearch> | ||
| 30 | </DirectorySearch> | ||
| 31 | </DirectorySearch> | ||
| 32 | </RegistrySearch> | ||
| 33 | </Property> | ||
| 34 | <Property Id="SAMPLENESTEDDIRFOUND"> | ||
| 35 | <RegistrySearch Id="NestedRegSearch" Root="HKLM" Key="NestedReg" Type="raw" Win64="no"> | ||
| 36 | <DirectorySearch Id="SampleNestedDirSearch" Path="NestedDir" /> | ||
| 37 | </RegistrySearch> | ||
| 38 | </Property> | ||
| 20 | <Property Id="SAMPLEDIRFOUND"> | 39 | <Property Id="SAMPLEDIRFOUND"> |
| 21 | <RegistrySearch Id="SubRegSearch" Root="HKLM" Key="SampleReg" Type="raw" Win64="no"> | 40 | <RegistrySearch Id="SubRegSearch" Root="HKLM" Key="SampleReg" Type="raw" Win64="no"> |
| 22 | <DirectorySearch Id="SampleDirSearch" Path="SampleDir"> | 41 | <DirectorySearch Id="SampleDirSearch" Path="SampleDir"> |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi index 7e0f8060..ea1296c3 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi | |||
| Binary files differ | |||