4 files changed, 71 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl
new file mode 100644
index 00000000..38c12ac1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
new file mode 100644
index 00000000..d8743747
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+        <MediaTemplate />
+        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+            <ComponentGroupRef Id="ProductComponents" />
+            <ComponentGroupRef Id="Foo1" />
+            <ComponentGroupRef Id="Foo2" />
+        </Feature>
+        <!--<CustomActionRef Id="SetFoo" />-->
+    </Product>
+    <Fragment Id="SetFoo">
+        <CustomAction Id="SetFoo" Property="FOO" Value="BOB" />
+        <CustomAction Id="SetBar" Property="BAR" Value="BOB" />
+    </Fragment>
+    <Fragment Id="Foo1">
+        <ComponentGroup Id="Foo1" />
+        <InstallExecuteSequence>
+            <Custom Action="SetFoo" Before="SetBar" />
+            <Custom Action="SetBar" Overridable="yes" Before="AppSearch" />
+        </InstallExecuteSequence>
+    </Fragment>
+    <Fragment Id="Foo2">
+        <ComponentGroup Id="Foo2" />
+        
+        <InstallExecuteSequence>
+            <Custom Action="SetBar" Before="AppSearch" />
+        </InstallExecuteSequence>
+    </Fragment>
+    <Fragment Id="Directories">
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="ProgramFilesFolder">
+                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+            </Directory>
+        </Directory>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs
new file mode 100644
index 00000000..e26c4509
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+       <Component>
+         <File Source="test.txt" />
+       </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
+\ No newline at end of file

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl
@@ -0,0 +1,11 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2
	3	<!--
	4	This file contains the declaration of all the localizable strings.
	5	-->
	6	<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
	7
	8	<String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
	9	<String Id="FeatureTitle">MsiPackage</String>
	10
	11	</WixLocalization>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs new file mode 100644 index 00000000..d8743747 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
@@ -0,0 +1,49 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2
	3	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	4	<Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
	5	<Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
	6
	7	<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
	8	<MediaTemplate />
	9
	10	<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
	11	<ComponentGroupRef Id="ProductComponents" />
	12	<ComponentGroupRef Id="Foo1" />
	13	<ComponentGroupRef Id="Foo2" />
	14	</Feature>
	15
	16	<!--<CustomActionRef Id="SetFoo" />-->
	17
	18	</Product>
	19
	20	<Fragment Id="SetFoo">
	21	<CustomAction Id="SetFoo" Property="FOO" Value="BOB" />
	22	<CustomAction Id="SetBar" Property="BAR" Value="BOB" />
	23	</Fragment>
	24
	25	<Fragment Id="Foo1">
	26	<ComponentGroup Id="Foo1" />
	27
	28	<InstallExecuteSequence>
	29	<Custom Action="SetFoo" Before="SetBar" />
	30	<Custom Action="SetBar" Overridable="yes" Before="AppSearch" />
	31	</InstallExecuteSequence>
	32	</Fragment>
	33
	34	<Fragment Id="Foo2">
	35	<ComponentGroup Id="Foo2" />
	36
	37	<InstallExecuteSequence>
	38	<Custom Action="SetBar" Before="AppSearch" />
	39	</InstallExecuteSequence>
	40	</Fragment>
	41
	42	<Fragment Id="Directories">
	43	<Directory Id="TARGETDIR" Name="SourceDir">
	44	<Directory Id="ProgramFilesFolder">
	45	<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
	46	</Directory>
	47	</Directory>
	48	</Fragment>
	49	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs new file mode 100644 index 00000000..e26c4509 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs
@@ -0,0 +1,10 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	3	<Fragment>
	4	<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
	5	<Component>
	6	<File Source="test.txt" />
	7	</Component>
	8	</ComponentGroup>
	9	</Fragment>
	10	</Wix>


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