diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-05-11 09:14:53 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 09:14:53 -0700 |
| commit | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (patch) | |
| tree | 80dbfd39b48f80790f5c3c82ba4416b8cfdff78d /src/test/burn/TestData/SlipstreamTests/BundleD | |
| parent | aaae65d07ce2a78592fc533701975cc576341a46 (diff) | |
| parent | d8e47230e094a506406a83eb78916abf2668b29c (diff) | |
| download | wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2 wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip | |
Merge Integration
Diffstat (limited to 'src/test/burn/TestData/SlipstreamTests/BundleD')
| -rw-r--r-- | src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj | 19 | ||||
| -rw-r--r-- | src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wxs | 12 |
2 files changed, 31 insertions, 0 deletions
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj new file mode 100644 index 00000000..12f11444 --- /dev/null +++ b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.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>{5372D18C-8C62-4C22-A24B-6BB2FB4AA966}</UpgradeCode> | ||
| 6 | </PropertyGroup> | ||
| 7 | <ItemGroup> | ||
| 8 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
| 9 | </ItemGroup> | ||
| 10 | <ItemGroup> | ||
| 11 | <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> | ||
| 12 | <ProjectReference Include="..\PatchA\PatchA.wixproj" /> | ||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | ||
| 14 | </ItemGroup> | ||
| 15 | <ItemGroup> | ||
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | ||
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | ||
| 18 | </ItemGroup> | ||
| 19 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wxs b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wxs new file mode 100644 index 00000000..64bdc1b5 --- /dev/null +++ b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.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 | <PackageGroup Id="BundlePackages"> | ||
| 6 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)"> | ||
| 7 | <SlipstreamMsp Id="PatchA" /> | ||
| 8 | </MsiPackage> | ||
| 9 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" InstallCondition="WixBundleInstalled = 1" /> | ||
| 10 | </PackageGroup> | ||
| 11 | </Fragment> | ||
| 12 | </Wix> | ||