diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-09 14:33:18 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-12 12:46:21 +1000 |
| commit | 8a42828f169796f01d9821790e4983639062d3b9 (patch) | |
| tree | 873eb99f64d68f65fd6f7d0fba00f99c93de57e9 /src | |
| parent | 85a5fecdef50f18af8c8a87d270b6d55a02165d2 (diff) | |
| download | wix-8a42828f169796f01d9821790e4983639062d3b9.tar.gz wix-8a42828f169796f01d9821790e4983639062d3b9.tar.bz2 wix-8a42828f169796f01d9821790e4983639062d3b9.zip | |
Fix bug when parsing PayloadGroupRef.
Diffstat (limited to 'src')
3 files changed, 15 insertions, 8 deletions
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 | |||
| 1342 | 1342 | ||
| 1343 | this.Core.ParseForExtensionElements(node); | 1343 | this.Core.ParseForExtensionElements(node); |
| 1344 | 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 | 1346 | ||
| 1347 | return id; | 1347 | return id; |
| 1348 | } | 1348 | } |
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 3 | <Fragment> | 3 | <Fragment> |
| 4 | <BootstrapperApplication Id="fakeba" SourceFile="fakeba.dll" /> | 4 | <BootstrapperApplication Id="fakeba" SourceFile="fakeba.dll" /> |
| 5 | </Fragment> | 5 | </Fragment> |
| 6 | </Wix> | 6 | </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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 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"> | 3 | <Bundle Name="!(loc.BundleName)" Version="!(bind.packageVersion.test.msi)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
| 4 | <BootstrapperApplicationRef Id="fakeba" /> | 4 | <BootstrapperApplicationRef Id="fakeba"> |
| 5 | <Chain> | 5 | <PayloadGroupRef Id="TestPayloadGroup" /> |
| 6 | <MsiPackage SourceFile="test.msi"> | 6 | </BootstrapperApplicationRef> |
| 7 | <MsiProperty Name="TEST" Value="1" /> | 7 | <Chain> |
| 8 | </MsiPackage> | 8 | <MsiPackage SourceFile="test.msi"> |
| 9 | </Chain> | 9 | <MsiProperty Name="TEST" Value="1" /> |
| 10 | </MsiPackage> | ||
| 11 | </Chain> | ||
| 10 | </Bundle> | 12 | </Bundle> |
| 13 | <Fragment> | ||
| 14 | <PayloadGroup Id="TestPayloadGroup"> | ||
| 15 | <Payload SourceFile="MsiPackage\test.txt" /> | ||
| 16 | </PayloadGroup> | ||
| 17 | </Fragment> | ||
| 11 | </Wix> | 18 | </Wix> |