From ffae86ed1f600a72d4183166ffbde9dbed1843e9 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 1 Jan 2023 18:01:42 -0800
Subject: Small fixes found while updating XSDs

---
 src/internal/SetBuildNumber/SetBuildNumber.proj                    | 1 -
 src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs         | 2 +-
 .../TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs     | 2 +-
 .../TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs     | 2 +-
 .../DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs  | 2 +-
 .../DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs  | 2 +-
 src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs     | 2 +-
 src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs         | 2 +-
 .../burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs  | 2 +-
 src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs  | 2 +-
 .../WixToolset.Templates/templates/PackageProject/Package.wxs      | 2 +-
 src/wix/WixToolset.Core/Compiler_Patch.cs                          | 2 +-
 src/wix/WixToolset.Core/Compiler_Tag.cs                            | 7 +++++--
 13 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
index 23788d52..5a71c673 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -131,7 +131,6 @@
           DependsOnTargets="$(SetBuildNumbersDependsOn)"
           BeforeTargets="AfterBuild" />
 
-
   <ItemGroup>
     <PackageReference Include="GitInfo" Version="2.2.0" />
   </ItemGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
index 0f51b00d..4fb1fd43 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
@@ -3,7 +3,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Detect" />
+    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
index c1b65656..96b7d146 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" />
+    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
     <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
 
     <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
index 8a5722f7..74ed5902 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{B774BF3B-3E89-4D42-9D29-AFAB27C5772D}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" />
+    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
     <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
 
     <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
index 8ef8a351..bfe394bc 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
+    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
     
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
index 2b47d5ed..b5316bf0 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
+    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
     
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
index 1347836a..509047d6 100644
--- a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Detect" />
+    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
index 422b4b22..5207be28 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Detect" />
+    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
index ddd4d8db..8823f4b1 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
@@ -4,7 +4,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Patch" />
+    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
 
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
diff --git a/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs b/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
index 592c844d..aafba36c 100644
--- a/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
+++ b/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Module Id="$safeprojectname$" Guid="PUT-GUID-HERE" Manufacturer="$company$" Language="0" Version="$version$">
+  <Module Id="$safeprojectname$" Guid="PUT-GUID-HERE" Language="0" Version="$version$">
     <Component Guid='PUT-GUID-HERE' Directory='TARGETDIR'>
         <!-- TODO: Install something more useful than this source code file itself -->
         <File Source="Module.wxs" />
diff --git a/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs b/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
index ac69e549..ae1fd550 100644
--- a/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
+++ b/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="$safeprojectname$" Manufacturer="$company$" Version="$version$" UpgradeCode="PUT-GUID-HERE">
-    <MajorUpgrade DowngradeError="A newer version of [ProductName] is already installed" />
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed" />
 
     <Feature Id="Main">
       <ComponentGroupRef Id="Components" />
diff --git a/src/wix/WixToolset.Core/Compiler_Patch.cs b/src/wix/WixToolset.Core/Compiler_Patch.cs
index 0ea3c441..bd250ef4 100644
--- a/src/wix/WixToolset.Core/Compiler_Patch.cs
+++ b/src/wix/WixToolset.Core/Compiler_Patch.cs
@@ -412,7 +412,7 @@ namespace WixToolset.Core
                         this.ParsePatchChildRefElement(child, "Property");
                         break;
                     case "SoftwareTagRef":
-                        this.ParseTagRefElement(child);
+                        this.ParseSoftwareTagRefElement(child);
                         break;
                     case "UIRef":
                         this.ParsePatchChildRefElement(child, "WixUI");
diff --git a/src/wix/WixToolset.Core/Compiler_Tag.cs b/src/wix/WixToolset.Core/Compiler_Tag.cs
index 991c87fd..0fb719ce 100644
--- a/src/wix/WixToolset.Core/Compiler_Tag.cs
+++ b/src/wix/WixToolset.Core/Compiler_Tag.cs
@@ -263,7 +263,7 @@ namespace WixToolset.Core
         /// Parses a TagRef element for Software Id Tag registration under a PatchFamily element.
         /// </summary>
         /// <param name="node">The element to parse.</param>
-        private void ParseTagRefElement(XElement node)
+        private void ParseSoftwareTagRefElement(XElement node)
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             string regid = null;
@@ -311,6 +311,9 @@ namespace WixToolset.Core
             }
         }
 
-        private Identifier CreateTagId(string regid) => this.Core.CreateIdentifier("tag", regid, ".product.tag");
+        private Identifier CreateTagId(string regid)
+        {
+            return this.Core.CreateIdentifier("tag", regid, ".product.tag");
+        }
     }
 }
-- 
cgit v1.2.3-55-g6feb