From 8a42828f169796f01d9821790e4983639062d3b9 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 9 Apr 2020 14:33:18 +1000
Subject: Fix bug when parsing PayloadGroupRef.

---
 src/WixToolset.Core/Compiler_Bundle.cs                |  2 +-
 .../SimpleBundle/MultiFileBootstrapperApplication.wxs |  2 +-
 .../TestData/SimpleBundle/MultiFileBundle.wxs         | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index 5d7072d0..ff746f8d 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -1342,7 +1342,7 @@ namespace WixToolset.Core
 
             this.Core.ParseForExtensionElements(node);
 
-            this.CreateGroupAndOrderingRows(sourceLineNumbers, parentType, parentId.Id, ComplexReferenceChildType.PayloadGroup, id.Id, previousType, previousId.Id);
+            this.CreateGroupAndOrderingRows(sourceLineNumbers, parentType, parentId?.Id, ComplexReferenceChildType.PayloadGroup, id?.Id, previousType, previousId?.Id);
 
             return id;
         }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs
index 2d36934f..88c4cf1b 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-      <BootstrapperApplication Id="fakeba" SourceFile="fakeba.dll" />
+    <BootstrapperApplication Id="fakeba" SourceFile="fakeba.dll" />
   </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs
index 205c58ca..48f53ae3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Bundle Name="!(loc.BundleName)" Version="!(bind.packageVersion.test.msi)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-      <BootstrapperApplicationRef Id="fakeba" />
-      <Chain>
-          <MsiPackage SourceFile="test.msi">
-              <MsiProperty Name="TEST" Value="1" />
-          </MsiPackage>
-      </Chain>
+    <BootstrapperApplicationRef Id="fakeba">
+      <PayloadGroupRef Id="TestPayloadGroup" />
+    </BootstrapperApplicationRef>
+    <Chain>
+      <MsiPackage SourceFile="test.msi">
+        <MsiProperty Name="TEST" Value="1" />
+      </MsiPackage>
+    </Chain>
   </Bundle>
+  <Fragment>
+    <PayloadGroup Id="TestPayloadGroup">
+      <Payload SourceFile="MsiPackage\test.txt" />
+    </PayloadGroup>
+  </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb