From ff659159e041bf6c083e6b7fcb9b726065a9dd73 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 3 May 2021 09:55:22 -0700
Subject: Move Util.wixext into ext

---
 .../WixToolsetTest.Util/TestData/.Data/burn.exe    | Bin 463360 -> 0 bytes
 .../TestData/BundleWithSearches/Bundle.en-us.wxl   |   8 ----
 .../TestData/BundleWithSearches/Bundle.wxs         |  52 ---------------------
 .../BundleWithSearches/data/MsiPackage/Shared.dll  |   1 -
 .../BundleWithSearches/data/MsiPackage/test.txt    |   1 -
 .../TestData/BundleWithSearches/data/fakeba.dll    |   1 -
 .../TestData/BundleWithSearches/data/test.msi      | Bin 32768 -> 0 bytes
 .../TestData/CloseApplication/Package.en-us.wxl    |   9 ----
 .../TestData/CloseApplication/Package.wxs          |  17 -------
 .../CloseApplication/PackageComponents.wxs         |   9 ----
 .../TestData/CloseApplication/example.txt          |   1 -
 .../TestData/EventManifest/Package.en-us.wxl       |   9 ----
 .../TestData/EventManifest/Package.wxs             |  15 ------
 .../TestData/EventManifest/PackageComponents.wxs   |  11 -----
 .../TestData/EventManifest/example.txt             |   1 -
 .../TestData/InternetShortcut/Package.en-us.wxl    |   9 ----
 .../TestData/InternetShortcut/Package.ico          | Bin 83899 -> 0 bytes
 .../TestData/InternetShortcut/Package.wxs          |  15 ------
 .../InternetShortcut/PackageComponents.wxs         |  11 -----
 .../TestData/InternetShortcut/example.txt          |   1 -
 .../TestData/InternetShortcutModule/Module.wxs     |  13 ------
 .../InternetShortcutModule/ModuleComponents.wxs    |  11 -----
 .../TestData/InternetShortcutModule/Package.ico    | Bin 83899 -> 0 bytes
 .../TestData/PermissionEx/Package.en-us.wxl        |   9 ----
 .../TestData/PermissionEx/Package.wxs              |  15 ------
 .../TestData/PermissionEx/PackageComponents.wxs    |  23 ---------
 .../TestData/PermissionEx/example.txt              |   1 -
 .../TestData/Queries/Package.en-us.wxl             |   9 ----
 .../TestData/Queries/Package.wxs                   |  23 ---------
 .../TestData/Queries/PackageComponents.wxs         |   9 ----
 .../TestData/Queries/example.txt                   |   1 -
 .../TestData/RemoveFolderEx/Module.wxs             |  13 ------
 .../TestData/RemoveFolderEx/ModuleComponents.wxs   |  10 ----
 .../TestData/RemoveRegistryKeyEx/Module.wxs        |  13 ------
 .../RemoveRegistryKeyEx/ModuleComponents.wxs       |  10 ----
 .../TestData/UsingFileShare/Package.en-us.wxl      |   9 ----
 .../TestData/UsingFileShare/Package.wxs            |  15 ------
 .../TestData/UsingFileShare/PackageComponents.wxs  |  14 ------
 .../TestData/UsingFileShare/example.txt            |   1 -
 .../TestData/XmlConfig/Package.en-us.wxl           |   9 ----
 .../TestData/XmlConfig/Package.wxs                 |  17 -------
 .../TestData/XmlConfigModule/Module.wxs            |  19 --------
 .../TestData/XmlConfigModule/my.xml                |   1 -
 43 files changed, 416 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/.Data/burn.exe
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/example.txt
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml

(limited to 'src/test/WixToolsetTest.Util/TestData')

diff --git a/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe b/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe
deleted file mode 100644
index 2a4f423f..00000000
Binary files a/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe and /dev/null differ
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
deleted file mode 100644
index f50a5386..00000000
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="BundleName">~TestBundle</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
deleted file mode 100644
index 7fef0725..00000000
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
+++ /dev/null
@@ -1,52 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <BootstrapperApplication>
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
-
-        <util:RegistrySearchRef Id="RegistrySearchId" />
-        <util:RegistrySearchRef Id="RegistrySearchId64" />
-        <util:ProductSearchRef Id="ProductSearchId" />
-        <util:FileSearchRef Id="FileSearchId" />
-        <util:WindowsFeatureSearchRef Id="DetectSHA2SupportId" />
-
-        <Chain>
-            <MsiPackage SourceFile="test.msi">
-                <MsiProperty Name="TEST" Value="1" />
-            </MsiPackage>
-        </Chain>
-    </Bundle>
-
-    <Fragment>
-        <util:RegistrySearch
-            Id="RegistrySearchId"
-            Variable="RegistrySearchVariable"
-            Root="HKLM"
-            Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
-            Value="Release"
-            Result="value" />
-    </Fragment>
-
-    <Fragment>
-        <util:RegistrySearch
-            Id="RegistrySearchId64"
-            Variable="RegistrySearchVariable64"
-            Root="HKLM"
-            Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
-            Value="Release"
-            Result="value"
-            Bitness="always64" />
-    </Fragment>
-
-    <Fragment>
-        <util:ProductSearch Id="ProductSearchId" Variable="ProductSearchVariable" UpgradeCode="738D02BF-E231-4370-8209-E9FD4E1BE2A1" Condition="1 &amp; 2 &lt; 3" Result="version" />
-    </Fragment>
-
-    <Fragment>
-        <util:FileSearch Id="FileSearchId" Variable="FileSearchVariable" Path="%windir%\System32\mscoree.dll" Result="exists" />
-    </Fragment>
-
-    <Fragment>
-        <util:WindowsFeatureSearch Id="DetectSHA2SupportId" Variable="IsSHA2Supported" Feature="sha2CodeSigning" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
deleted file mode 100644
index 0e461ba8..00000000
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is Shared.dll.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
deleted file mode 100644
index 8b986220..00000000
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
deleted file mode 100644
index 970efdf0..00000000
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is a fakeba.dll
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi
deleted file mode 100644
index 0722d60e..00000000
Binary files a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi and /dev/null differ
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
deleted file mode 100644
index 5301bb1a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-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.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
deleted file mode 100644
index 8e054256..00000000
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-
-        <util:CloseApplication Id="CloseMyApp" CloseMessage="yes" Property="MYAPPISRUNNING" Target="explorer.exe" />
-    </Package>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
deleted file mode 100644
index e27b3c43..00000000
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
+++ /dev/null
@@ -1,9 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="example.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt b/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
deleted file mode 100644
index 5301bb1a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-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.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
deleted file mode 100644
index daae573a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs
deleted file mode 100644
index 2ec8ce82..00000000
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Id="Manifest.dll" Source="example.txt">
-                    <util:EventManifest MessageFile="[Manifest.dll]" ResourceFile="[Manifest.dll]" />
-                </File>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt b/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
deleted file mode 100644
index 5301bb1a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-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.Util/TestData/InternetShortcut/Package.ico b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico
deleted file mode 100644
index 53134de7..00000000
Binary files a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico and /dev/null differ
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
deleted file mode 100644
index daae573a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
deleted file mode 100644
index 2a1b4347..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Id="Package.ico" Source="Package.ico" />
-                <util:InternetShortcut Type="link" Name="WiX Toolset (link)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
-                <util:InternetShortcut Type="url" Name="WiX Toolset (url)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
deleted file mode 100644
index 1355d42e..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<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="ProductComponents" />
-    </Module>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MergeModule" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
deleted file mode 100644
index 2a1b4347..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Id="Package.ico" Source="Package.ico" />
-                <util:InternetShortcut Type="link" Name="WiX Toolset (link)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
-                <util:InternetShortcut Type="url" Name="WiX Toolset (url)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico
deleted file mode 100644
index 53134de7..00000000
Binary files a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico and /dev/null differ
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
deleted file mode 100644
index 5301bb1a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-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.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
deleted file mode 100644
index daae573a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
deleted file mode 100644
index 0634d7d4..00000000
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
+++ /dev/null
@@ -1,23 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="example.txt">
-                    <util:PermissionEx User="Everyone" GenericAll="yes" />
-                </File>
-                <CreateFolder>
-                    <util:PermissionEx User="Everyone" GenericAll="yes" />
-                </CreateFolder>
-                <ServiceInstall Name="testsvc" Type="ownProcess" Start="disabled" ErrorControl="normal">
-                    <util:PermissionEx User="Everyone" GenericAll="yes" />
-                </ServiceInstall>
-                <RegistryKey Id="ExampleRegistryKey" ForceCreateOnInstall="yes" Root="HKLM" Key="TestRegistryKey">
-                    <util:PermissionEx User="Everyone" GenericAll="yes" />
-                </RegistryKey>
-                <RegistryValue Root="HKLM" Key="TestRegistryValueKey" Value="abc">
-                    <util:PermissionEx User="Everyone" GenericAll="yes" />
-                </RegistryValue>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt b/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
deleted file mode 100644
index 5301bb1a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-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.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
deleted file mode 100644
index abf0dbb4..00000000
--- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+++ /dev/null
@@ -1,23 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <util:BroadcastEnvironmentChange />
-        <util:CheckRebootRequired />
-        <util:QueryWindowsDriverInfo />
-        <util:QueryWindowsSuiteInfo />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment><util:BroadcastSettingChange />
-        
-        
-    
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
deleted file mode 100644
index e27b3c43..00000000
--- a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
+++ /dev/null
@@ -1,9 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="example.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt b/src/test/WixToolsetTest.Util/TestData/Queries/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
deleted file mode 100644
index 2c2be584..00000000
--- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<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/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs
deleted file mode 100644
index 236d9df0..00000000
--- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<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:RemoveFolderEx On="both" Property="RemoveProp" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
deleted file mode 100644
index 32b246f4..00000000
--- a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<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/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
deleted file mode 100644
index 0a0c8cb6..00000000
--- a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<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>
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
deleted file mode 100644
index 5301bb1a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-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.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
deleted file mode 100644
index daae573a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs
deleted file mode 100644
index 7cedbb30..00000000
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Fragment>
-        <util:User Id="Everyone" Name="Everyone" />
-
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="example.txt" />
-                <util:FileShare Id="ExampleFileShare" Description="An example file share" Name="example">
-                    <util:FileSharePermission User="Everyone" Read="yes" />
-                </util:FileShare>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
deleted file mode 100644
index 5301bb1a..00000000
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-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.Util/TestData/XmlConfig/Package.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
deleted file mode 100644
index a2002634..00000000
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <Component Id="Del" Directory="INSTALLFOLDER" Guid="3613414c-11f5-40fa-a1f1-a0ba722a6895">
-                <util:XmlConfig Id="DelElement" File="[INSTALLFOLDER]my.xml" Action="delete" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" />
-            </Component>
-        </Feature>
-    </Package>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
deleted file mode 100644
index 29e8555b..00000000
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Module Id="XmlConfigModule" Language="1033" Version="1.0.0.0" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
-
-        <Component Id="Parent" Directory="INSTALLFOLDER">
-            <File Id="my.xml" Source="my.xml" />
-            <util:XmlConfig Id="AddElement" File="[my.xml]" Action="create" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" />
-        </Component>
-
-        <Component Id="Child" Directory="INSTALLFOLDER" Guid="4613414c-11f5-40fa-a1f1-a0ba722a6895">
-            <util:XmlConfig Id="ChildElement" File="[my.xml]" VerifyPath="xxx" ElementId="AddElement" Sequence="1" />
-        </Component>
-    </Module>
-
-    <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml
deleted file mode 100644
index bad25217..00000000
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml
+++ /dev/null
@@ -1 +0,0 @@
-This is my.xml file.
-- 
cgit v1.2.3-55-g6feb