diff options
author | Bob Arnson <bob@firegiant.com> | 2023-05-18 20:47:27 -0400 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-06-13 10:36:32 -0700 |
commit | 35d30e03027cef5c402f01d671fc1883514e77a9 (patch) | |
tree | 5c48b8bb7f2b70b6157327d604d4812ad5b48649 /src/test/burn/TestData/ContainerTests | |
parent | f4740666c9eb2512640b7c69c79447ef8e7daa8e (diff) | |
download | wix-35d30e03027cef5c402f01d671fc1883514e77a9.tar.gz wix-35d30e03027cef5c402f01d671fc1883514e77a9.tar.bz2 wix-35d30e03027cef5c402f01d671fc1883514e77a9.zip |
Improve logging to remove `(null)`.
Add detached container runtime test.
Inspired by https://github.com/wixtoolset/issues/issues/7490.
Diffstat (limited to 'src/test/burn/TestData/ContainerTests')
-rw-r--r-- | src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj | 19 | ||||
-rw-r--r-- | src/test/burn/TestData/ContainerTests/BundleB/BundleB.wxs | 27 |
2 files changed, 46 insertions, 0 deletions
diff --git a/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj new file mode 100644 index 00000000..a91e6317 --- /dev/null +++ b/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj | |||
@@ -0,0 +1,19 @@ | |||
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 | <UpgradeCode>{DC389066-79D6-48DA-8F80-A3576C4D4257}</UpgradeCode> | ||
6 | </PropertyGroup> | ||
7 | <ItemGroup> | ||
8 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
9 | </ItemGroup> | ||
10 | <ItemGroup> | ||
11 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | ||
12 | <ProjectReference Include="..\PackageB\PackageB.wixproj" /> | ||
13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | ||
14 | </ItemGroup> | ||
15 | <ItemGroup> | ||
16 | <PackageReference Include="WixToolset.Bal.wixext" /> | ||
17 | <PackageReference Include="WixToolset.NetFx.wixext" /> | ||
18 | </ItemGroup> | ||
19 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wxs b/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wxs new file mode 100644 index 00000000..47231a73 --- /dev/null +++ b/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wxs | |||
@@ -0,0 +1,27 @@ | |||
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"> | ||
5 | <Fragment> | ||
6 | <PackageGroup Id="BundlePackages"> | ||
7 | <PackageGroupRef Id="PackageA" /> | ||
8 | <PackageGroupRef Id="PackageB" /> | ||
9 | </PackageGroup> | ||
10 | |||
11 | <PackageGroup Id="PackageA"> | ||
12 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> | ||
13 | </PackageGroup> | ||
14 | |||
15 | <PackageGroup Id="PackageB"> | ||
16 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" /> | ||
17 | </PackageGroup> | ||
18 | |||
19 | <Container Name="AAA.container" Type="detached"> | ||
20 | <PackageGroupRef Id="PackageA" /> | ||
21 | </Container> | ||
22 | |||
23 | <Container Name="BBB.container" Type="detached"> | ||
24 | <PackageGroupRef Id="PackageB" /> | ||
25 | </Container> | ||
26 | </Fragment> | ||
27 | </Wix> | ||