diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-08 16:01:28 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-08 16:01:28 -0600 |
| commit | 83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9 (patch) | |
| tree | cd0612f60c685da1c552b73b75083c5251312ad9 /src/TestData/MsiTransaction/BundleAv2 | |
| parent | 50b8c862c46123db90797e92f4e8f9b5c0b11528 (diff) | |
| download | wix-83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9.tar.gz wix-83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9.tar.bz2 wix-83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9.zip | |
Update to latest.
Diffstat (limited to 'src/TestData/MsiTransaction/BundleAv2')
| -rw-r--r-- | src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj | 4 | ||||
| -rw-r--r-- | src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj index 3b7806d1..4ecc3f8a 100644 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> | 11 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" /> | 14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> |
| 15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" /> | 15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs index 7feab97b..11360c22 100644 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs +++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs | |||
| @@ -1,13 +1,12 @@ | |||
| 1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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. --> | ||
| 3 | 2 | ||
| 4 | 3 | ||
| 5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 6 | <?include ..\BundleAv1\BundleA.wxi ?> | 5 | <?include ..\BundleAv1\BundleA.wxi ?> |
| 7 | <Fragment> | 6 | <Fragment> |
| 8 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
| 9 | <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" /> | 8 | <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" /> |
| 10 | <RollbackBoundary Transaction='yes' /> | 9 | <RollbackBoundary Transaction="yes" /> |
| 11 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> | 10 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> |
| 12 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv2.TargetPath)" /> | 11 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv2.TargetPath)" /> |
| 13 | </PackageGroup> | 12 | </PackageGroup> |