diff options
Diffstat (limited to 'src/TestData/MsiTransaction/BundleAv1')
| -rw-r--r-- | src/TestData/MsiTransaction/BundleAv1/BundleA.wxi | 5 | ||||
| -rw-r--r-- | src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj | 4 | ||||
| -rw-r--r-- | src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi index 83b901cb..b31be737 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi +++ b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi | |||
| @@ -1,5 +1,4 @@ | |||
| 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 | <?ifndef Version?> | 3 | <?ifndef Version?> |
| 5 | <?define Version = 1.0.0.0?> | 4 | <?define Version = 1.0.0.0?> |
| @@ -7,7 +6,7 @@ | |||
| 7 | 6 | ||
| 8 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 7 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 9 | <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes"> | 8 | <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes"> |
| 10 | <Log Prefix="~$(var.TestGroupName)_BundleA"/> | 9 | <Log Prefix="~$(var.TestGroupName)_BundleA" /> |
| 11 | 10 | ||
| 12 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 11 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |
| 13 | 12 | ||
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj index 59f856ce..95f3ccf0 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> | 10 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> |
| 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" /> | 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs index 24ef3273..f8355aa6 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs +++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.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 BundleA.wxi ?> | 5 | <?include BundleA.wxi ?> |
| 7 | <Fragment> | 6 | <Fragment> |
| 8 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
| 9 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> | 8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> |
| 10 | <RollbackBoundary Transaction='yes' /> | 9 | <RollbackBoundary Transaction="yes" /> |
| 11 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" /> | 10 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" /> |
| 12 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv1.TargetPath)" /> | 11 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv1.TargetPath)" /> |
| 13 | </PackageGroup> | 12 | </PackageGroup> |
