Update package Cache attribute to new attribute values

Closes wixtoolset/issues#5125
author: Rob Mensching <rob@firegiant.com> 2021-05-16 21:53:08 -0700
committer: Rob Mensching <rob@firegiant.com> 2021-05-17 01:01:59 -0700
commit: a962b626a238dab205c7d0dccd52120081ccf5d3 (patch)
tree: 885f5d826814f70c4f2d2f4c31b0b68d2960e7a1 /src/test
parent: 004d363a692511a7b5a05cea05df7f8244afe6a4 (diff)
download: wix-a962b626a238dab205c7d0dccd52120081ccf5d3.tar.gz
wix-a962b626a238dab205c7d0dccd52120081ccf5d3.tar.bz2
wix-a962b626a238dab205c7d0dccd52120081ccf5d3.zip
7 files changed, 7 insertions, 7 deletions
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>
author	Rob Mensching <rob@firegiant.com>	2021-05-16 21:53:08 -0700
committer	Rob Mensching <rob@firegiant.com>	2021-05-17 01:01:59 -0700
commit	a962b626a238dab205c7d0dccd52120081ccf5d3 (patch)
tree	885f5d826814f70c4f2d2f4c31b0b68d2960e7a1 /src/test
parent	004d363a692511a7b5a05cea05df7f8244afe6a4 (diff)
download	wix-a962b626a238dab205c7d0dccd52120081ccf5d3.tar.gz wix-a962b626a238dab205c7d0dccd52120081ccf5d3.tar.bz2 wix-a962b626a238dab205c7d0dccd52120081ccf5d3.zip

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 @@
8		8
9	<PackageGroup Id="BundlePackages">	9	<PackageGroup Id="BundlePackages">
10	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />	10	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11	<ExePackage Id="ExeA" Cache="no" PerMachine="yes"	11	<ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
12	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"	12	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"
13	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	13	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""
14	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	14	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""


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 @@
8		8
9	<PackageGroup Id="BundlePackages">	9	<PackageGroup Id="BundlePackages">
10	<MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />	10	<MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
11	<ExePackage Id="ExeA" Cache="no" PerMachine="yes"	11	<ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
12	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"	12	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"
13	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	13	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""
14	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	14	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""


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 @@
9	<PackageGroup Id="BundlePackages">	9	<PackageGroup Id="BundlePackages">
10	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />	10	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />	11	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
12	<ExePackage Id="ExeA" Cache="no" PerMachine="yes"	12	<ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
13	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"	13	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"
14	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	14	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""
15	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	15	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""


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 @@
4	<Fragment>	4	<Fragment>
5	<PackageGroup Id="BundlePackages">	5	<PackageGroup Id="BundlePackages">
6	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />	6	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
7	<ExePackage Id="TestExe" Cache="no" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">	7	<ExePackage Id="TestExe" Cache="remove" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">
8	<PayloadGroupRef Id="TestExePayloads" />	8	<PayloadGroupRef Id="TestExePayloads" />
9	</ExePackage>	9	</ExePackage>
10	</PackageGroup>	10	</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 @@
9	<PackageGroup Id="BundlePackages">	9	<PackageGroup Id="BundlePackages">
10	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />	10	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11	<MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />	11	<MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
12	<ExePackage Id="ExeA" Cache="no" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"	12	<ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"
13	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)">	13	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)">
14	<Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />	14	<Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
15	<PayloadGroupRef Id="TestExePayloads" />	15	<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 @@
9		9
10	<PackageGroup Id="BundlePackages">	10	<PackageGroup Id="BundlePackages">
11	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />	11	<MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
12	<ExePackage Id="ExeA" Cache="no" PerMachine="yes"	12	<ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
13	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"	13	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"
14	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	14	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""
15	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""	15	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""


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 @@
16	<Fragment>	16	<Fragment>
17	<PackageGroup Id="BundlePackages">	17	<PackageGroup Id="BundlePackages">
18	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />	18	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
19	<MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" Cache="always" />	19	<MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" Cache="force" />
20	</PackageGroup>	20	</PackageGroup>
21	</Fragment>	21	</Fragment>
22	</Wix>	22	</Wix>