From 3f05c650723ecd0a8fe7ab151c67db6c13cb5d75 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 6 Sep 2020 21:09:19 -0400
Subject: Replace BinaryKey with BinaryRef and FileKey with FileRef.

---
 .../TestData/CustomAction/CustomActionCycle.wxs                  | 9 ++++-----
 .../TestData/CustomAction/SimpleCustomAction.wxs                 | 5 ++---
 .../TestData/CustomAction/UnscheduledCustomAction.wxs            | 7 +++----
 .../WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs   | 2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')

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" />
-- 
cgit v1.2.3-55-g6feb