diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-01-01 23:12:28 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-03 16:20:19 -0600 |
| commit | 02d4ef4774fa43cc9524fac93c888981e5d47478 (patch) | |
| tree | 8ccfd50765ea96a3d323597124ccbb4684c94b85 /src/TestData/BasicFunctionalityTests/BundleA | |
| parent | 47724ab546a84e77b4699bc28aa4e4ad7901253f (diff) | |
| download | wix-02d4ef4774fa43cc9524fac93c888981e5d47478.tar.gz wix-02d4ef4774fa43cc9524fac93c888981e5d47478.tar.bz2 wix-02d4ef4774fa43cc9524fac93c888981e5d47478.zip | |
Create template for bundle.
Diffstat (limited to 'src/TestData/BasicFunctionalityTests/BundleA')
3 files changed, 5 insertions, 22 deletions
diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj index 45127b23..3eac53a1 100644 --- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj +++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj | |||
| @@ -2,8 +2,13 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Bundle</OutputType> | 4 | <OutputType>Bundle</OutputType> |
| 5 | <BA>hyperlinkLicense</BA> | ||
| 6 | <UpgradeCode>{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}</UpgradeCode> | ||
| 5 | </PropertyGroup> | 7 | </PropertyGroup> |
| 6 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
| 10 | </ItemGroup> | ||
| 11 | <ItemGroup> | ||
| 7 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
| 8 | </ItemGroup> | 13 | </ItemGroup> |
| 9 | <ItemGroup> | 14 | <ItemGroup> |
diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi deleted file mode 100644 index 0bad694e..00000000 --- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 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 | <?ifndef Version?> | ||
| 4 | <?define Version = 1.0.0.0?> | ||
| 5 | <?endif?> | ||
| 6 | |||
| 7 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | ||
| 8 | <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Compressed="yes"> | ||
| 9 | <Log Prefix="~$(var.TestGroupName)_BundleA" /> | ||
| 10 | |||
| 11 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | ||
| 12 | |||
| 13 | <BootstrapperApplication> | ||
| 14 | <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" /> | ||
| 15 | </BootstrapperApplication> | ||
| 16 | |||
| 17 | <Chain> | ||
| 18 | <PackageGroupRef Id="BundlePackages" /> | ||
| 19 | </Chain> | ||
| 20 | </Bundle> | ||
| 21 | </Include> | ||
diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs index 0506f05a..bd164a29 100644 --- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs +++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?include BundleA.wxi ?> | ||
| 6 | <Fragment> | 5 | <Fragment> |
| 7 | <PackageGroup Id="BundlePackages"> | 6 | <PackageGroup Id="BundlePackages"> |
| 8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> | 7 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> |