Replace BinaryKey with BinaryRef and FileKey with FileRef.

6 files changed, 22 insertions, 25 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 591ff5ef..e471d924 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -3997,12 +3997,12 @@ namespace WixToolset.Core.WindowsInstaller
                 switch (source)
                 {
                     case WindowsInstallerConstants.MsidbCustomActionTypeBinaryData:
-                        xCustomAction.SetAttributeValue("BinaryKey", row.FieldAsString(2));
+                        xCustomAction.SetAttributeValue("BinaryRef", row.FieldAsString(2));
                         break;
                     case WindowsInstallerConstants.MsidbCustomActionTypeSourceFile:
                         if (!row.IsColumnNull(2))
                         {
-                            xCustomAction.SetAttributeValue("FileKey", row.FieldAsString(2));
+                            xCustomAction.SetAttributeValue("FileRef", row.FieldAsString(2));
                         }
                         break;
                     case WindowsInstallerConstants.MsidbCustomActionTypeDirectory:
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 2ef85ff0..7be581bc 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -3159,10 +3159,10 @@ namespace WixToolset.Core
                     case "Id":
                         id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib);
                         break;
-                    case "BinaryKey":
+                    case "BinaryRef":
                         if (null != source)
                         {
-                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script"));
+                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                         }
                         source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                         sourceType = CustomActionSourceType.Binary;
@@ -3171,7 +3171,7 @@ namespace WixToolset.Core
                     case "Directory":
                         if (null != source)
                         {
-                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script"));
+                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileRef", "Property", "Script"));
                         }
                         source = this.Core.CreateDirectoryReferenceFromInlineSyntax(sourceLineNumbers, attrib, null);
                         sourceType = CustomActionSourceType.Directory;
@@ -3239,10 +3239,10 @@ namespace WixToolset.Core
                             break;
                         }
                         break;
-                    case "FileKey":
+                    case "FileRef":
                         if (null != source)
                         {
-                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script"));
+                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                         }
                         source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                         sourceType = CustomActionSourceType.File;
@@ -3268,7 +3268,7 @@ namespace WixToolset.Core
                     case "Property":
                         if (null != source)
                         {
-                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script"));
+                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                         }
                         source = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                         sourceType = CustomActionSourceType.Property;
@@ -3299,7 +3299,7 @@ namespace WixToolset.Core
                     case "Script":
                         if (null != source)
                         {
-                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script"));
+                            this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                         }
 
                         if (null != target)
@@ -3394,7 +3394,7 @@ namespace WixToolset.Core
             {
                 if (null == source)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "VBScriptCall", "BinaryKey", "FileKey", "Property"));
+                    this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "VBScriptCall", "BinaryRef", "FileRef", "Property"));
                 }
                 else if (CustomActionSourceType.Directory == sourceType)
                 {
@@ -3405,7 +3405,7 @@ namespace WixToolset.Core
             {
                 if (null == source)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "JScriptCall", "BinaryKey", "FileKey", "Property"));
+                    this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "JScriptCall", "BinaryRef", "FileRef", "Property"));
                 }
                 else if (CustomActionSourceType.Directory == sourceType)
                 {
@@ -3416,7 +3416,7 @@ namespace WixToolset.Core
             {
                 if (null == source)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ExeCommand", "BinaryKey", "Directory", "FileKey", "Property"));
+                    this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ExeCommand", "BinaryRef", "Directory", "FileRef", "Property"));
                 }
             }
             else if (CustomActionTargetType.TextData == targetType && CustomActionSourceType.Directory != sourceType && CustomActionSourceType.Property != sourceType && CustomActionSourceType.File != sourceType)
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs
index 56c07eb9..be991c65 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <ComponentGroup Id="ProductComponents">
             <ComponentGroupRef Id="MinimalComponentGroup" />
         </ComponentGroup>
 
         <Binary Id="Binary1" SourceFile="test.txt" />
-        <CustomAction Id="Action1" BinaryKey="Binary1" DllEntry="EntryPoint1" />
-        <CustomAction Id="Action2" BinaryKey="Binary1" DllEntry="EntryPoint2" />
-        <CustomAction Id="Action3" BinaryKey="Binary1" DllEntry="EntryPoint3" />
+        <CustomAction Id="Action1" DllEntry="EntryPoint1" BinaryRef="Binary1" />
+        <CustomAction Id="Action2" DllEntry="EntryPoint2" BinaryRef="Binary1" />
+        <CustomAction Id="Action3" DllEntry="EntryPoint3" BinaryRef="Binary1" />
 
         <InstallExecuteSequence>
             <Custom Action="Action1" After="Action2" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
index 72d5e4a5..ff8741cf 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <ComponentGroup Id="ProductComponents">
             <ComponentGroupRef Id="MinimalComponentGroup" />
         </ComponentGroup>
 
         <Binary Id="Binary1" SourceFile="test.txt" />
-        <CustomAction Id="Action1" BinaryKey="Binary1" DllEntry="EntryPoint1" />
+        <CustomAction Id="Action1" DllEntry="EntryPoint1" BinaryRef="Binary1" />
 
         <InstallExecuteSequence>
             <Custom Action="Action1" After="InstallFiles" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
index 0784824a..f8ce1c38 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <ComponentGroup Id="ProductComponents">
             <ComponentGroupRef Id="MinimalComponentGroup" />
         </ComponentGroup>
 
         <Binary Id="Binary1" SourceFile="test.txt" />
-        <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" />
+        <CustomAction Id="CustomAction1" DllEntry="InvalidEntryPoint" BinaryRef="Binary1" />
         <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." />
-        <CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" />
+        <CustomAction Id="CustomActionWithHiddenTarget" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" BinaryRef="Binary1" />
         <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" />
         <AdminExecuteSequence>
             <Custom Action="CustomAction2" After="CostInitialize" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
index 00a80fca..bf5223c1 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
@@ -5,7 +5,7 @@
 
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
-        <CustomAction Id="CAFromExtension" BinaryKey="BinFromWir" DllEntry="DoesntExist" />
+        <CustomAction Id="CAFromExtension" DllEntry="DoesntExist" BinaryRef="BinFromWir" />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <ComponentGroupRef Id="ProductComponents" />