Fix loading BAFunctions.

2 files changed, 12 insertions, 2 deletions

diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
index e8dc7a3e..c6a1e0c1 100644
--- a/src/ext/Bal/wixext/BalBurnBackendExtension.cs
+++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
@@ -107,12 +107,14 @@ namespace WixToolset.Bal
             }
             else
             {
-                var payloadId = baFunctionsSymbol.Id;
-                var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id);
+                var payloadId = baFunctionsSymbol.PayloadId;
+                var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id.Id);
                 if (BurnConstants.BurnUXContainerName != bundlePayloadSymbol.ContainerRef)
                 {
                     this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsSymbol.SourceLineNumbers));
                 }
+
+                baFunctionsSymbol.FilePath = bundlePayloadSymbol.Name;
             }
         }
 
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs
index 19c7602d..83dd20b0 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Bal
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.FilePath), IntermediateFieldType.String),
             },
             typeof(WixBalBAFunctionsSymbol));
     }
@@ -24,6 +25,7 @@ namespace WixToolset.Bal.Symbols
     public enum WixBalBAFunctionsSymbolFields
     {
         PayloadId,
+        FilePath,
     }
 
     public class WixBalBAFunctionsSymbol : IntermediateSymbol
@@ -43,5 +45,11 @@ namespace WixToolset.Bal.Symbols
             get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString();
             set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value);
         }
+
+        public string FilePath
+        {
+            get => this.Fields[(int)WixBalBAFunctionsSymbolFields.FilePath].AsString();
+            set => this.Set((int)WixBalBAFunctionsSymbolFields.FilePath, value);
+        }
     }
 }
\ No newline at end of file