Correctly detect non-keypath file change creating patches

Fixes 7315
author: Rob Mensching <rob@firegiant.com> 2023-03-25 17:28:29 -0700
committer: Rob Mensching <rob@firegiant.com> 2023-03-25 22:00:36 -0700
commit: e602cfa1ce0562eaf6af914189f38556eca80fbf (patch)
tree: 3ce63daf9992b7702f6dc90142c9a500c5bbd237 /src
parent: 035eccfb7400a8e6099e239b2b39116d95ddfb9f (diff)
download: wix-e602cfa1ce0562eaf6af914189f38556eca80fbf.tar.gz
wix-e602cfa1ce0562eaf6af914189f38556eca80fbf.tar.bz2
wix-e602cfa1ce0562eaf6af914189f38556eca80fbf.zip
6 files changed, 8 insertions, 8 deletions
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
index 7b6c21ef..209ab550 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
@@ -419,7 +419,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                var componentId = row.Component;
                // If this file is the keypath of a component
-                if (componentKeyPath.ContainsValue(componentId))
+                if (componentKeyPath.ContainsValue(fileId))
                {
                    if (!componentWithChangedKeyPath.ContainsKey(componentId))
                    {
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
index c27356c8..d07793a1 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
@@ -441,7 +441,7 @@ namespace WixToolsetTest.CoreIntegration
                var mainTransform = ExtractBaselinePatch(patchPath, "RTM.1", baseFolder);
                Assert.Null(mainTransform.Tables["File"]);
                var row = mainTransform.Tables["Registry"].Rows.Single();
-                Assert.Equal("regUty0zLJ5uYhRlGzmOzENKmnAtno", row.FieldAsString(0));
+                Assert.Equal("regWOrcuJr1c2LRNY5vB1ZXx6nPyLo", row.FieldAsString(0));
                Assert.Equal("1.0.1", row.FieldAsString(4));
                var pairedTransform = ExtractBaselinePatch(patchPath, "#RTM.1", baseFolder);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs
index 3723af48..d7aa51fe 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs
@@ -10,7 +10,7 @@
  <Fragment>
    <PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
-        <ComponentRef Id="a.txt" />
+        <ComponentRef Id="CA" />
    </PatchFamily>
  </Fragment>
 </Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs
index dab89379..19302bd8 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs
@@ -10,7 +10,7 @@
  <Fragment>
    <PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
-        <ComponentRef Id="regUty0zLJ5uYhRlGzmOzENKmnAtno" />
+        <ComponentRef Id="CReg" />
    </PatchFamily>
  </Fragment>
 </Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
index e3845382..5c70b87f 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
@@ -16,10 +16,10 @@
  <Fragment>
    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-      <Component>
+      <Component Id="CA">
        <File Id="a.txt" Name="a.txt" Source="Av$(var.A).txt" />
      </Component>
-      <Component>
+      <Component Id="CB">
        <File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />
      </Component>
    </ComponentGroup>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs
index 4d98db90..8b161b70 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs
@@ -12,11 +12,11 @@
  <Fragment>
    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-      <Component>
+      <Component Id="CA">
        <File Id="a.txt" Name="a.txt" Source="A.txt" />
      </Component>
-      <Component>
+      <Component Id="CReg">
        <RegistryValue Root="HKLM" Key="SOFTWARE\!(bind.property.ProductName)\Patch" Name="Version" Value="$(V)" />
      </Component>
    </ComponentGroup>
author	Rob Mensching <rob@firegiant.com>	2023-03-25 17:28:29 -0700
committer	Rob Mensching <rob@firegiant.com>	2023-03-25 22:00:36 -0700
commit	e602cfa1ce0562eaf6af914189f38556eca80fbf (patch)
tree	3ce63daf9992b7702f6dc90142c9a500c5bbd237 /src
parent	035eccfb7400a8e6099e239b2b39116d95ddfb9f (diff)
download	wix-e602cfa1ce0562eaf6af914189f38556eca80fbf.tar.gz wix-e602cfa1ce0562eaf6af914189f38556eca80fbf.tar.bz2 wix-e602cfa1ce0562eaf6af914189f38556eca80fbf.zip

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs index 7b6c21ef..209ab550 100644 --- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs +++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
@@ -419,7 +419,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
419	var componentId = row.Component;	419	var componentId = row.Component;
420		420
421	// If this file is the keypath of a component	421	// If this file is the keypath of a component
422	if (componentKeyPath.ContainsValue(componentId))	422	if (componentKeyPath.ContainsValue(fileId))
423	{	423	{
424	if (!componentWithChangedKeyPath.ContainsKey(componentId))	424	if (!componentWithChangedKeyPath.ContainsKey(componentId))
425	{	425	{


diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs index c27356c8..d07793a1 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
@@ -441,7 +441,7 @@ namespace WixToolsetTest.CoreIntegration
441	var mainTransform = ExtractBaselinePatch(patchPath, "RTM.1", baseFolder);	441	var mainTransform = ExtractBaselinePatch(patchPath, "RTM.1", baseFolder);
442	Assert.Null(mainTransform.Tables["File"]);	442	Assert.Null(mainTransform.Tables["File"]);
443	var row = mainTransform.Tables["Registry"].Rows.Single();	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));	445	Assert.Equal("1.0.1", row.FieldAsString(4));
446		446
447	var pairedTransform = ExtractBaselinePatch(patchPath, "#RTM.1", baseFolder);	447	var pairedTransform = ExtractBaselinePatch(patchPath, "#RTM.1", baseFolder);


diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs index 3723af48..d7aa51fe 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFileFilter/Patch.wxs
@@ -10,7 +10,7 @@
10		10
11	<Fragment>	11	<Fragment>
12	<PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">	12	<PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
13	<ComponentRef Id="a.txt" />	13	<ComponentRef Id="CA" />
14	</PatchFamily>	14	</PatchFamily>
15	</Fragment>	15	</Fragment>
16	</Wix>	16	</Wix>


diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs index dab89379..19302bd8 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyRegistryFilter/Patch.wxs
@@ -10,7 +10,7 @@
10		10
11	<Fragment>	11	<Fragment>
12	<PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">	12	<PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
13	<ComponentRef Id="regUty0zLJ5uYhRlGzmOzENKmnAtno" />	13	<ComponentRef Id="CReg" />
14	</PatchFamily>	14	</PatchFamily>
15	</Fragment>	15	</Fragment>
16	</Wix>	16	</Wix>


diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs index e3845382..5c70b87f 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
@@ -16,10 +16,10 @@
16		16
17	<Fragment>	17	<Fragment>
18	<ComponentGroup Id="Components" Directory="INSTALLFOLDER">	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" />	20	<File Id="a.txt" Name="a.txt" Source="Av$(var.A).txt" />
21	</Component>	21	</Component>
22	<Component>	22	<Component Id="CB">
23	<File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />	23	<File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />
24	</Component>	24	</Component>
25	</ComponentGroup>	25	</ComponentGroup>


diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs index 4d98db90..8b161b70 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchTemplatePackage/Package.wxs
@@ -12,11 +12,11 @@
12		12
13	<Fragment>	13	<Fragment>
14	<ComponentGroup Id="Components" Directory="INSTALLFOLDER">	14	<ComponentGroup Id="Components" Directory="INSTALLFOLDER">
15	<Component>	15	<Component Id="CA">
16	<File Id="a.txt" Name="a.txt" Source="A.txt" />	16	<File Id="a.txt" Name="a.txt" Source="A.txt" />
17	</Component>	17	</Component>
18		18
19	<Component>	19	<Component Id="CReg">
20	<RegistryValue Root="HKLM" Key="SOFTWARE\!(bind.property.ProductName)\Patch" Name="Version" Value="$(V)" />	20	<RegistryValue Root="HKLM" Key="SOFTWARE\!(bind.property.ProductName)\Patch" Name="Version" Value="$(V)" />
21	</Component>	21	</Component>
22	</ComponentGroup>	22	</ComponentGroup>