1 files changed, 17 insertions, 11 deletions

diff --git a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
index 154aad67..89c8d2e2 100644
--- a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
@@ -10,10 +10,10 @@ namespace WixToolset.Data
             TupleDefinitionType.RemoveRegistry,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.RemoveRegistry), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Root), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Key), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Action), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Component_), IntermediateFieldType.String),
             },
             typeof(RemoveRegistryTuple));
@@ -24,13 +24,19 @@ namespace WixToolset.Data.Tuples
 {
     public enum RemoveRegistryTupleFields
     {
-        RemoveRegistry,
         Root,
         Key,
         Name,
+        Action,
         Component_,
     }
 
+    public enum RemoveRegistryActionType
+    {
+        RemoveOnInstall,
+        RemoveOnUninstall
+    };
+
     public class RemoveRegistryTuple : IntermediateTuple
     {
         public RemoveRegistryTuple() : base(TupleDefinitions.RemoveRegistry, null, null)
@@ -43,16 +49,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[RemoveRegistryTupleFields index] => this.Fields[(int)index];
 
-        public string RemoveRegistry
-        {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.RemoveRegistry]?.Value;
-            set => this.Set((int)RemoveRegistryTupleFields.RemoveRegistry, value);
-        }
-
-        public int Root
+        public RegistryRootType Root
         {
-            get => (int)this.Fields[(int)RemoveRegistryTupleFields.Root]?.Value;
-            set => this.Set((int)RemoveRegistryTupleFields.Root, value);
+            get => (RegistryRootType)this.Fields[(int)RemoveRegistryTupleFields.Key]?.AsNumber();
+            set => this.Set((int)RemoveRegistryTupleFields.Root, (int)value);
         }
 
         public string Key
@@ -67,6 +67,12 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)RemoveRegistryTupleFields.Name, value);
         }
 
+        public RemoveRegistryActionType Action
+        {
+            get => (RemoveRegistryActionType)this.Fields[(int)RemoveRegistryTupleFields.Action].AsNumber();
+            set => this.Set((int)RemoveRegistryTupleFields.Action, (int)value);
+        }
+
         public string Component_
         {
             get => (string)this.Fields[(int)RemoveRegistryTupleFields.Component_]?.Value;