diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-13 15:39:40 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-14 11:12:31 -0500 |
commit | d5985a1688bc878e42ffd3ce3939fa52303cab16 (patch) | |
tree | 0c283fe5454659c569317b37840a040474cfa032 /src/test/burn/TestData/PrereqBaTests/BundleE | |
parent | 6a6974a15deb6edf593736cdb8043bfb93064782 (diff) | |
download | wix-d5985a1688bc878e42ffd3ce3939fa52303cab16.tar.gz wix-d5985a1688bc878e42ffd3ce3939fa52303cab16.tar.bz2 wix-d5985a1688bc878e42ffd3ce3939fa52303cab16.zip |
Add option to hosts to always install prereqs.
Add PrereqPackage to BundlePackage
Implements 4718
Diffstat (limited to 'src/test/burn/TestData/PrereqBaTests/BundleE')
-rw-r--r-- | src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj | 22 | ||||
-rw-r--r-- | src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs | 26 |
2 files changed, 48 insertions, 0 deletions
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj new file mode 100644 index 00000000..5d271f55 --- /dev/null +++ b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj | |||
@@ -0,0 +1,22 @@ | |||
1 | <!-- 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 | <Project Sdk="WixToolset.Sdk"> | ||
3 | <PropertyGroup> | ||
4 | <OutputType>Bundle</OutputType> | ||
5 | <BA>DncAlwaysPrereq</BA> | ||
6 | <UpgradeCode>{2F61ECD8-C28B-4FF9-9609-0E9633716CF9}</UpgradeCode> | ||
7 | </PropertyGroup> | ||
8 | <ItemGroup> | ||
9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
10 | </ItemGroup> | ||
11 | <ItemGroup> | ||
12 | <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" /> | ||
13 | </ItemGroup> | ||
14 | <ItemGroup> | ||
15 | <ProjectReference Include="..\PrereqBaf\PrereqBaf.vcxproj" /> | ||
16 | <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" /> | ||
17 | </ItemGroup> | ||
18 | <ItemGroup> | ||
19 | <PackageReference Include="WixToolset.Bal.wixext" /> | ||
20 | <PackageReference Include="WixToolset.Util.wixext" /> | ||
21 | </ItemGroup> | ||
22 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs new file mode 100644 index 00000000..5f2e6a75 --- /dev/null +++ b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs | |||
@@ -0,0 +1,26 @@ | |||
1 | <!-- 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 | |||
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"> | ||
5 | <Fragment> | ||
6 | <BootstrapperApplication Id="DncAlwaysPrereq"> | ||
7 | <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" /> | ||
8 | <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" /> | ||
9 | <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" /> | ||
10 | <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" /> | ||
11 | <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" /> | ||
12 | <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" /> | ||
13 | <bal:WixDotNetCoreBootstrapperApplicationHost AlwaysInstallPrereqs="yes" /> | ||
14 | </BootstrapperApplication> | ||
15 | </Fragment> | ||
16 | |||
17 | <Fragment> | ||
18 | <util:FileSearch Variable="GoodConfigPresent" Path="[BARuntimeDirectory]\good.runtimeconfig.json" Result="exists" /> | ||
19 | |||
20 | <PackageGroup Id="BundlePackages"> | ||
21 | <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes" | ||
22 | Permanent="yes" DetectCondition="NOT GoodConfigPresent" | ||
23 | InstallArguments=""[BARuntimeDirectory]TestBA.runtimeconfig.json" "[BARuntimeDirectory]good.runtimeconfig.json" "[BARuntimeDirectory]bad.runtimeconfig.json"" /> | ||
24 | </PackageGroup> | ||
25 | </Fragment> | ||
26 | </Wix> | ||