From 3e0e54aff605da9c5ec6c02f7e83d5e816c857a2 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 26 Aug 2022 17:47:46 -0700
Subject: Update old test code to latest SWID tag spec

Fixes 6675
---
 .../TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj   |  3 +++
 src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj     |  3 +--
 src/test/burn/TestData/Templates/Bundle.wxs                 |  2 +-
 src/test/burn/TestData/Templates/Package.wxs                |  8 +++++++-
 src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs          | 13 ++++++++-----
 5 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'src/test')

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)">
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs
index b63be5f5..b0cdea16 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs
@@ -56,7 +56,7 @@ namespace WixToolsetTest.BurnE2E
             packageAv1.VerifyTestRegistryRootDeleted();
         }
 
-        [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6675")]
+        [RuntimeFact]
         public void CanPatchSwidTag()
         {
             var originalVersion = "1.0.0.0";
@@ -116,8 +116,7 @@ namespace WixToolsetTest.BurnE2E
 
         private static void VerifySwidTagVersion(string tagName, string expectedVersion)
         {
-            var regidFolder = Environment.ExpandEnvironmentVariables(@"%ProgramData%\regid.1995-08.com.example");
-            var tagPath = Path.Combine(regidFolder, "regid.1995-08.com.example " + tagName + ".swidtag");
+            var tagPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "TestingSwidTags", "swidtag", tagName + ".swidtag");
             string version = null;
 
             if (File.Exists(tagPath))
@@ -126,11 +125,15 @@ namespace WixToolsetTest.BurnE2E
                 doc.Load(tagPath);
 
                 var ns = new XmlNamespaceManager(doc.NameTable);
-                ns.AddNamespace("s", "http://standards.iso.org/iso/19770/-2/2009/schema.xsd");
+                ns.AddNamespace("s", "http://standards.iso.org/iso/19770/-2/2015/schema.xsd");
 
-                var versionNode = doc.SelectSingleNode("/s:software_identification_tag/s:product_version/s:name", ns);
+                var versionNode = doc.SelectSingleNode("/s:SoftwareIdentity/@version", ns);
                 version = versionNode?.InnerText ?? String.Empty;
             }
+            else
+            {
+                Assert.True(expectedVersion == null, $"Did not find SWID tag with expected version {expectedVersion} at: {tagPath}");
+            }
 
             Assert.Equal(expectedVersion, version);
         }
-- 
cgit v1.2.3-55-g6feb