From c1073b7dc1402f13cce0a4f06f5b6b0d2e39e41c Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 23 Feb 2022 13:42:48 -0800
Subject: Update swidtag test to use wxl file for bind variable validation

This is in preparation for doing additional tests using bind
variables.
---
 src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs      | 2 +-
 .../TestData/ProductTag/Package.en-us.wxl                              | 3 ++-
 .../TestData/ProductTag/PackageWithTag.wxs                             | 2 +-
 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
             WixAssert.CompareLineByLine(new[]
             {
                 "File:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\texample.txt\t20\t\t\t512\t1",
-                "File:tagEYRYWwOt95punO7qPPAQ9p1GBpY\ttagEYRYWwOt95punO7qPPAQ9p1GBpY\trdcfonyt.swi|~TagTestPackage.swidtag\t449\t\t\t1\t2",
+                "File:tagEYRYWwOt95punO7qPPAQ9p1GBpY\ttagEYRYWwOt95punO7qPPAQ9p1GBpY\tqcfv-gdx.swi|WixprojPackageVcxprojWindowsApp.swidtag\t465\t\t\t1\t2",
                 "SoftwareIdentificationTag:tagEYRYWwOt95punO7qPPAQ9p1GBpY\twixtoolset.org\tmsi:package/???\tmsi:upgrade/047730A5-30FE-4A62-A520-DA9381B8226A\t"
             }, results.ToArray());
         }
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.
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
 
   <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
+    <String Id="PackageName">WixprojPackageVcxprojWindowsApp</String>
+    <String Id="FeatureTitle">MsiPackage</String>
 
 </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 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <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">
+  <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">
 
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
-- 
cgit v1.2.3-55-g6feb