diff options
Diffstat (limited to 'src/TestData/MsiTransactionTests/BundleAv1')
4 files changed, 16 insertions, 29 deletions
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props new file mode 100644 index 00000000..ba3eb3e5 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props | |||
| @@ -0,0 +1,15 @@ | |||
| 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> | ||
| 3 | <PropertyGroup> | ||
| 4 | <OutputType>Bundle</OutputType> | ||
| 5 | <SuppressSpecificWarnings>1151</SuppressSpecificWarnings> | ||
| 6 | <BA>hyperlinkLicense</BA> | ||
| 7 | <UpgradeCode>{90ED10D5-B187-4470-B498-05D80DAB729A}</UpgradeCode> | ||
| 8 | </PropertyGroup> | ||
| 9 | <ItemGroup> | ||
| 10 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
| 11 | </ItemGroup> | ||
| 12 | <ItemGroup> | ||
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> | ||
| 14 | </ItemGroup> | ||
| 15 | </Project> | ||
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi deleted file mode 100644 index ef01c2e9..00000000 --- a/src/TestData/MsiTransactionTests/BundleAv1/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="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes"> | ||
| 9 | <Log Prefix="~$(var.TestGroupName)_BundleA" /> | ||
| 10 | |||
| 11 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | ||
| 12 | |||
| 13 | <BootstrapperApplication> | ||
| 14 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> | ||
| 15 | </BootstrapperApplication> | ||
| 16 | |||
| 17 | <Chain> | ||
| 18 | <PackageGroupRef Id="BundlePackages" /> | ||
| 19 | </Chain> | ||
| 20 | </Bundle> | ||
| 21 | </Include> | ||
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj index 4e92a102..607c4ce6 100644 --- a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj | |||
| @@ -1,15 +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. --> | 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"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <PropertyGroup> | 3 | <Import Project="BundleA.props" /> |
| 4 | <OutputType>Bundle</OutputType> | ||
| 5 | <SuppressSpecificWarnings>1151</SuppressSpecificWarnings> | ||
| 6 | </PropertyGroup> | ||
| 7 | <ItemGroup> | 4 | <ItemGroup> |
| 8 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 5 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
| 9 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> | 6 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> |
| 10 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> | 7 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> |
| 11 | </ItemGroup> | 8 | </ItemGroup> |
| 12 | <ItemGroup> | ||
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> | ||
| 14 | </ItemGroup> | ||
| 15 | </Project> \ No newline at end of file | 9 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs index f8355aa6..544fe6a6 100644 --- a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.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)" /> |
