diff options
| author | Jacob Hoover <jacob.hoover@greenheck.com> | 2022-11-10 10:48:23 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-11-10 23:49:10 -0600 |
| commit | fa393914f12f6d6bc88a73e4d5b009da765f6dd5 (patch) | |
| tree | 6dbf354d4542b3e085795b0a917eaafc1eead415 /src/test/burn/TestData/Manual/BundleD | |
| parent | c843b47d6233153fa961c6d0e61edf7cedf255bb (diff) | |
| download | wix-fa393914f12f6d6bc88a73e4d5b009da765f6dd5.tar.gz wix-fa393914f12f6d6bc88a73e4d5b009da765f6dd5.tar.bz2 wix-fa393914f12f6d6bc88a73e4d5b009da765f6dd5.zip | |
WIXFEAT-3704 - Allow access to persisted variables from related bundles
Diffstat (limited to 'src/test/burn/TestData/Manual/BundleD')
| -rw-r--r-- | src/test/burn/TestData/Manual/BundleD/BundleD.wixproj | 22 | ||||
| -rw-r--r-- | src/test/burn/TestData/Manual/BundleD/BundleD.wxs | 17 | ||||
| -rw-r--r-- | src/test/burn/TestData/Manual/BundleD/ManualTests.txt | 10 |
3 files changed, 49 insertions, 0 deletions
diff --git a/src/test/burn/TestData/Manual/BundleD/BundleD.wixproj b/src/test/burn/TestData/Manual/BundleD/BundleD.wixproj new file mode 100644 index 00000000..1df1f895 --- /dev/null +++ b/src/test/burn/TestData/Manual/BundleD/BundleD.wixproj | |||
| @@ -0,0 +1,22 @@ | |||
| 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"> | ||
| 3 | <PropertyGroup> | ||
| 4 | <OutputType>Bundle</OutputType> | ||
| 5 | <BA>customHyperlinkLicense</BA> | ||
| 6 | <UpgradeCode>{98ACBCF6-B54A-46AF-8990-DFB8795B965B}</UpgradeCode> | ||
| 7 | <Version Condition=" '$(Version)' == '' ">1.0.0.0</Version> | ||
| 8 | </PropertyGroup> | ||
| 9 | <ItemGroup> | ||
| 10 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
| 11 | </ItemGroup> | ||
| 12 | <ItemGroup> | ||
| 13 | <ProjectReference Include="..\BafRelatedBundleVariableTesting\BafRelatedBundleVariableTesting.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> | ||
| 14 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | ||
| 15 | </ItemGroup> | ||
| 16 | <ItemGroup> | ||
| 17 | <PackageReference Include="WixToolset.Bal.wixext" /> | ||
| 18 | </ItemGroup> | ||
| 19 | <Target Name="CopyManualInstructions" AfterTargets="AfterBuild"> | ||
| 20 | <Copy SourceFiles="ManualTests.txt" DestinationFiles="$(OutputPath)ManualTests.txt" /> | ||
| 21 | </Target> | ||
| 22 | </Project> | ||
diff --git a/src/test/burn/TestData/Manual/BundleD/BundleD.wxs b/src/test/burn/TestData/Manual/BundleD/BundleD.wxs new file mode 100644 index 00000000..a877e214 --- /dev/null +++ b/src/test/burn/TestData/Manual/BundleD/BundleD.wxs | |||
| @@ -0,0 +1,17 @@ | |||
| 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 | |||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | ||
| 5 | <Fragment> | ||
| 6 | <BootstrapperApplication Id="customHyperlinkLicense"> | ||
| 7 | <!-- WixStandardBootstrapperApplication.RtfLicense --> | ||
| 8 | <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" /> | ||
| 9 | <Payload SourceFile="$(var.BafRelatedBundleVariableTesting.TargetPath)" bal:BAFunctions="yes" /> | ||
| 10 | </BootstrapperApplication> | ||
| 11 | <PackageGroup Id="BundlePackages"> | ||
| 12 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> | ||
| 13 | </PackageGroup> | ||
| 14 | <Variable Name="ANumber" bal:Overridable="yes" Value="42" Persisted="yes" /> | ||
| 15 | <Variable Name="AString" bal:Overridable="yes" Value="This is a test" Persisted="yes" /> | ||
| 16 | </Fragment> | ||
| 17 | </Wix> | ||
diff --git a/src/test/burn/TestData/Manual/BundleD/ManualTests.txt b/src/test/burn/TestData/Manual/BundleD/ManualTests.txt new file mode 100644 index 00000000..309338cc --- /dev/null +++ b/src/test/burn/TestData/Manual/BundleD/ManualTests.txt | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | BafRelatedBundleVariableTesting | ||
| 2 | # Building, Run initial build w/ no parameters, run a second (re)build w/ a /p:Version=1.1.0.0 (ensure it actually builds, as CLI params aren't accounted in the build optimization) | ||
| 3 | 1. Run BundleD.exe (v1.0). | ||
| 4 | 2. Click Install. | ||
| 5 | 3. Verify that the Bundle installs successfully. | ||
| 6 | 4. Run BundleD.exe (v1.1). | ||
| 7 | 5. Check the log file in %TEMP% There should be lines reporting: | ||
| 8 | [0708:04B4]i000: AString = This is a test | ||
| 9 | [0708:04B4]i000: ANumber = 42 | ||
| 10 | |||
