diff options
Diffstat (limited to 'src/test/burn/TestData/Manual/BundleB')
-rw-r--r-- | src/test/burn/TestData/Manual/BundleB/Bundle.wxs | 5 | ||||
-rw-r--r-- | src/test/burn/TestData/Manual/BundleB/BundleB.wixproj | 7 | ||||
-rw-r--r-- | src/test/burn/TestData/Manual/BundleB/BundleB.wxs | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs index 615d4b1d..eea96895 100644 --- a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs +++ b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs | |||
@@ -30,9 +30,12 @@ | |||
30 | <?elseif $(var.BA) = "hyperlinkLicense"?> | 30 | <?elseif $(var.BA) = "hyperlinkLicense"?> |
31 | <BootstrapperApplication> | 31 | <BootstrapperApplication> |
32 | <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" /> | 32 | <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" /> |
33 | <PayloadGroupRef Id="BAPayloads" /> | ||
33 | </BootstrapperApplication> | 34 | </BootstrapperApplication> |
34 | <?else?> | 35 | <?else?> |
35 | <BootstrapperApplicationRef Id="$(var.BA)" /> | 36 | <BootstrapperApplicationRef Id="$(var.BA)"> |
37 | <PayloadGroupRef Id="BAPayloads" /> | ||
38 | </BootstrapperApplicationRef> | ||
36 | <?endif?> | 39 | <?endif?> |
37 | 40 | ||
38 | <Chain> | 41 | <Chain> |
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj index c092f1fd..e7d029a3 100644 --- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj | |||
@@ -6,6 +6,7 @@ | |||
6 | <UpgradeCode>{5DE2F206-3C37-4265-81F7-095284E16B08}</UpgradeCode> | 6 | <UpgradeCode>{5DE2F206-3C37-4265-81F7-095284E16B08}</UpgradeCode> |
7 | <HarvestDirectoryAdditionalOptions>-generate payloadgroup</HarvestDirectoryAdditionalOptions> | 7 | <HarvestDirectoryAdditionalOptions>-generate payloadgroup</HarvestDirectoryAdditionalOptions> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | |||
9 | <ItemGroup> | 10 | <ItemGroup> |
10 | <HarvestDirectory Include="BAPayloads"> | 11 | <HarvestDirectory Include="BAPayloads"> |
11 | <ComponentGroupName>BAPayloads</ComponentGroupName> | 12 | <ComponentGroupName>BAPayloads</ComponentGroupName> |
@@ -18,20 +19,24 @@ | |||
18 | <Transforms>package.xslt</Transforms> | 19 | <Transforms>package.xslt</Transforms> |
19 | </HarvestDirectory> | 20 | </HarvestDirectory> |
20 | </ItemGroup> | 21 | </ItemGroup> |
22 | |||
21 | <ItemGroup> | 23 | <ItemGroup> |
22 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 24 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
23 | </ItemGroup> | 25 | </ItemGroup> |
26 | |||
24 | <ItemGroup> | 27 | <ItemGroup> |
25 | <PackageReference Include="WixToolset.Heat" /> | 28 | <PackageReference Include="WixToolset.Heat" /> |
26 | <PackageReference Include="WixToolset.Bal.wixext" /> | 29 | <PackageReference Include="WixToolset.Bal.wixext" /> |
27 | </ItemGroup> | 30 | </ItemGroup> |
31 | |||
28 | <!-- We do this dynamically to avoid committing so many files to source control. --> | 32 | <!-- We do this dynamically to avoid committing so many files to source control. --> |
29 | <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild"> | 33 | <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild"> |
30 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 34 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
31 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 35 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
32 | </Target> | 36 | </Target> |
37 | |||
33 | <Target Name="DeleteThousandsOfFiles" AfterTargets="AfterBuild"> | 38 | <Target Name="DeleteThousandsOfFiles" AfterTargets="AfterBuild"> |
34 | <RemoveDir Directories="$(MSBuildProjectDirectory)\BAPayloads" /> | 39 | <RemoveDir Directories="$(MSBuildProjectDirectory)\BAPayloads" /> |
35 | <RemoveDir Directories="$(MSBuildProjectDirectory)\PackagePayloads" /> | 40 | <RemoveDir Directories="$(MSBuildProjectDirectory)\PackagePayloads" /> |
36 | </Target> | 41 | </Target> |
37 | </Project> \ No newline at end of file | 42 | </Project> |
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs index 3b189b15..54082131 100644 --- a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs +++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs | |||
@@ -1,11 +1,7 @@ | |||
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 | 2 | ||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
5 | <Fragment> | 4 | <Fragment> |
6 | <BootstrapperApplication> | ||
7 | <PayloadGroupRef Id="BAPayloads" /> | ||
8 | </BootstrapperApplication> | ||
9 | <PackageGroup Id="BundlePackages"> | 5 | <PackageGroup Id="BundlePackages"> |
10 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)"> | 6 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)"> |
11 | <PayloadGroupRef Id="PackagePayloads" /> | 7 | <PayloadGroupRef Id="PackagePayloads" /> |