From e602cfa1ce0562eaf6af914189f38556eca80fbf Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 25 Mar 2023 17:28:29 -0700
Subject: Correctly detect non-keypath file change creating patches

Fixes 7315
---
 .../Bind/UpdateTransformsWithFileFacades.cs                           | 2 +-
 src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs           | 2 +-
 .../TestData/PatchFamilyFileFilter/Patch.wxs                          | 2 +-
 .../TestData/PatchFamilyRegistryFilter/Patch.wxs                      | 2 +-
 .../WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs   | 4 ++--
 .../TestData/PatchTemplatePackage/Package.wxs                         | 4 ++--
 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>
-- 
cgit v1.2.3-55-g6feb