Update old test code to latest SWID tag spec

Fixes 6675

2 files changed, 8 insertions, 2 deletions

diff --git a/src/test/burn/TestData/Templates/Bundle.wxs b/src/test/burn/TestData/Templates/Bundle.wxs
index c55f67a7..43974524 100644
--- a/src/test/burn/TestData/Templates/Bundle.wxs
+++ b/src/test/burn/TestData/Templates/Bundle.wxs
@@ -14,7 +14,7 @@
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
 
     <?ifdef SoftwareTag?>
-    <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]TestingSwidTags" />
     <?endif?>
 
     <?ifndef BA?>
diff --git a/src/test/burn/TestData/Templates/Package.wxs b/src/test/burn/TestData/Templates/Package.wxs
index c7597131..a1189fd9 100644
--- a/src/test/burn/TestData/Templates/Package.wxs
+++ b/src/test/burn/TestData/Templates/Package.wxs
@@ -20,7 +20,7 @@
     <?endif?>
 
     <?ifdef SoftwareTag?>
-    <SoftwareTag Regid="regid.1995-08.com.example" InstallDirectory="CommonAppDataFolder" />
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallDirectory="SwidTagBaseFolder" />
     <?endif?>
 
     <PropertyRef Id="TestVersion" />
@@ -35,6 +35,12 @@
   </Package>
 
   <Fragment>
+    <?ifdef SoftwareTag?>
+    <StandardDirectory Id="CommonAppDataFolder">
+      <Directory Id="SwidTagBaseFolder" Name="TestingSwidTags" />
+    </StandardDirectory>
+    <?endif?>
+
     <StandardDirectory Id="ProgramFiles6432Folder">
       <Directory Id="WixDir" Name="~Test WiX">
         <Directory Id="TestDir" Name="$(var.TestGroupName)">