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/FailureTests/BundleD | |
| 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/FailureTests/BundleD')
| -rw-r--r-- | src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj | 2 | ||||
| -rw-r--r-- | src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj index 38748d4a..6379a1b2 100644 --- a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj +++ b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Bundle</OutputType> | 4 | <OutputType>Bundle</OutputType> |
| 5 | <UpgradeCode>{3C1A4842-81AC-4C90-8B35-A5E18F034C8D}</UpgradeCode> | 5 | <UpgradeCode>{3C1A4842-81AC-4C90-8B35-A5E18F034C8D}</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/FailureTests/BundleD/BundleD.wxs b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs index ca70236d..28614b90 100644 --- a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs +++ b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs | |||
| @@ -8,9 +8,9 @@ | |||
| 8 | 8 | ||
| 9 | <PackageGroup Id="BundlePackages"> | 9 | <PackageGroup Id="BundlePackages"> |
| 10 | <ExePackage Id="ExeA" Cache="remove" PerMachine="yes" | 10 | <ExePackage Id="ExeA" Cache="remove" PerMachine="yes" |
| 11 | DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)" | 11 | DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.TestVersion)" |
| 12 | InstallArguments="/s 5000 /regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)"" | 12 | InstallArguments="/s 5000 /regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)"" |
| 13 | RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)"" | 13 | RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)"" |
| 14 | UninstallArguments="/regd "HKLM\$(var.TestExeRegistryKey),Version""> | 14 | UninstallArguments="/regd "HKLM\$(var.TestExeRegistryKey),Version""> |
| 15 | <PayloadGroupRef Id="TestExePayloads" /> | 15 | <PayloadGroupRef Id="TestExePayloads" /> |
| 16 | </ExePackage> | 16 | </ExePackage> |
