From a962b626a238dab205c7d0dccd52120081ccf5d3 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 16 May 2021 21:53:08 -0700
Subject: Update package Cache attribute to new attribute values

Closes wixtoolset/issues#5125
---
 src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs          | 2 +-
 src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs  | 2 +-
 src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs              | 2 +-
 src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs              | 2 +-
 src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs              | 2 +-
 src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs | 2 +-
 src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/test')

diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
index 9218e823..3a15fdbb 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
@@ -8,7 +8,7 @@
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
index 1590574f..3a9fd61d 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
@@ -8,7 +8,7 @@
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
index 026100fa..670a812c 100644
--- a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
@@ -9,7 +9,7 @@
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs
index 8ee40558..f371f674 100644
--- a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs
@@ -4,7 +4,7 @@
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
-      <ExePackage Id="TestExe" Cache="no" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">
+      <ExePackage Id="TestExe" Cache="remove" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">
         <PayloadGroupRef Id="TestExePayloads" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
index 204e66ab..03b3538b 100644
--- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
@@ -9,7 +9,7 @@
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
       <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
-      <ExePackage Id="ExeA" Cache="no" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"
+      <ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)">
         <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
         <PayloadGroupRef Id="TestExePayloads" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
index c8ca4a3f..30fba657 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
@@ -9,7 +9,7 @@
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
index c903988b..455ea1e1 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
@@ -16,7 +16,7 @@
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
-      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" Cache="always" />
+      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" Cache="force" />
     </PackageGroup>
   </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb