Update package Cache attribute to new attribute values

Closes wixtoolset/issues#5125

3 files changed, 21 insertions, 27 deletions

diff --git a/src/api/wix/WixToolset.Data/BundleCacheType.cs b/src/api/wix/WixToolset.Data/BundleCacheType.cs
new file mode 100644
index 00000000..7d297d4b
--- /dev/null
+++ b/src/api/wix/WixToolset.Data/BundleCacheType.cs
@@ -0,0 +1,19 @@
+// 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.
+
+namespace WixToolset.Data
+{
+    /// <summary>
+    /// Keep, Remove, Force xml simple type.
+    /// </summary>
+    public enum BundleCacheType
+    {
+        /// <summary>The keep value.</summary>
+        Keep,
+
+        /// <summary>The remove value.</summary>
+        Remove,
+
+        /// <summary>The force value.</summary>
+        Force,
+    }
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
index cbe7f761..3d1a6ce8 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
@@ -117,9 +117,9 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundlePackageSymbolFields.InstallCondition, value);
         }
 
-        public YesNoAlwaysType Cache
+        public BundleCacheType? Cache
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.Cache], true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.Cache], true, out BundleCacheType value) ? value : (BundleCacheType?)null;
             set => this.Set((int)WixBundlePackageSymbolFields.Cache, value.ToString().ToLowerInvariant());
         }
 
diff --git a/src/api/wix/WixToolset.Data/YesNoAlwaysType.cs b/src/api/wix/WixToolset.Data/YesNoAlwaysType.cs
deleted file mode 100644
index 3b4ca5d7..00000000
--- a/src/api/wix/WixToolset.Data/YesNoAlwaysType.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.
-
-namespace WixToolset.Data
-{
-    /// <summary>
-    /// Yes, No, Always xml simple type.
-    /// </summary>
-    public enum YesNoAlwaysType
-    {
-        /// <summary>Not a valid yes, no or always value.</summary>
-        IllegalValue = -2,
-
-        /// <summary>Value not set; equivalent to null for reference types.</summary>
-        NotSet = -1,
-
-        /// <summary>The no value.</summary>
-        No,
-
-        /// <summary>The yes value.</summary>
-        Yes,
-
-        /// <summary>The always value.</summary>
-        Always,
-    }
-}