diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-01-11 18:26:20 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-03-06 18:03:38 -0800 |
| commit | 0d3d54992104288e9ee0c834d0b96e8502fd2d42 (patch) | |
| tree | 9efa49c4983cd2ba1becab64bd1f2faccac88acf /src/test/burn/TestData/PrereqBaTests/BundleB | |
| parent | 2824298d9dd817a47527c920363556b54ead5d5d (diff) | |
| download | wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.gz wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.bz2 wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.zip | |
Move the BootstrapperApplication out of proc
Diffstat (limited to 'src/test/burn/TestData/PrereqBaTests/BundleB')
| -rw-r--r-- | src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs | 13 | ||||
| -rw-r--r-- | src/test/burn/TestData/PrereqBaTests/BundleB/bad.config | 9 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs index b7742582..87b8be36 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs +++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs | |||
| @@ -3,14 +3,15 @@ | |||
| 3 | 3 | ||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
| 5 | <Fragment> | 5 | <Fragment> |
| 6 | <BootstrapperApplication Id="BrokenMba"> | 6 | <BootstrapperApplication Id="BrokenMba" SourceFile="!(bindpath.net2x86)\TestBA.exe" |
| 7 | <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" /> | 7 | Secondary="yes"> |
| 8 | <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" /> | 8 | <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.exe.config" /> |
| 9 | <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" /> | 9 | <Payload Name="TestBA.exe.config" SourceFile="bad.config" /> |
| 10 | <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" /> | 10 | <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" /> |
| 11 | <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" /> | 11 | <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" /> |
| 12 | <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" /> | 12 | <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" /> |
| 13 | <bal:WixManagedBootstrapperApplicationHost /> | 13 | |
| 14 | <bal:WixPrerequisiteBootstrapperApplication /> | ||
| 14 | </BootstrapperApplication> | 15 | </BootstrapperApplication> |
| 15 | </Fragment> | 16 | </Fragment> |
| 16 | 17 | ||
| @@ -21,7 +22,7 @@ | |||
| 21 | <PackageGroup Id="BundlePackages"> | 22 | <PackageGroup Id="BundlePackages"> |
| 22 | <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes" | 23 | <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes" |
| 23 | Permanent="yes" DetectCondition="NOT GoodConfigPresent OR CAUSEINFINITELOOP = 1" | 24 | Permanent="yes" DetectCondition="NOT GoodConfigPresent OR CAUSEINFINITELOOP = 1" |
| 24 | InstallArguments=""[BARuntimeDirectory]WixToolset.Mba.Host.config" "[BARuntimeDirectory]good.config" "[BARuntimeDirectory]bad.config"" /> | 25 | InstallArguments=""[BARuntimeDirectory]TestBA.exe.config" "[BARuntimeDirectory]good.config" "[BARuntimeDirectory]bad.config"" /> |
| 25 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" /> | 26 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" /> |
| 26 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" /> | 27 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" /> |
| 27 | </PackageGroup> | 28 | </PackageGroup> |
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config b/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config index 1512e59a..ff3530f6 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config +++ b/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config | |||
| @@ -1,17 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | |||
| 5 | <configuration> | 4 | <configuration> |
| 6 | <configSections> | ||
| 7 | <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Host.BootstrapperSectionGroup, WixToolset.Mba.Host"> | ||
| 8 | <section name="host" type="WixToolset.Mba.Host.HostSection, WixToolset.Mba.Host" /> | ||
| 9 | </sectionGroup> | ||
| 10 | </configSections> | ||
| 11 | <startup> | 5 | <startup> |
| 12 | <supportedRuntime version="v4.0" sku=".NETFramework,Version=v5.8" /> | 6 | <supportedRuntime version="v4.0" sku=".NETFramework,Version=v5.8" /> |
| 13 | </startup> | 7 | </startup> |
| 14 | <wix.bootstrapper> | ||
| 15 | <host assemblyName="TestBA" /> | ||
| 16 | </wix.bootstrapper> | ||
| 17 | </configuration> | 8 | </configuration> |
