diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-19 13:52:20 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-19 14:07:03 +1000 |
| commit | abff61df823505abc01776cec7b207501c671bf2 (patch) | |
| tree | df1358638c44accce92d8a1a2da9e5795d8d231d /src/test/WixToolsetTest.CoreIntegration/TestData | |
| parent | 40d7700f0c5f6464f9491bf60d9d8604a81b7466 (diff) | |
| download | wix-abff61df823505abc01776cec7b207501c671bf2.tar.gz wix-abff61df823505abc01776cec7b207501c671bf2.tar.bz2 wix-abff61df823505abc01776cec7b207501c671bf2.zip | |
Implement BundleCustomData. Remove Unreal from CustomTable.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs | 52 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs | 13 |
2 files changed, 36 insertions, 29 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs index dacbc014..38d207ca 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs | |||
| @@ -5,22 +5,42 @@ | |||
| 5 | <PackageGroupRef Id="MinimalPackageGroup" /> | 5 | <PackageGroupRef Id="MinimalPackageGroup" /> |
| 6 | </PackageGroup> | 6 | </PackageGroup> |
| 7 | 7 | ||
| 8 | <CustomTable Id="BundleCustomTable" Unreal="yes"> | 8 | <BundleCustomData Id="BundleCustomTableBA" Type="bootstrapperApplication"> |
| 9 | <Column Id="Id" Type="string" PrimaryKey="yes" /> | 9 | <BundleAttributeDefinition Id="Id" /> |
| 10 | <Column Id="Column2" Type="string" PrimaryKey="yes" /> | 10 | <BundleAttributeDefinition Id="Column2" /> |
| 11 | 11 | ||
| 12 | <Row> | 12 | <BundleElement> |
| 13 | <Data Column="Id">one</Data> | 13 | <BundleAttribute Id="Id">one</BundleAttribute> |
| 14 | <Data Column="Column2">two</Data> | 14 | <BundleAttribute Id="Column2">two</BundleAttribute> |
| 15 | </Row> | 15 | </BundleElement> |
| 16 | <Row> | 16 | <BundleElement> |
| 17 | <Data Column="Column2"><</Data> | 17 | <BundleAttribute Id="Column2"><</BundleAttribute> |
| 18 | <Data Column="Id">></Data> | 18 | <BundleAttribute Id="Id">></BundleAttribute> |
| 19 | </Row> | 19 | </BundleElement> |
| 20 | <Row> | 20 | <BundleElement> |
| 21 | <Data Column="Id">1</Data> | 21 | <BundleAttribute Id="Id">1</BundleAttribute> |
| 22 | <Data Column="Column2">2</Data> | 22 | <BundleAttribute Id="Column2">2</BundleAttribute> |
| 23 | </Row> | 23 | </BundleElement> |
| 24 | </CustomTable> | 24 | </BundleCustomData> |
| 25 | |||
| 26 | <BundleCustomData Id="BundleCustomTableBE" Type="bundleExtension" ExtensionId="CustomTableExtension"> | ||
| 27 | <BundleAttributeDefinition Id="Id" /> | ||
| 28 | <BundleAttributeDefinition Id="Column2" /> | ||
| 29 | |||
| 30 | <BundleElement> | ||
| 31 | <BundleAttribute Id="Id">one</BundleAttribute> | ||
| 32 | <BundleAttribute Id="Column2">two</BundleAttribute> | ||
| 33 | </BundleElement> | ||
| 34 | <BundleElement> | ||
| 35 | <BundleAttribute Id="Column2"><</BundleAttribute> | ||
| 36 | <BundleAttribute Id="Id">></BundleAttribute> | ||
| 37 | </BundleElement> | ||
| 38 | <BundleElement> | ||
| 39 | <BundleAttribute Id="Id">1</BundleAttribute> | ||
| 40 | <BundleAttribute Id="Column2">2</BundleAttribute> | ||
| 41 | </BundleElement> | ||
| 42 | </BundleCustomData> | ||
| 43 | |||
| 44 | <BundleExtension Id="CustomTableExtension" SourceFile="fakeba.dll" /> | ||
| 25 | </Fragment> | 45 | </Fragment> |
| 26 | </Wix> | 46 | </Wix> |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs index 51aee5f2..d6a2521e 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs | |||
| @@ -17,18 +17,5 @@ | |||
| 17 | <Data Column="Component_">test.txt</Data> | 17 | <Data Column="Component_">test.txt</Data> |
| 18 | </Row> | 18 | </Row> |
| 19 | </CustomTable> | 19 | </CustomTable> |
| 20 | |||
| 21 | <CustomTable Id="CustomTable2" Unreal="yes"> | ||
| 22 | <Column Id="ColumnA" Type="string" PrimaryKey="yes" /> | ||
| 23 | <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" /> | ||
| 24 | <Row> | ||
| 25 | <Data Column="ColumnA">RowA</Data> | ||
| 26 | <Data Column="Component_">test.txt</Data> | ||
| 27 | </Row> | ||
| 28 | <Row> | ||
| 29 | <Data Column="ColumnA">RowB</Data> | ||
| 30 | <Data Column="Component_">test.txt</Data> | ||
| 31 | </Row> | ||
| 32 | </CustomTable> | ||
| 33 | </Fragment> | 20 | </Fragment> |
| 34 | </Wix> | 21 | </Wix> |