diff options
author | Rob Mensching <rob@firegiant.com> | 2024-04-25 11:10:50 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-04-25 13:31:39 -0700 |
commit | a500693e3c9e94304c8b9a8229203b2b750900aa (patch) | |
tree | e99d90f31e2848a695f47423a440fb63bb9e8dae /src/test/burn/TestData/DependencyTests/BundleE | |
parent | 4983aeeb2da6e96bc8aad698752b3b962f58e585 (diff) | |
download | wix-a500693e3c9e94304c8b9a8229203b2b750900aa.tar.gz wix-a500693e3c9e94304c8b9a8229203b2b750900aa.tar.bz2 wix-a500693e3c9e94304c8b9a8229203b2b750900aa.zip |
Update tests to use TestVersion property instead of generic Version property
The MSBuild Version property is well-known and can be set by standard
processes. That can cause problem in the tests where the version is explicitly
set to validate WiX behaviors. So, we've switched to using the TestVersion
property that will be specific for our testing purposes.
Diffstat (limited to 'src/test/burn/TestData/DependencyTests/BundleE')
-rw-r--r-- | src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj | 2 | ||||
-rw-r--r-- | src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj index 32ef2b42..30e0f107 100644 --- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <OutputType>Bundle</OutputType> | 4 | <OutputType>Bundle</OutputType> |
5 | <UpgradeCode>{250B4261-E67F-47E0-AB15-209EF58B769D}</UpgradeCode> | 5 | <UpgradeCode>{250B4261-E67F-47E0-AB15-209EF58B769D}</UpgradeCode> |
6 | <Version>1.0.0.0</Version> | 6 | <TestVersion>1.0.0.0</TestVersion> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | <ItemGroup> | 8 | <ItemGroup> |
9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | 9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs index a2372241..513a00db 100644 --- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs | |||
@@ -10,8 +10,8 @@ | |||
10 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> | 10 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> |
11 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" /> | 11 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" /> |
12 | <ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603" UninstallArguments="" | 12 | <ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603" UninstallArguments="" |
13 | DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"> | 13 | DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.TestVersion)"> |
14 | <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" /> | 14 | <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" /> |
15 | <PayloadGroupRef Id="TestExePayloads" /> | 15 | <PayloadGroupRef Id="TestExePayloads" /> |
16 | </ExePackage> | 16 | </ExePackage> |
17 | </PackageGroup> | 17 | </PackageGroup> |