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/UpdateBundleTests | |
| 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/UpdateBundleTests')
5 files changed, 9 insertions, 9 deletions
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj index 3c678f95..3fcf388b 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <Import Project="..\BundleAv1\BundleA.props" /> | 3 | <Import Project="..\BundleAv1\BundleA.props" /> |
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <Version>2.0.0.0</Version> | 5 | <TestVersion>2.0.0.0</TestVersion> |
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" /> | 8 | <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" /> |
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs index 63f3043b..7c43c59d 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs +++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs | |||
| @@ -1,11 +1,11 @@ | |||
| 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. --> | 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 | 2 | ||
| 3 | <?ifndef Version?> | 3 | <?ifndef TestVersion?> |
| 4 | <?define Version = 1.0.0.0?> | 4 | <?define TestVersion = 1.0.0.0?> |
| 5 | <?endif?> | 5 | <?endif?> |
| 6 | 6 | ||
| 7 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 7 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 8 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes"> | 8 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes"> |
| 9 | <!-- Update should be the only thing different from the template --> | 9 | <!-- Update should be the only thing different from the template --> |
| 10 | <Update Location="$(var.WebServerBaseUrl)BundleB/feed" /> | 10 | <Update Location="$(var.WebServerBaseUrl)BundleB/feed" /> |
| 11 | 11 | ||
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj index 8f21192f..13e94a58 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <Import Project="..\BundleBv1\BundleB.props" /> | 3 | <Import Project="..\BundleBv1\BundleB.props" /> |
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <Version>2.0.0.0</Version> | 5 | <TestVersion>2.0.0.0</TestVersion> |
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\BundleBv1\Bundle.wxs" /> | 8 | <Compile Include="..\BundleBv1\Bundle.wxs" /> |
diff --git a/src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj index b419f663..d4455f2b 100644 --- a/src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <Import Project="..\PackageAv1\PackageA.props" /> | 3 | <Import Project="..\PackageAv1\PackageA.props" /> |
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <Version>2.0.0.0</Version> | 5 | <TestVersion>2.0.0.0</TestVersion> |
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | </Project> \ No newline at end of file | 7 | </Project> |
diff --git a/src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj index 126d0f53..2d1108ef 100644 --- a/src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <Import Project="..\PackageBv1\PackageB.props" /> | 3 | <Import Project="..\PackageBv1\PackageB.props" /> |
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <Version>2.0.0.0</Version> | 5 | <TestVersion>2.0.0.0</TestVersion> |
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | </Project> \ No newline at end of file | 7 | </Project> |
