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/BundleJ_Patch | |
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/BundleJ_Patch')
-rw-r--r-- | src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj | 2 | ||||
-rw-r--r-- | src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj index 19dbd4d5..719d454d 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <OutputType>Bundle</OutputType> | 4 | <OutputType>Bundle</OutputType> |
5 | <UpgradeCode>{353B5A34-3B46-424E-8817-25B3D01C8C16}</UpgradeCode> | 5 | <UpgradeCode>{353B5A34-3B46-424E-8817-25B3D01C8C16}</UpgradeCode> |
6 | <Version>1.0.1.0</Version> | 6 | <TestVersion>1.0.1.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/BundleJ_Patch/BundleJ_Patch.wxs b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs index 8823f4b1..3af7bbf2 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | <PackageGroup Id="BundlePackages"> | 9 | <PackageGroup Id="BundlePackages"> |
10 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)"> | 10 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)"> |
11 | <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" /> | 11 | <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.TestVersion)" /> |
12 | </MspPackage> | 12 | </MspPackage> |
13 | <MsiPackage Id="PackageE" Name="PackageEv1.msi" SourceFile="$(var.PackageEv1_0_1.TargetPath)" /> | 13 | <MsiPackage Id="PackageE" Name="PackageEv1.msi" SourceFile="$(var.PackageEv1_0_1.TargetPath)" /> |
14 | </PackageGroup> | 14 | </PackageGroup> |