From 543a3f9a87204a32c9ded3f9f519ad6d42107ab7 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 31 Dec 2020 18:31:04 -0600
Subject: Don't embed cabs to match test in old repo.

---
 src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj   | 2 --
 src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj   | 2 --
 src/TestData/MsiTransaction/PackageA/PackageA.wixproj     | 1 +
 src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj | 3 +++
 src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj | 3 +++
 src/TestData/Templates/Package.wxs                        | 4 ++++
 src/Wix.Build.targets                                     | 1 +
 7 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
index bf50fff2..4e92a102 100644
--- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
+++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
@@ -5,13 +5,11 @@
     <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
     <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
     <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
index d1f067eb..7d1a42c5 100644
--- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
+++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
@@ -6,13 +6,11 @@
     <Version>2.0.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
     <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
     <ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" />
     <ProjectReference Include="..\PackageD\PackageD.wixproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransaction/PackageA/PackageA.wixproj b/src/TestData/MsiTransaction/PackageA/PackageA.wixproj
index bc18cd44..2ef7c05e 100644
--- a/src/TestData/MsiTransaction/PackageA/PackageA.wixproj
+++ b/src/TestData/MsiTransaction/PackageA/PackageA.wixproj
@@ -1,6 +1,7 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
+    <CabPrefix>a</CabPrefix>
     <UpgradeCode>{7772FCDF-5FDB-497D-B5DF-C6D17D667976}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj b/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj
index 7b6f83a3..6dc1e4d8 100644
--- a/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj
+++ b/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj
@@ -1,4 +1,7 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
   <Import Project="PackageB.props" />
+  <PropertyGroup>
+    <CabPrefix>bv1</CabPrefix>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj b/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj
index 45615706..617e61c3 100644
--- a/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj
+++ b/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj
@@ -1,4 +1,7 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
   <Import Project="PackageC.props" />
+  <PropertyGroup>
+    <CabPrefix>cv1</CabPrefix>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs
index ff5e71c7..6cf47775 100644
--- a/src/TestData/Templates/Package.wxs
+++ b/src/TestData/Templates/Package.wxs
@@ -9,7 +9,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <?ifndef CabPrefix?>
     <MediaTemplate EmbedCab="yes" />
+    <?else?>
+    <MediaTemplate CabinetTemplate="{0}$(var.CabPrefix).cab" />
+    <?endif?>
 
     <Property Id="MsiLogging" Value="voicewarmup" />
     <PropertyRef Id="TestVersion" />
diff --git a/src/Wix.Build.targets b/src/Wix.Build.targets
index e2caf069..6a35b172 100644
--- a/src/Wix.Build.targets
+++ b/src/Wix.Build.targets
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <PackageName Condition=" '$(PackageName)' == '' ">$(MSBuildProjectName)</PackageName>
     <DefineConstants>TestGroupName=$(TestGroupName);PackageName=$(PackageName);$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(CabPrefix)' != '' ">CabPrefix=$(CabPrefix);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-- 
cgit v1.2.3-55-g6feb