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/WixIuiBaTests | |
| 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/WixIuiBaTests')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs index 195c159e..89efe183 100644 --- a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs +++ b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs | |||
| @@ -1,7 +1,7 @@ | |||
| 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 | <?ifndef BundleLogDirectory?> | 6 | <?ifndef BundleLogDirectory?> |
| 7 | <?define BundleLogDirectory = .?> | 7 | <?define BundleLogDirectory = .?> |
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 10 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 11 | <!-- The only difference from the template should be the SplashScreen and uncompressed --> | 11 | <!-- The only difference from the template should be the SplashScreen and uncompressed --> |
| 12 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp"> | 12 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp"> |
| 13 | <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" /> | 13 | <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" /> |
| 14 | 14 | ||
| 15 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 15 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs index 195c159e..89efe183 100644 --- a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs +++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs | |||
| @@ -1,7 +1,7 @@ | |||
| 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 | <?ifndef BundleLogDirectory?> | 6 | <?ifndef BundleLogDirectory?> |
| 7 | <?define BundleLogDirectory = .?> | 7 | <?define BundleLogDirectory = .?> |
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 10 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 11 | <!-- The only difference from the template should be the SplashScreen and uncompressed --> | 11 | <!-- The only difference from the template should be the SplashScreen and uncompressed --> |
| 12 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp"> | 12 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp"> |
| 13 | <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" /> | 13 | <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" /> |
| 14 | 14 | ||
| 15 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 15 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs index 195c159e..89efe183 100644 --- a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs +++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs | |||
| @@ -1,7 +1,7 @@ | |||
| 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 | <?ifndef BundleLogDirectory?> | 6 | <?ifndef BundleLogDirectory?> |
| 7 | <?define BundleLogDirectory = .?> | 7 | <?define BundleLogDirectory = .?> |
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 10 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 11 | <!-- The only difference from the template should be the SplashScreen and uncompressed --> | 11 | <!-- The only difference from the template should be the SplashScreen and uncompressed --> |
| 12 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp"> | 12 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp"> |
| 13 | <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" /> | 13 | <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" /> |
| 14 | 14 | ||
| 15 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 15 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |