diff options
author | Rob Mensching <rob@firegiant.com> | 2022-02-23 13:42:48 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-02-23 18:33:52 -0800 |
commit | c1073b7dc1402f13cce0a4f06f5b6b0d2e39e41c (patch) | |
tree | bc750475c2ad34de99b6e588502b5edeaa1da152 | |
parent | c2b365428686b326bbd0f594e9da1d43fa3420d3 (diff) | |
download | wix-c1073b7dc1402f13cce0a4f06f5b6b0d2e39e41c.tar.gz wix-c1073b7dc1402f13cce0a4f06f5b6b0d2e39e41c.tar.bz2 wix-c1073b7dc1402f13cce0a4f06f5b6b0d2e39e41c.zip |
Update swidtag test to use wxl file for bind variable validation
This is in preparation for doing additional tests using bind
variables.
3 files changed, 4 insertions, 3 deletions
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs index 15276b18..9573f60a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs | |||
@@ -29,7 +29,7 @@ namespace WixToolsetTest.CoreIntegration | |||
29 | WixAssert.CompareLineByLine(new[] | 29 | WixAssert.CompareLineByLine(new[] |
30 | { | 30 | { |
31 | "File:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\texample.txt\t20\t\t\t512\t1", | 31 | "File:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\texample.txt\t20\t\t\t512\t1", |
32 | "File:tagEYRYWwOt95punO7qPPAQ9p1GBpY\ttagEYRYWwOt95punO7qPPAQ9p1GBpY\trdcfonyt.swi|~TagTestPackage.swidtag\t449\t\t\t1\t2", | 32 | "File:tagEYRYWwOt95punO7qPPAQ9p1GBpY\ttagEYRYWwOt95punO7qPPAQ9p1GBpY\tqcfv-gdx.swi|WixprojPackageVcxprojWindowsApp.swidtag\t465\t\t\t1\t2", |
33 | "SoftwareIdentificationTag:tagEYRYWwOt95punO7qPPAQ9p1GBpY\twixtoolset.org\tmsi:package/???\tmsi:upgrade/047730A5-30FE-4A62-A520-DA9381B8226A\t" | 33 | "SoftwareIdentificationTag:tagEYRYWwOt95punO7qPPAQ9p1GBpY\twixtoolset.org\tmsi:package/???\tmsi:upgrade/047730A5-30FE-4A62-A520-DA9381B8226A\t" |
34 | }, results.ToArray()); | 34 | }, results.ToArray()); |
35 | } | 35 | } |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl index 38c12ac1..9ccae8ac 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl | |||
@@ -6,6 +6,7 @@ This file contains the declaration of all the localizable strings. | |||
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
7 | 7 | ||
8 | <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String> | 8 | <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String> |
9 | <String Id="FeatureTitle">MsiPackage</String> | 9 | <String Id="PackageName">WixprojPackageVcxprojWindowsApp</String> |
10 | <String Id="FeatureTitle">MsiPackage</String> | ||
10 | 11 | ||
11 | </WixLocalization> | 12 | </WixLocalization> |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs index 5bf78a9d..bf1fe809 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs | |||
@@ -1,5 +1,5 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Package ProductCode="8738B0C5-C4AA-4634-8C03-11EAA2F1E15D" Name="~TagTestPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 2 | <Package ProductCode="8738B0C5-C4AA-4634-8C03-11EAA2F1E15D" Name="!(loc.PackageName)" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | 3 | ||
4 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 4 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
5 | 5 | ||