aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/RegistrationTests
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/RegistrationTests
parentaaae65d07ce2a78592fc533701975cc576341a46 (diff)
parentd8e47230e094a506406a83eb78916abf2668b29c (diff)
downloadwix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip
Merge Integration
Diffstat (limited to 'src/test/burn/TestData/RegistrationTests')
-rw-r--r--src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj18
-rw-r--r--src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wxs10
-rw-r--r--src/test/burn/TestData/RegistrationTests/PackageA/PackageA.wixproj9
3 files changed, 37 insertions, 0 deletions
diff --git a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..a6ccd842
--- /dev/null
+++ b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj
@@ -0,0 +1,18 @@
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>{17041020-8A61-4A3B-8FDB-4591CB900049}</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="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13 </ItemGroup>
14 <ItemGroup>
15 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
16 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
17 </ItemGroup>
18</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wxs b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..bd164a29
--- /dev/null
+++ b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wxs
@@ -0,0 +1,10 @@
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 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
8 </PackageGroup>
9 </Fragment>
10</Wix>
diff --git a/src/test/burn/TestData/RegistrationTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/RegistrationTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..7e5dbb8c
--- /dev/null
+++ b/src/test/burn/TestData/RegistrationTests/PackageA/PackageA.wixproj
@@ -0,0 +1,9 @@
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 <UpgradeCode>{BF26D3E4-1D6B-480E-B312-3FECE6363E43}</UpgradeCode>
5 </PropertyGroup>
6 <ItemGroup>
7 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
8 </ItemGroup>
9</Project> \ No newline at end of file