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/msi/TestData | |
| 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/msi/TestData')
| -rw-r--r-- | src/test/msi/TestData/Templates/Product.wxs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/msi/TestData/Templates/Product.wxs b/src/test/msi/TestData/Templates/Product.wxs index c7604c1b..8fb90fed 100644 --- a/src/test/msi/TestData/Templates/Product.wxs +++ b/src/test/msi/TestData/Templates/Product.wxs | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | <?ifndef Version?> | 5 | <?ifndef TestVersion?> |
| 6 | <?define Version = 1.0.0.0?> | 6 | <?define TestVersion = 1.0.0.0?> |
| 7 | <?endif?> | 7 | <?endif?> |
| 8 | 8 | ||
| 9 | <?ifndef ProductCode?> | 9 | <?ifndef ProductCode?> |
| @@ -11,7 +11,7 @@ | |||
| 11 | <?endif?> | 11 | <?endif?> |
| 12 | 12 | ||
| 13 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 13 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 14 | <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)"> | 14 | <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)"> |
| 15 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 15 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
| 16 | <?ifndef CabPrefix?> | 16 | <?ifndef CabPrefix?> |
| 17 | <MediaTemplate EmbedCab="yes" /> | 17 | <MediaTemplate EmbedCab="yes" /> |