Update old test code to latest SWID tag spec

Fixes 6675

4 files changed, 12 insertions, 4 deletions

diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
index 9b91b3f4..5eeaff59 100644
--- a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
@@ -5,6 +5,9 @@
     <IncludeSoftwareTag>true</IncludeSoftwareTag>
     <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode>
   </PropertyGroup>
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
diff --git a/src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj
index da9acb5e..6163691a 100644
--- a/src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj
+++ b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj
@@ -1,8 +1,7 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
-    <OutputType>PatchCreation</OutputType>
-    <TargetExt>.msp</TargetExt>
+    <OutputType>Patch</OutputType>
     <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
   </PropertyGroup>
   <ItemGroup>
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)">