1 files changed, 50 insertions, 17 deletions

diff --git a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
index cd02d21e..987dccd7 100644
--- a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
+++ b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
@@ -10,7 +10,6 @@ namespace WixToolset.Data
             TupleDefinitionType.ServiceInstall,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ServiceInstall), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.DisplayName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ServiceType), IntermediateFieldType.Number),
@@ -23,6 +22,8 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Arguments), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Component_), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Interactive), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Vital), IntermediateFieldType.Bool),
             },
             typeof(ServiceInstallTuple));
     }
@@ -32,7 +33,6 @@ namespace WixToolset.Data.Tuples
 {
     public enum ServiceInstallTupleFields
     {
-        ServiceInstall,
         Name,
         DisplayName,
         ServiceType,
@@ -45,6 +45,33 @@ namespace WixToolset.Data.Tuples
         Arguments,
         Component_,
         Description,
+        Interactive,
+        Vital,
+    }
+
+    public enum ServiceType
+    {
+        KernelDriver,
+        SystemDriver,
+        OwnProcess = 4,
+        ShareProcess = 8,
+        InteractiveProcess = 256,
+    }
+
+    public enum ServiceStartType
+    {
+        Boot,
+        System,
+        Auto,
+        Demand,
+        Disabled,
+    }
+
+    public enum ServiceErrorControl
+    {
+        Ignore,
+        Normal,
+        Critical = 3,
     }
 
     public class ServiceInstallTuple : IntermediateTuple
@@ -59,12 +86,6 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ServiceInstallTupleFields index] => this.Fields[(int)index];
 
-        public string ServiceInstall
-        {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.ServiceInstall]?.Value;
-            set => this.Set((int)ServiceInstallTupleFields.ServiceInstall, value);
-        }
-
         public string Name
         {
             get => (string)this.Fields[(int)ServiceInstallTupleFields.Name]?.Value;
@@ -77,22 +98,22 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ServiceInstallTupleFields.DisplayName, value);
         }
 
-        public int ServiceType
+        public ServiceType ServiceType
         {
-            get => (int)this.Fields[(int)ServiceInstallTupleFields.ServiceType]?.Value;
-            set => this.Set((int)ServiceInstallTupleFields.ServiceType, value);
+            get => (ServiceType)this.Fields[(int)ServiceInstallTupleFields.ServiceType].AsNumber();
+            set => this.Set((int)ServiceInstallTupleFields.ServiceType, (int)value);
         }
 
-        public int StartType
+        public ServiceStartType StartType
         {
-            get => (int)this.Fields[(int)ServiceInstallTupleFields.StartType]?.Value;
-            set => this.Set((int)ServiceInstallTupleFields.StartType, value);
+            get => (ServiceStartType)this.Fields[(int)ServiceInstallTupleFields.StartType].AsNumber();
+            set => this.Set((int)ServiceInstallTupleFields.StartType, (int)value);
         }
 
-        public int ErrorControl
+        public ServiceErrorControl ErrorControl
         {
-            get => (int)this.Fields[(int)ServiceInstallTupleFields.ErrorControl]?.Value;
-            set => this.Set((int)ServiceInstallTupleFields.ErrorControl, value);
+            get => (ServiceErrorControl)this.Fields[(int)ServiceInstallTupleFields.ErrorControl].AsNumber();
+            set => this.Set((int)ServiceInstallTupleFields.ErrorControl, (int)value);
         }
 
         public string LoadOrderGroup
@@ -136,5 +157,17 @@ namespace WixToolset.Data.Tuples
             get => (string)this.Fields[(int)ServiceInstallTupleFields.Description]?.Value;
             set => this.Set((int)ServiceInstallTupleFields.Description, value);
         }
+
+        public bool Interactive
+        {
+            get => this.Fields[(int)ServiceInstallTupleFields.Interactive].AsBool();
+            set => this.Set((int)ServiceInstallTupleFields.Interactive, value);
+        }
+
+        public bool Vital
+        {
+            get => this.Fields[(int)ServiceInstallTupleFields.Vital].AsBool();
+            set => this.Set((int)ServiceInstallTupleFields.Vital, value);
+        }
     }
 }
\ No newline at end of file