Update swidtag test to use wxl file for bind variable validation
This is in preparation for doing additional tests using bind variables.
Rob Mensching committed
Feb 23, 2022 at 13:42 UTC
c1073b7dc1402f13cce0a4f06f5b6b0d2e39e41c
3 files changed
+4
-3
src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs
+1
-1
@@ -29,7 +29,7 @@ namespace WixToolsetTest.CoreIntegration
29
WixAssert.CompareLineByLine(new[]
30
{
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"
34
}, results.ToArray());
35
}
src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl
+2
-1
@@ -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">
7
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>
11
12
</WixLocalization>
src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs
+1
-1
@@ -1,5 +1,5 @@
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
4
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
5