Move Util.wixext into ext

2 files changed, 23 insertions, 0 deletions

diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
new file mode 100644
index 00000000..32b246f4
--- /dev/null
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
@@ -0,0 +1,13 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
+        <SummaryInformation Manufacturer="Example Corporation" />
+
+        <ComponentGroupRef Id="ModuleComponents" />
+    </Module>
+
+    <Fragment>
+        <StandardDirectory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLFOLDER" Name="MergeModule" />
+        </StandardDirectory>
+    </Fragment>
+</Wix>
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
new file mode 100644
index 00000000..0a0c8cb6
--- /dev/null
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Fragment>
+        <ComponentGroup Id="ModuleComponents" Directory="INSTALLFOLDER">
+            <Component>
+                <File Source="ModuleComponents.wxs" />
+                <util:RemoveRegistryKey Root="HKLM" Key="SOFTWARE\Example" On="install" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>