From 0ec925dbf8359629e6d4f71fb142118a05f07298 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 7 Jun 2020 08:14:46 -0700
Subject: Move WixCop to "wix.exe convert" command

---
 .../Preprocessor/ConvertedPreprocessor.wxs         | 62 ---------------------
 .../TestData/Preprocessor/Preprocessor.wxs         | 63 ----------------------
 .../TestData/Preprocessor/wixcop.settings.xml      |  9 ----
 3 files changed, 134 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs
 delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs
 delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml

(limited to 'src/test/WixToolsetTest.WixCop/TestData/Preprocessor')

diff --git a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs
deleted file mode 100644
index dcd43e35..00000000
--- a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-
-<?include WixVer.wxi ?>
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product Id="*" Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D">
-        <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" />
-        <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
-
-        <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />
-
-        <MediaTemplate CabinetTemplate="core{0}.cab" />
-
-        <Feature Id="Feature_WiX" Title="WiX Toolset" Level="1">
-            <Component Id="Licensing" Directory="INSTALLFOLDER">
-                <File Id="LICENSE.TXT" Source="LICENSE.TXT" />
-            </Component>
-
-            <Component Id="ProductRegistration" Directory="INSTALLFOLDER">
-                <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows Installer XML\$(var.WixMajorMinor)">
-                    <RegistryValue Name="InstallFolder" Value="[INSTALLFOLDER]" Type="string" />
-                </RegistryKey>
-            </Component>
-
-            <Component Id="ProductFamilyRegistration" Directory="INSTALLFOLDER">
-                <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows Installer XML\$(var.WixMajor).x">
-                    <RegistryValue Name="v$(var.WixMajorMinor)" Value="[INSTALLFOLDER]" Type="string" />
-                </RegistryKey>
-            </Component>
-
-            <Component Id="ProductInformation" Directory="BinFolder">
-                <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows Installer XML\$(var.WixMajorMinor)">
-                    <RegistryValue Name="InstallRoot" Value="[BinFolder]" Type="string" />
-                    <RegistryValue Name="ProductVersion" Value="[ProductVersion]" Type="string" />
-                </RegistryKey>
-
-                <RemoveFolder Id="CleanupShortcutFolder" Directory="ShortcutFolder" On="uninstall" />
-            </Component>
-
-            <Component Directory="BinFolder">
-                <File Id="wixtoolset.org.ico" Source="common\wixtoolset.org.ico">
-                  <?include ComRegistration.wxi ?>
-                </File>
-                <util:InternetShortcut Id="wixtoolset.org" Directory="ShortcutFolder" Name="WiX Home Page" Target="http://wixtoolset.org/" IconFile="file://[#wixtoolset.org.ico]" />
-            </Component>
-
-            <ComponentGroupRef Id="ToolsetComponents" />
-            <ComponentGroupRef Id="ExtensionComponents" />
-            <ComponentGroupRef Id="LuxComponents" />
-            <ComponentGroupRef Id="DocComponents" />
-        </Feature>
-
-        <FeatureRef Id="Feature_MSBuild" />
-        <FeatureRef Id="Feature_Intellisense2010" />
-        <FeatureRef Id="Feature_Intellisense2012" />
-        <FeatureRef Id="Feature_Intellisense2013" />
-        <FeatureRef Id="Feature_Intellisense2015" />
-    </Product>
-</Wix>
diff --git a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs
deleted file mode 100644
index 2eb908c2..00000000
--- a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-
-<?include WixVer.wxi ?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:swid="http://schemas.microsoft.com/wix/TagExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Id="*" Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)"
-             Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D">
-        <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" />
-        <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
-
-        <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />
-
-        <MediaTemplate CabinetTemplate="core{0}.cab" />
-
-        <Feature Id="Feature_WiX" Title="WiX Toolset" Level="1">
-            <Component Id="Licensing" Directory="INSTALLFOLDER">
-                <File Source="LICENSE.TXT" />
-            </Component>
-
-            <Component Id="ProductRegistration" Directory="INSTALLFOLDER">
-                <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows Installer XML\$(var.WixMajorMinor)">
-                    <RegistryValue Name="InstallFolder" Value="[INSTALLFOLDER]" Type="string" />
-                </RegistryKey>
-            </Component>
-
-            <Component Id="ProductFamilyRegistration" Directory="INSTALLFOLDER">
-                <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows Installer XML\$(var.WixMajor).x">
-                    <RegistryValue Name="v$(var.WixMajorMinor)" Value="[INSTALLFOLDER]" Type="string" />
-                </RegistryKey>
-            </Component>
-
-            <Component Id="ProductInformation" Directory="BinFolder">
-                <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows Installer XML\$(var.WixMajorMinor)">
-                    <RegistryValue Name="InstallRoot" Value="[BinFolder]" Type="string"/>
-                    <RegistryValue Name="ProductVersion" Value="[ProductVersion]" Type="string" />
-                </RegistryKey>
-
-                <RemoveFolder Id="CleanupShortcutFolder" Directory="ShortcutFolder" On="uninstall" />
-            </Component>
-
-            <Component Directory="BinFolder">
-                <File Source="common\wixtoolset.org.ico">
-                  <?include ComRegistration.wxi ?>
-                </File>
-                <util:InternetShortcut Id="wixtoolset.org" Directory="ShortcutFolder" Name="WiX Home Page" Target="http://wixtoolset.org/" IconFile="file://[#wixtoolset.org.ico]" />
-            </Component>
-
-            <ComponentGroupRef Id="ToolsetComponents" />
-            <ComponentGroupRef Id="ExtensionComponents" />
-            <ComponentGroupRef Id="LuxComponents" />
-            <ComponentGroupRef Id="DocComponents" />
-        </Feature>
-
-        <FeatureRef Id="Feature_MSBuild" />
-        <FeatureRef Id="Feature_Intellisense2010" />
-        <FeatureRef Id="Feature_Intellisense2012" />
-        <FeatureRef Id="Feature_Intellisense2013" />
-        <FeatureRef Id="Feature_Intellisense2015" />
-    </Product>
-</Wix>
diff --git a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml
deleted file mode 100644
index 9d3ad496..00000000
--- a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<Settings>
-  <IgnoreErrors>
-    <Test Id="WhitespacePrecedingNodeWrong"/>
-    <Test Id="WhitespacePrecedingEndElementWrong"/>
-  </IgnoreErrors>
-  <ErrorsAsWarnings/>
-  <ExemptFiles/>
-</Settings>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb