Redesign CustomTable tuples to support resolving binary columns

author: Rob Mensching <rob@firegiant.com> 2020-06-03 02:19:16 -0700
committer: Rob Mensching <rob@firegiant.com> 2020-06-03 02:23:16 -0700
commit: 9317f7c8ea709da55e4602eaaba06952bbf315b7 (patch)
tree: 51e8348f891041dcc160a6b79e8965ca6a908b9d /src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable
parent: d529525a1e331f3ef9ec2707791c99bd78fdd82f (diff)
download: wix-9317f7c8ea709da55e4602eaaba06952bbf315b7.tar.gz
wix-9317f7c8ea709da55e4602eaaba06952bbf315b7.tar.bz2
wix-9317f7c8ea709da55e4602eaaba06952bbf315b7.zip
6 files changed, 53 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
new file mode 100644
index 00000000..ad5ed233
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup" />
+        </ComponentGroup>
+        <CustomTable Id="CustomTableWithFile">
+            <Column Id="Column1" Type="string" PrimaryKey="yes" />
+            <Column Id="Source" Type="binary" Width="0" />
+            <Row>
+                <Data Column="Column1">Row1</Data>
+                <Data Column="Source">file1.txt</Data>
+            </Row>
+            <Row>
+                <Data Column="Source">SourceDir\file2.txt</Data>
+                <Data Column="Column1">Row2</Data>
+            </Row>
+        </CustomTable>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl
new file mode 100644
index 00000000..bc2ccf04
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+  <String Id="Loc1">This is row one</String>
+  <String Id="Loc2">This is row two</String>
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs
new file mode 100644
index 00000000..e1da74f8
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup" />
+        </ComponentGroup>
+        <CustomTable Id="CustomTableLocalized">
+            <Column Id="Column1" Type="string" PrimaryKey="yes" />
+            <Column Id="DataColumn" Type="string" Localizable="yes" Width="255" />
+            <Row>
+                <Data Column="Column1" Value="Row1" />
+                <Data Column="DataColumn"  Value="!(loc.Loc1)" />
+            </Row>
+            <Row>
+                <Data Column="Column1" Value="Row2" />
+                <Data Column="DataColumn" Value="!(loc.Loc2)" />
+            </Row>
+        </CustomTable>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt
new file mode 100644
index 00000000..97f701ce
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt
@@ -0,0 +1 @@
+This is file1.txt
+\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt
new file mode 100644
index 00000000..46493186
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt
@@ -0,0 +1 @@
+This is file2.txt
+\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
+\ No newline at end of file
author	Rob Mensching <rob@firegiant.com>	2020-06-03 02:19:16 -0700
committer	Rob Mensching <rob@firegiant.com>	2020-06-03 02:23:16 -0700
commit	9317f7c8ea709da55e4602eaaba06952bbf315b7 (patch)
tree	51e8348f891041dcc160a6b79e8965ca6a908b9d /src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable
parent	d529525a1e331f3ef9ec2707791c99bd78fdd82f (diff)
download	wix-9317f7c8ea709da55e4602eaaba06952bbf315b7.tar.gz wix-9317f7c8ea709da55e4602eaaba06952bbf315b7.tar.bz2 wix-9317f7c8ea709da55e4602eaaba06952bbf315b7.zip

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs new file mode 100644 index 00000000..ad5ed233 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
@@ -0,0 +1,22 @@
	1	<?xml version="1.0" encoding="utf-8" ?>
	2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	3	<Fragment>
	4	<ComponentGroup Id="ProductComponents">
	5	<ComponentGroupRef Id="MinimalComponentGroup" />
	6	</ComponentGroup>
	7
	8	<CustomTable Id="CustomTableWithFile">
	9	<Column Id="Column1" Type="string" PrimaryKey="yes" />
	10	<Column Id="Source" Type="binary" Width="0" />
	11	<Row>
	12	<Data Column="Column1">Row1</Data>
	13	<Data Column="Source">file1.txt</Data>
	14	</Row>
	15	<Row>
	16	<Data Column="Source">SourceDir\file2.txt</Data>
	17	<Data Column="Column1">Row2</Data>
	18	</Row>
	19	</CustomTable>
	20
	21	</Fragment>
	22	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl new file mode 100644 index 00000000..bc2ccf04 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl
@@ -0,0 +1,7 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
	3
	4	<String Id="Loc1">This is row one</String>
	5	<String Id="Loc2">This is row two</String>
	6
	7	</WixLocalization>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs new file mode 100644 index 00000000..e1da74f8 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs
@@ -0,0 +1,21 @@
	1	<?xml version="1.0" encoding="utf-8" ?>
	2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	3	<Fragment>
	4	<ComponentGroup Id="ProductComponents">
	5	<ComponentGroupRef Id="MinimalComponentGroup" />
	6	</ComponentGroup>
	7
	8	<CustomTable Id="CustomTableLocalized">
	9	<Column Id="Column1" Type="string" PrimaryKey="yes" />
	10	<Column Id="DataColumn" Type="string" Localizable="yes" Width="255" />
	11	<Row>
	12	<Data Column="Column1" Value="Row1" />
	13	<Data Column="DataColumn" Value="!(loc.Loc1)" />
	14	</Row>
	15	<Row>
	16	<Data Column="Column1" Value="Row2" />
	17	<Data Column="DataColumn" Value="!(loc.Loc2)" />
	18	</Row>
	19	</CustomTable>
	20	</Fragment>
	21	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt new file mode 100644 index 00000000..97f701ce --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt
@@ -0,0 +1 @@
		This is file1.txt \ No newline at end of file


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt new file mode 100644 index 00000000..46493186 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt
@@ -0,0 +1 @@
		This is file2.txt \ No newline at end of file


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt new file mode 100644 index 00000000..cd0db0e1 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt
@@ -0,0 +1 @@
		This is test.txt. \ No newline at end of file