From 8cf0427984a88b0b3ddfb2061e5be721afffe82e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 22 Apr 2021 17:19:56 -0700
Subject: Move Core into wix

---
 .../TestData/BadInput/BundleVariable.wxs           |  6 -----
 .../TestData/BadInput/DuplicateCacheIds.wxs        | 12 ---------
 .../TestData/BadInput/DuplicatePayloadNames.wxs    | 31 ----------------------
 .../BadInput/HiddenPersistedBundleVariable.wxs     |  6 -----
 .../TestData/BadInput/InvalidIds.wxs               |  8 ------
 .../TestData/BadInput/RegistryKey.wxs              | 13 ---------
 .../TestData/BadInput/UnscheduledPackage.wxs       | 16 -----------
 .../BadInput/UnscheduledRollbackBoundary.wxs       | 16 -----------
 8 files changed, 108 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/BundleVariable.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/HiddenPersistedBundleVariable.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/InvalidIds.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/RegistryKey.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/BadInput')

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/BundleVariable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/BundleVariable.wxs
deleted file mode 100644
index a2d49b18..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/BundleVariable.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Variable Name="BadType" Type="doesnotexist" Value="dne" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs
deleted file mode 100644
index 0c350042..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Manual1" SourceFile="burn.exe" Name="manual1\burn.exe" DetectCondition="test" CacheId="!(wix.WixVariable1)" />
-            <ExePackage Id="Manual2" SourceFile="burn.exe" Name="manual2\burn.exe" DetectCondition="test" CacheId="!(wix.WixVariable2)" />
-        </PackageGroup>
-
-        <WixVariable Id="WixVariable1" Value="CollidingCacheId" />
-        <WixVariable Id="WixVariable2" Value="CollidingCacheId" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
deleted file mode 100644
index 4fe7e097..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
-            <ExePackage Id="DuplicateCacheIds.wxs" SourceFile="$(sys.SOURCEFILEDIR)DuplicateCacheIds.wxs" Compressed="no" DetectCondition="none" Name="PayloadCollision">
-                <Payload SourceFile="$(sys.SOURCEFILEDIR)BundleVariable.wxs" Compressed="no" Name="ContainerCollision" />
-            </ExePackage>
-            <ExePackage Id="HiddenPersistedBundleVariable.wxs" SourceFile="$(sys.SOURCEFILEDIR)HiddenPersistedBundleVariable.wxs" Compressed="no" DetectCondition="none" Name="PayloadCollision" />
-            <PackageGroupRef Id="MsiPackages" />
-        </PackageGroup>
-
-        <PackageGroup Id="MsiPackages">
-            <MsiPackage SourceFile="test.msi">
-                <Payload SourceFile="$(sys.SOURCEFILEDIR)InvalidIds.wxs" Name="MsiPackage\test.txt" />
-                <Payload SourceFile="$(sys.SOURCEFILEDIR)RegistryKey.wxs" Name="test.msi" />
-            </MsiPackage>
-        </PackageGroup>
-
-        <Container Id="MsiPackagesContainer" Type="detached" Name="ContainerCollision">
-            <PackageGroupRef Id="MsiPackages" />
-        </Container>
-
-        <BootstrapperApplication>
-            <Payload Id="DuplicatePayloadNames.wxs" SourceFile="$(sys.SOURCEFILEPATH)" Name="fakeba.dll" />
-            <Payload Id="UnscheduledPackage.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledPackage.wxs" Name="BootstrapperApplicationData.xml" />
-            <Payload Id="UnscheduledRollbackBoundary.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledRollbackBoundary.wxs" Name="BundleExtensionData.xml" />
-        </BootstrapperApplication>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/HiddenPersistedBundleVariable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/HiddenPersistedBundleVariable.wxs
deleted file mode 100644
index 5ebe5472..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/HiddenPersistedBundleVariable.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Variable Name="BadType" Hidden="yes" Persisted="yes" Value="dne" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/InvalidIds.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/InvalidIds.wxs
deleted file mode 100644
index 78f3ebd3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/InvalidIds.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Component Id="@#$" Guid="{2F18F52A-9E24-4ebe-A5FC-974089AA03D2}" Directory="WixTestFolder">
-            <CreateFolder Directory="WixTestFolder" />
-        </Component>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/RegistryKey.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/RegistryKey.wxs
deleted file mode 100644
index c717680b..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/RegistryKey.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Id="MiscComponent" Guid="7C40C257-AB36-4B8C-8FD1-C56E0AC4AAEF">
-                <RegistryKey>
-                  <ex:Example />
-                </RegistryKey>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
deleted file mode 100644
index fc53c4a2..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
-        </PackageGroup>
-        <SetVariableRef Id="Dummy" />
-    </Fragment>
-    <Fragment>
-        <SetVariable Id="Dummy" Variable="Dummy" />
-        <PackageGroup Id="Unscheduled">
-            <ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" DetectCondition="none" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs
deleted file mode 100644
index 6cf8528e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
-        </PackageGroup>
-        <SetVariableRef Id="Dummy" />
-    </Fragment>
-    <Fragment>
-        <SetVariable Id="Dummy" Variable="Dummy" />
-        <PackageGroup Id="Unscheduled">
-            <RollbackBoundary Id="Unscheduled1" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
-- 
cgit v1.2.3-55-g6feb