diff options
Diffstat (limited to 'src/test/burn/TestData/PrereqBaTests/BundleC')
3 files changed, 5 insertions, 17 deletions
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj index 7ed34aa5..27b9c196 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Bundle</OutputType> | 4 | <OutputType>Bundle</OutputType> |
| 5 | <BA>BrokenDncAlwaysPrereq</BA> | 5 | <BA>BrokenDncSecondary</BA> |
| 6 | <UpgradeCode>{D2763AB7-979B-485C-AE52-DD03C23CCB93}</UpgradeCode> | 6 | <UpgradeCode>{D2763AB7-979B-485C-AE52-DD03C23CCB93}</UpgradeCode> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs index e03cad62..12607cf0 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs +++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs | |||
| @@ -2,11 +2,10 @@ | |||
| 2 | 2 | ||
| 3 | <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"> | 3 | <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 | <Fragment> | 4 | <Fragment> |
| 5 | <BootstrapperApplication Id="BrokenDncAlwaysPrereq" SourceFile="!(bindpath.dncx86)\TestBA.exe" Secondary="true"> | 5 | <BootstrapperApplication Id="BrokenDncSecondary" SourceFile="!(bindpath.dncx86)\TestBA.exe" Secondary="yes"> |
| 6 | <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" /> | 6 | <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" /> |
| 7 | <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" /> | 7 | <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" /> |
| 8 | <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" /> | 8 | <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" /> |
| 9 | <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" /> | ||
| 10 | <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" /> | 9 | <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" /> |
| 11 | <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" /> | 10 | <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" /> |
| 12 | <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" /> | 11 | <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" /> |
| @@ -16,13 +15,12 @@ | |||
| 16 | </Fragment> | 15 | </Fragment> |
| 17 | 16 | ||
| 18 | <Fragment> | 17 | <Fragment> |
| 19 | <util:FileSearch Variable="GoodConfigPresent" Path="[BARuntimeDirectory]\good.runtimeconfig.json" Result="exists" /> | 18 | <util:FileSearch Variable="TestBAConfigPresent" Path="[BARuntimeDirectory]TestBA.runtimeconfig.json" Result="exists" /> |
| 20 | <Variable Name="CAUSEINFINITELOOP" bal:Overridable="yes" /> | ||
| 21 | 19 | ||
| 22 | <PackageGroup Id="BundlePackages"> | 20 | <PackageGroup Id="BundlePackages"> |
| 23 | <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes" | 21 | <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes" |
| 24 | Permanent="yes" DetectCondition="NOT GoodConfigPresent OR CAUSEINFINITELOOP = 1" | 22 | Permanent="yes" DetectCondition="TestBAConfigPresent" |
| 25 | InstallArguments=""[BARuntimeDirectory]TestBA.runtimeconfig.json" "[BARuntimeDirectory]good.runtimeconfig.json" "[BARuntimeDirectory]bad.runtimeconfig.json"" /> | 23 | InstallArguments=""[BARuntimeDirectory]TestBA.runtimeconfig.json" "[BARuntimeDirectory]good.runtimeconfig.json"" /> |
| 26 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" /> | 24 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" /> |
| 27 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Cache="force" /> | 25 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Cache="force" /> |
| 28 | </PackageGroup> | 26 | </PackageGroup> |
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/bad.runtimeconfig.json b/src/test/burn/TestData/PrereqBaTests/BundleC/bad.runtimeconfig.json deleted file mode 100644 index 07a1a830..00000000 --- a/src/test/burn/TestData/PrereqBaTests/BundleC/bad.runtimeconfig.json +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | { | ||
| 2 | "runtimeOptions": { | ||
| 3 | "tfm": "net5.5", | ||
| 4 | "rollForward": "Disable", | ||
| 5 | "framework": { | ||
| 6 | "name": "Microsoft.WindowsDesktop.App", | ||
| 7 | "version": "5.5.0" | ||
| 8 | } | ||
| 9 | } | ||
| 10 | } \ No newline at end of file | ||
