diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-05 21:51:00 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-01-06 23:02:07 -0600 |
| commit | c2b00d75493798d9f2452d5e5014b14afcb14889 (patch) | |
| tree | 7788e6a9caf38ff1e921112cd893e53cccb8efbf /src/test/burn/TestData/DependencyTests/BundleF_AddOnA | |
| parent | 5b48edfd77da6a7f1c499ad30ea95b66f26ee56d (diff) | |
| download | wix-c2b00d75493798d9f2452d5e5014b14afcb14889.tar.gz wix-c2b00d75493798d9f2452d5e5014b14afcb14889.tar.bz2 wix-c2b00d75493798d9f2452d5e5014b14afcb14889.zip | |
Always run upgrade related bundles last.
#5128
Diffstat (limited to 'src/test/burn/TestData/DependencyTests/BundleF_AddOnA')
| -rw-r--r-- | src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj | 3 | ||||
| -rw-r--r-- | src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs (renamed from src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs) | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj index 2674b9d6..14072fed 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj | |||
| @@ -17,4 +17,7 @@ | |||
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | <PackageReference Include="WixToolset.Util.wixext" /> | 18 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | <ItemGroup> | ||
| 21 | <WixExtension Include="$(ForTestingUseOnlyWixextPath)" /> | ||
| 22 | </ItemGroup> | ||
| 20 | </Project> \ No newline at end of file | 23 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs index 30fba657..c1b65656 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs | |||
| @@ -2,8 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | <?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?> | 3 | <?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?> |
| 4 | 4 | ||
| 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly"> |
| 6 | <Fragment> | 6 | <Fragment> |
| 7 | <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" /> | ||
| 7 | <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" /> | 8 | <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" /> |
| 8 | <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" /> | 9 | <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" /> |
| 9 | 10 | ||