Move CustomAction script inner text to ScriptFile attribute

2 files changed, 9 insertions, 4 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index da92be69..ea6d49a0 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -347,9 +347,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 command.Execute();
             }
 
-            // Update control text from files on disk.
+            // Update tuples that reference text files on disk.
             {
-                var command = new UpdateControlTextCommand(this.Messaging, section);
+                var command = new UpdateFromTextFilesCommand(this.Messaging, section);
                 command.Execute();
             }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateControlTextCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs
index 104a3a37..4d09ff6b 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateControlTextCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs
@@ -9,9 +9,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Data.Tuples;
     using WixToolset.Extensibility.Services;
 
-    internal class UpdateControlTextCommand
+    internal class UpdateFromTextFilesCommand
     {
-        public UpdateControlTextCommand(IMessaging messaging, IntermediateSection section)
+        public UpdateFromTextFilesCommand(IMessaging messaging, IntermediateSection section)
         {
             this.Messaging = messaging;
             this.Section = section;
@@ -32,6 +32,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 control.Text = this.ReadTextFile(control.SourceLineNumbers, control.SourceFile.Path);
             }
+
+            foreach (var customAction in this.Section.Tuples.OfType<CustomActionTuple>().Where(c => c.ScriptFile != null))
+            {
+                customAction.Target = this.ReadTextFile(customAction.SourceLineNumbers, customAction.ScriptFile.Path);
+            }
         }
 
         /// <summary>