Build the SoftwareTags.

17 files changed, 26 insertions, 20 deletions

diff --git a/src/TestData/PatchTests/BundleA/BundleA.wixproj b/src/TestData/PatchTests/BundleA/BundleA.wixproj
index e1465732..96f1e03a 100644
--- a/src/TestData/PatchTests/BundleA/BundleA.wixproj
+++ b/src/TestData/PatchTests/BundleA/BundleA.wixproj
@@ -2,6 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <IncludeSoftwareTag>true</IncludeSoftwareTag>
     <UpgradeCode>{486FC795-69A5-4130-8727-4068F645A0A1}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/TestData/PatchTests/BundleA/BundleA.wxs b/src/TestData/PatchTests/BundleA/BundleA.wxs
index d40351a1..e3e0f4d7 100644
--- a/src/TestData/PatchTests/BundleA/BundleA.wxs
+++ b/src/TestData/PatchTests/BundleA/BundleA.wxs
@@ -1,11 +1,9 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>    
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
     </PackageGroup>
-
-    <!--<swid:Tag Regid="regid.1995-08.com.example" />-->
   </Fragment>
 </Wix>
diff --git a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
index 290d5291..f7a8c580 100644
--- a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
+++ b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
@@ -2,6 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <IncludeSoftwareTag>true</IncludeSoftwareTag>
     <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs
index 89f24936..bf0c0451 100644
--- a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs
+++ b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs
@@ -1,11 +1,9 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>    
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes" />
     </PackageGroup>
-
-    <!--<swid:Tag Regid="regid.1995-08.com.example" Type="patch" />-->
   </Fragment>
 </Wix>
diff --git a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
index 07b82dc8..b886f148 100644
--- a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
+++ b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
@@ -2,6 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <IncludeSoftwareTag>true</IncludeSoftwareTag>
     <UpgradeCode>{1BE09331-2327-4534-9223-59B54EFAE7A5}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs
index f2c44ad4..24063db3 100644
--- a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs
+++ b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs
@@ -1,12 +1,10 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>    
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes" />
       <MspPackage Id="PatchA2" SourceFile="$(var.PatchA2.TargetPath)" PerMachine="yes" />
     </PackageGroup>
-
-    <!--<swid:Tag Regid="regid.1995-08.com.example" Type="patch" />-->
   </Fragment>
 </Wix>
diff --git a/src/TestData/PatchTests/PackageAv1/PackageA.props b/src/TestData/PatchTests/PackageAv1/PackageA.props
index 1209d09e..a9d9b981 100644
--- a/src/TestData/PatchTests/PackageAv1/PackageA.props
+++ b/src/TestData/PatchTests/PackageAv1/PackageA.props
@@ -4,6 +4,7 @@
     <PackageName>PackageA</PackageName>
     <ProductComponentsRef>true</ProductComponentsRef>
     <ProductCode>{724F9BA5-DD9D-4851-855E-ECC35B27BF11}</ProductCode>
+    <IncludeSoftwareTag>true</IncludeSoftwareTag>
     <UpgradeCode>{C56DA396-7A9A-4177-8264-638161CE9EB8}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/TestData/PatchTests/PackageAv1/ProductComponents.wxs b/src/TestData/PatchTests/PackageAv1/ProductComponents.wxs
index 81c6da0c..72b5d4bd 100644
--- a/src/TestData/PatchTests/PackageAv1/ProductComponents.wxs
+++ b/src/TestData/PatchTests/PackageAv1/ProductComponents.wxs
@@ -1,12 +1,10 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
     <ComponentGroup Id="ProductComponents">
       <ComponentRef Id="RegistryComponent2" />
     </ComponentGroup>
-
-    <!-- <swid:Tag Regid="regid.1995-08.com.example" /> -->
   </Fragment>
 
   <Fragment>
diff --git a/src/TestData/PatchTests/PatchA/PatchA.wxs b/src/TestData/PatchTests/PatchA/PatchA.wxs
index 067f25ca..ba961762 100644
--- a/src/TestData/PatchTests/PatchA/PatchA.wxs
+++ b/src/TestData/PatchTests/PatchA/PatchA.wxs
@@ -4,7 +4,7 @@
 <?define Version = 1.0.0.0?>
 <?endif?>
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Patch AllowRemoval="yes" Classification="Update" Description="Patch A in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
         <Media Id="100" Cabinet="PatchA" EmbedCab="yes">
             <PatchBaseline
@@ -15,7 +15,7 @@
         </Media>
 
         <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
-          <!-- <swid:TagRef Regid="regid.1995-08.com.example" /> -->
+          <SoftwareTagRef Regid="regid.1995-08.com.example" />
 
           <ComponentRef Id="RegistryComponent"/>
           <PropertyRef Id="TestVersion"/>
diff --git a/src/TestData/PatchTests/PatchA2/PatchA2.wxs b/src/TestData/PatchTests/PatchA2/PatchA2.wxs
index a06401cc..e2aa3e2b 100644
--- a/src/TestData/PatchTests/PatchA2/PatchA2.wxs
+++ b/src/TestData/PatchTests/PatchA2/PatchA2.wxs
@@ -4,7 +4,7 @@
 <?define Version = 1.0.0.0?>
 <?endif?>
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Patch AllowRemoval="yes" Classification="Update" Description="Patch A2 in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A2" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
         <Media Id="100" Cabinet="PatchA2" EmbedCab="yes">
             <PatchBaseline
@@ -15,7 +15,7 @@
         </Media>
 
         <PatchFamily Id="A2" Version="$(var.Version)" Supersede="yes">
-          <!-- <swid:TagRef Regid="regid.1995-08.com.example" /> -->
+          <SoftwareTagRef Regid="regid.1995-08.com.example" />
 
           <ComponentRef Id="RegistryComponent2"/>
         </PatchFamily>
diff --git a/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wxs b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wxs
index 3de10a91..2008fa8b 100644
--- a/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wxs
+++ b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wxs
@@ -1,6 +1,6 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>    
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" />
diff --git a/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wxs b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wxs
index 59fdd0c9..e3e0f4d7 100644
--- a/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wxs
+++ b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wxs
@@ -1,6 +1,6 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>    
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wxs b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wxs
index 27fed68e..88a93d7a 100644
--- a/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wxs
+++ b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wxs
@@ -1,6 +1,6 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>    
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" />
diff --git a/src/TestData/Templates/Bundle.wxs b/src/TestData/Templates/Bundle.wxs
index 6042a616..c77bfbd7 100644
--- a/src/TestData/Templates/Bundle.wxs
+++ b/src/TestData/Templates/Bundle.wxs
@@ -10,6 +10,10 @@
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
 
+    <?ifdef SoftwareTag?>
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
+    <?endif?>
+
     <?ifndef BA?>
       <!-- pulled in through the PackageGroupRef below -->
     <?elseif $(var.BA) = "TestBAdnc"?>
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs
index 4923e1aa..caf28a92 100644
--- a/src/TestData/Templates/Package.wxs
+++ b/src/TestData/Templates/Package.wxs
@@ -19,6 +19,10 @@
     <MediaTemplate CabinetTemplate="{0}$(var.CabPrefix).cab" />
     <?endif?>
 
+    <?ifdef SoftwareTag?>
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallDirectory="CommonAppDataFolder" />
+    <?endif?>
+
     <PropertyRef Id="TestVersion" />
 
     <Feature Id="Complete" Level="1">
@@ -32,6 +36,7 @@
 
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="CommonAppDataFolder" />
       <Directory Id="ProgramFilesFolder">
         <Directory Id="WixDir" Name="~Test WiX">
           <Directory Id="TestDir" Name="$(var.TestGroupName)">
diff --git a/src/Wix.Build.targets b/src/Wix.Build.targets
index 3fe78ae3..20a9bf66 100644
--- a/src/Wix.Build.targets
+++ b/src/Wix.Build.targets
@@ -7,6 +7,7 @@
     <DefineConstants>TestGroupName=$(TestGroupName);PackageName=$(PackageName);BundleName=$(BundleName);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(BA)' != '' ">BA=$(BA);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(CabPrefix)' != '' ">CabPrefix=$(CabPrefix);$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(IncludeSoftwareTag)' == 'true' ">SoftwareTag=1;$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(ProductCode)' != '' ">ProductCode=$(ProductCode);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(ProductComponentsRef)' == 'true' ">ProductComponents=1;$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
diff --git a/src/WixToolsetTest.BurnE2E/PatchTests.cs b/src/WixToolsetTest.BurnE2E/PatchTests.cs
index 19adf8db..0c7fdc98 100644
--- a/src/WixToolsetTest.BurnE2E/PatchTests.cs
+++ b/src/WixToolsetTest.BurnE2E/PatchTests.cs
@@ -55,7 +55,7 @@ namespace WixToolsetTest.BurnE2E
             packageAv1.VerifyTestRegistryRootDeleted();
         }
 
-        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/5949")]
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6380")]
         public void CanPatchSwidTag()
         {
             var originalVersion = "1.0.0.0";