22 files changed, 5 insertions, 25 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
index d9a2a34e..dbce4c71 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs
index 73577ce5..c1cf55c2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
        <ComponentGroupRef Id="ProductComponents.x86" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
index 0e8e9795..f3dd9a02 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Property Id="ExampleProperty" Value="$(ex.Test)" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
index 6da3dcbe..28d564e2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
index a4c01d7e..59eeb027 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <CustomAction Id="CanWeReferenceAnError_YesWeCan" Error="1234" />
    <CustomAction Id="TextErrorsWorkOKToo" Error="If you see this, something went wrong." />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
index bff5f609..f20f5f73 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Property Id="ExampleProperty" Value="$(ex.Test)" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
index 4bc7e2a4..3bd14fbb 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
        <ComponentGroupRef Id="ProductComponents.x86" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
index 8deab961..59c8b2b3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
@@ -5,7 +5,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
index 9c529668..e55b3ec6 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Property Id="INSTANCEPROPERTY" Secure="yes" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
index 38125b57..025aaaa3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
@@ -12,8 +12,6 @@
      <RemoveExistingProducts After="InstallValidate" />
    </InstallExecuteSequence>
    
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
    </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
index 0b743c81..44b8c2b5 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
@@ -6,7 +6,8 @@
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
    <?ifndef MediaTemplateCompressionLevel?>
-    <Media Id="1" Cabinet="example.cab" />
+    <Media Id="1" Cabinet="example1.cab" />
+    <Media Id="2" Cabinet="example2.cab" />
    <?elseif $(MediaTemplateCompressionLevel) = ""?>
    <MediaTemplate />
    <?else?>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs
index 82797ebe..1a040fa3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs
@@ -3,10 +3,10 @@
  <Fragment>
    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
      <Component>
-        <File Source="$(env.WINDIR)\Notepad.exe" />
+        <File DiskId="1" Source="$(env.WINDIR)\Notepad.exe" />
      </Component>
      <Component>
-        <File Source="test.txt" />
+        <File DiskId="2" Source="test.txt" />
      </Component>
    </ComponentGroup>
  </Fragment>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
index db773d17..cc873a62 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
@@ -5,7 +5,6 @@
        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
        <InstallExecuteSequence>
            <ValidateProductID Suppress="yes" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
index 2657797f..4baeb85b 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
@@ -5,7 +5,6 @@
    <Package InstallScope='perMachine' />
    <MajorUpgrade DowngradeErrorMessage='Newer version already installed.' />
-    <MediaTemplate />
    <Directory Id='TARGETDIR' Name='SourceDir'>
      <Directory Id='ProgramFilesFolder'>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
index e0e5345a..b2f22b7d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
@@ -4,7 +4,6 @@
        <Package InstallerVersion="500" Compressed="no" InstallScope="perMachine" />
        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        <MediaTemplate />
        <Feature Id="ProductFeature" Title="MsiPackageTitle">
            <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
index d4b53cd6..388a271e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
index eb907569..879fad35 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
index 303e2ba8..b04c5d1a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <MergeRef Id="TestMsm" />
@@ -16,7 +15,7 @@
      <Directory Id="ProgramFilesFolder">
          <Directory Id="INSTALLFOLDER" Name="MsiPackage">
              <!--   -->
-              <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" DiskId="1" />
+              <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" />
          </Directory>
      </Directory>
    </Directory>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
index 6da3dcbe..28d564e2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
@@ -4,7 +4,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
index 57c24f57..8d49c30e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
@@ -17,7 +17,6 @@
    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
      <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
index 15807698..00a80fca 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
@@ -4,7 +4,6 @@
        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
        <CustomAction Id="CAFromExtension" BinaryKey="BinFromWir" DllEntry="DoesntExist" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
index 85dcb695..4c36f3cc 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
@@ -4,7 +4,6 @@
        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
            <ComponentGroupRef Id="ProductComponents" />