Fix bug when parsing PayloadGroupRef.
Sean Hall committed
Apr 9, 2020 at 14:33 UTC
8a42828f169796f01d9821790e4983639062d3b9
3 files changed
+15
-8
src/WixToolset.Core/Compiler_Bundle.cs
+1
-1
@@ -1342,7 +1342,7 @@ namespace WixToolset.Core
1342
1343
this.Core.ParseForExtensionElements(node);
1344
1345
- this.CreateGroupAndOrderingRows(sourceLineNumbers, parentType, parentId.Id, ComplexReferenceChildType.PayloadGroup, id.Id, previousType, previousId.Id);
1345
+ this.CreateGroupAndOrderingRows(sourceLineNumbers, parentType, parentId?.Id, ComplexReferenceChildType.PayloadGroup, id?.Id, previousType, previousId?.Id);
1346
1347
return id;
1348
}
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs
+1
-1
@@ -1,6 +1,6 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
<Fragment>
4
- <BootstrapperApplication Id="fakeba" SourceFile="fakeba.dll" />
4
+ <BootstrapperApplication Id="fakeba" SourceFile="fakeba.dll" />
5
</Fragment>
6
</Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs
+13
-6
@@ -1,11 +1,18 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
<Bundle Name="!(loc.BundleName)" Version="!(bind.packageVersion.test.msi)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4
- <BootstrapperApplicationRef Id="fakeba" />
5
- <Chain>
6
- <MsiPackage SourceFile="test.msi">
7
- <MsiProperty Name="TEST" Value="1" />
8
- </MsiPackage>
9
- </Chain>
4
+ <BootstrapperApplicationRef Id="fakeba">
5
+ <PayloadGroupRef Id="TestPayloadGroup" />
6
+ </BootstrapperApplicationRef>
7
+ <Chain>
8
+ <MsiPackage SourceFile="test.msi">
9
+ <MsiProperty Name="TEST" Value="1" />
10
+ </MsiPackage>
11
+ </Chain>
12
</Bundle>
13
+ <Fragment>
14
+ <PayloadGroup Id="TestPayloadGroup">
15
+ <Payload SourceFile="MsiPackage\test.txt" />
16
+ </PayloadGroup>
17
+ </Fragment>
18
</Wix>