aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/DependencyTests/BundleJ
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-05-11 09:14:53 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 09:14:53 -0700
commitdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (patch)
tree80dbfd39b48f80790f5c3c82ba4416b8cfdff78d /src/test/burn/TestData/DependencyTests/BundleJ
parentaaae65d07ce2a78592fc533701975cc576341a46 (diff)
parentd8e47230e094a506406a83eb78916abf2668b29c (diff)
downloadwix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip
Merge Integration
Diffstat (limited to 'src/test/burn/TestData/DependencyTests/BundleJ')
-rw-r--r--src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj21
-rw-r--r--src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs12
2 files changed, 33 insertions, 0 deletions
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
new file mode 100644
index 00000000..85fd0f92
--- /dev/null
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
@@ -0,0 +1,21 @@
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>{37BDF884-C24A-4C12-9D0C-421FC30747F2}</UpgradeCode>
6 <Version>1.0.0.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
13 <ProjectReference Include="..\PackageEv1\PackageEv1.wixproj" />
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </ItemGroup>
16 <ItemGroup>
17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
18 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
19 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" />
20 </ItemGroup>
21</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
new file mode 100644
index 00000000..422b4b22
--- /dev/null
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
@@ -0,0 +1,12 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Detect" />
6
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
9 <MsiPackage Id="PackageE" SourceFile="$(var.PackageEv1.TargetPath)" />
10 </PackageGroup>
11 </Fragment>
12</Wix>