Correctly detect non-keypath file change creating patches
Fixes 7315
Rob Mensching committed
Mar 25, 2023 at 17:28 UTC
e602cfa1ce0562eaf6af914189f38556eca80fbf
6 files changed
+8
-8
src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
+1
-1
@@ -419,7 +419,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
419
var componentId = row.Component;
420
421
// If this file is the keypath of a component
422
- if (componentKeyPath.ContainsValue(componentId))
422
+ if (componentKeyPath.ContainsValue(fileId))
423
{
424
if (!componentWithChangedKeyPath.ContainsKey(componentId))
425
{
src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
+1
-1
@@ -441,7 +441,7 @@ namespace WixToolsetTest.CoreIntegration
441
var mainTransform = ExtractBaselinePatch(patchPath, "RTM.1", baseFolder);
442
Assert.Null(mainTransform.Tables["File"]);
443
var row = mainTransform.Tables["Registry"].Rows.Single();
444
- Assert.Equal("regUty0zLJ5uYhRlGzmOzENKmnAtno", row.FieldAsString(0));
444
+ Assert.Equal("regWOrcuJr1c2LRNY5vB1ZXx6nPyLo", row.FieldAsString(0));
445
Assert.Equal("1.0.1", row.FieldAsString(4));
446
447
var pairedTransform = ExtractBaselinePatch(patchPath, "#RTM.1", baseFolder);
src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs
+1
-1
@@ -10,7 +10,7 @@
10
11
<Fragment>
12
<PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
13
- <ComponentRef Id="a.txt" />
13
+ <ComponentRef Id="CA" />
14
</PatchFamily>
15
</Fragment>
16
</Wix>
src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs
+1
-1
@@ -10,7 +10,7 @@
10
11
<Fragment>
12
<PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
13
- <ComponentRef Id="regUty0zLJ5uYhRlGzmOzENKmnAtno" />
13
+ <ComponentRef Id="CReg" />
14
</PatchFamily>
15
</Fragment>
16
</Wix>
src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
+2
-2
@@ -16,10 +16,10 @@
16
17
<Fragment>
18
<ComponentGroup Id="Components" Directory="INSTALLFOLDER">
19
- <Component>
19
+ <Component Id="CA">
20
<File Id="a.txt" Name="a.txt" Source="Av$(var.A).txt" />
21
</Component>
22
- <Component>
22
+ <Component Id="CB">
23
<File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />
24
</Component>
25
</ComponentGroup>
src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs
+2
-2
@@ -12,11 +12,11 @@
12
13
<Fragment>
14
<ComponentGroup Id="Components" Directory="INSTALLFOLDER">
15
- <Component>
15
+ <Component Id="CA">
16
<File Id="a.txt" Name="a.txt" Source="A.txt" />
17
</Component>
18
19
- <Component>
19
+ <Component Id="CReg">
20
<RegistryValue Root="HKLM" Key="SOFTWARE\!(bind.property.ProductName)\Patch" Name="Version" Value="$(V)" />
21
</Component>
22
</ComponentGroup>