@joebigelow / wix / commits / ffae86ed

Small fixes found while updating XSDs

Rob Mensching committed Jan 1, 2023 at 18:01 UTC ffae86ed1f600a72d4183166ffbde9dbed1843e9
13 files changed +16 -14
src/internal/SetBuildNumber/SetBuildNumber.proj
-1
@@ -131,7 +131,6 @@
131 DependsOnTargets="$(SetBuildNumbersDependsOn)"
132 BeforeTargets="AfterBuild" />
133
134 -
134 <ItemGroup>
135 <PackageReference Include="GitInfo" Version="2.2.0" />
136 </ItemGroup>
src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
+1 -1
@@ -3,7 +3,7 @@
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
4 <Fragment>
5 <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" />
6 - <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Detect" />
6 + <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
7
8 <PackageGroup Id="BundlePackages">
9 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
+1 -1
@@ -5,7 +5,7 @@
5 <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">
6 <Fragment>
7 <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" />
8 - <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" />
8 + <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
9 <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
10
11 <PackageGroup Id="BundlePackages">
src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
+1 -1
@@ -5,7 +5,7 @@
5 <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">
6 <Fragment>
7 <fortestinguseonly:ForTestingUseOnlyBundle Id="{B774BF3B-3E89-4D42-9D29-AFAB27C5772D}" />
8 - <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" />
8 + <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
9 <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
10
11 <PackageGroup Id="BundlePackages">
src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 - <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
5 + <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
6
7 <PackageGroup Id="BundlePackages">
8 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 - <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
5 + <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
6
7 <PackageGroup Id="BundlePackages">
8 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 - <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Detect" />
5 + <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
6
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 - <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Detect" />
5 + <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
6
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
+1 -1
@@ -4,7 +4,7 @@
4
5 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment>
7 - <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Patch" />
7 + <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
8
9 <PackageGroup Id="BundlePackages">
10 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
+1 -1
@@ -1,5 +1,5 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <Module Id="$safeprojectname$" Guid="PUT-GUID-HERE" Manufacturer="$company$" Language="0" Version="$version$">
2 + <Module Id="$safeprojectname$" Guid="PUT-GUID-HERE" Language="0" Version="$version$">
3 <Component Guid='PUT-GUID-HERE' Directory='TARGETDIR'>
4 <!-- TODO: Install something more useful than this source code file itself -->
5 <File Source="Module.wxs" />
src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
+1 -1
@@ -1,6 +1,6 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name="$safeprojectname$" Manufacturer="$company$" Version="$version$" UpgradeCode="PUT-GUID-HERE">
3 - <MajorUpgrade DowngradeError="A newer version of [ProductName] is already installed" />
3 + <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed" />
4
5 <Feature Id="Main">
6 <ComponentGroupRef Id="Components" />
src/wix/WixToolset.Core/Compiler_Patch.cs
+1 -1
@@ -412,7 +412,7 @@ namespace WixToolset.Core
412 this.ParsePatchChildRefElement(child, "Property");
413 break;
414 case "SoftwareTagRef":
415 - this.ParseTagRefElement(child);
415 + this.ParseSoftwareTagRefElement(child);
416 break;
417 case "UIRef":
418 this.ParsePatchChildRefElement(child, "WixUI");
src/wix/WixToolset.Core/Compiler_Tag.cs
+5 -2
@@ -263,7 +263,7 @@ namespace WixToolset.Core
263 /// Parses a TagRef element for Software Id Tag registration under a PatchFamily element.
264 /// </summary>
265 /// <param name="node">The element to parse.</param>
266 - private void ParseTagRefElement(XElement node)
266 + private void ParseSoftwareTagRefElement(XElement node)
267 {
268 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
269 string regid = null;
@@ -311,6 +311,9 @@ namespace WixToolset.Core
311 }
312 }
313
314 - private Identifier CreateTagId(string regid) => this.Core.CreateIdentifier("tag", regid, ".product.tag");
314 + private Identifier CreateTagId(string regid)
315 + {
316 + return this.Core.CreateIdentifier("tag", regid, ".product.tag");
317 + }
318 }
319 }