diff options
Diffstat (limited to 'src/TestData/MsiTransactionTests/BundleBv2')
| -rw-r--r-- | src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj | 8 | ||||
| -rw-r--r-- | src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj index 7162dea2..b84052d5 100644 --- a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj +++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj | |||
| @@ -1,18 +1,14 @@ | |||
| 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 | <Import Project="..\BundleBv1\BundleB.props" /> | ||
| 3 | <PropertyGroup> | 4 | <PropertyGroup> |
| 4 | <OutputType>Bundle</OutputType> | ||
| 5 | <SuppressSpecificWarnings>1151</SuppressSpecificWarnings> | 5 | <SuppressSpecificWarnings>1151</SuppressSpecificWarnings> |
| 6 | <BA>TestBAdnc</BA> | ||
| 6 | <Version>2.0.0.0</Version> | 7 | <Version>2.0.0.0</Version> |
| 7 | </PropertyGroup> | 8 | </PropertyGroup> |
| 8 | <ItemGroup> | 9 | <ItemGroup> |
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | ||
| 10 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 10 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
| 11 | <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" /> | 11 | <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" /> |
| 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | ||
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> | ||
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> | ||
| 17 | </ItemGroup> | ||
| 18 | </Project> \ No newline at end of file | 14 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs index 33665860..d1861e75 100644 --- a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs +++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs | |||
| @@ -2,10 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?include ..\BundleBv1\BundleB.wxi ?> | ||
| 6 | <Fragment> | 5 | <Fragment> |
| 7 | <PackageGroup Id="BundlePackages"> | 6 | <PackageGroup Id="BundlePackages"> |
| 8 | <PackageGroupRef Id="TestBAdnc" /> | ||
| 9 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> | 7 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> |
| 10 | <RollbackBoundary Transaction="yes" /> | 8 | <RollbackBoundary Transaction="yes" /> |
| 11 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> | 9 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> |