From 54541ef517190f37d0625627b028834f0871a959 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 22 May 2019 00:19:41 -0700
Subject: Implement many more strong tuples

Also fixes several warnings.
---
 src/WixToolset.Data/Tuples/TupleDefinitions.cs | 40 +++-----------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'src/WixToolset.Data/Tuples/TupleDefinitions.cs')

diff --git a/src/WixToolset.Data/Tuples/TupleDefinitions.cs b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
index 173b4371..8c0c932a 100644
--- a/src/WixToolset.Data/Tuples/TupleDefinitions.cs
+++ b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
@@ -3,14 +3,11 @@
 namespace WixToolset.Data
 {
     using System;
-    using WixToolset.Data.Tuples;
 
     public enum TupleDefinitionType
     {
-        _Streams,
-        _SummaryInformation,
-        _TransformView,
-        _Validation,
+        SummaryInformation,
+        Validation,
         ActionText,
         AdminExecuteSequence,
         AdminUISequence,
@@ -20,7 +17,6 @@ namespace WixToolset.Data
         BBControl,
         Billboard,
         Binary,
-        BindImage,
         CCPSearch,
         CheckBox,
         Class,
@@ -48,7 +44,6 @@ namespace WixToolset.Data
         FeatureComponents,
         File,
         FileSFPCatalog,
-        Font,
         Icon,
         ImageFamilies,
         IniFile,
@@ -113,7 +108,6 @@ namespace WixToolset.Data
         RemoveIniFile,
         RemoveRegistry,
         ReserveCost,
-        SelfReg,
         ServiceControl,
         ServiceInstall,
         SFPCatalog,
@@ -165,7 +159,6 @@ namespace WixToolset.Data
         WixCustomTable,
         WixDeltaPatchFile,
         WixDeltaPatchSymbolPaths,
-        WixDirectory,
         WixEnsureTable,
         WixFeatureGroup,
         WixFeatureModules,
@@ -175,7 +168,6 @@ namespace WixToolset.Data
         WixGroup,
         WixInstanceComponent,
         WixInstanceTransforms,
-        WixMedia,
         WixMediaTemplate,
         WixMerge,
         WixOrdering,
@@ -221,17 +213,8 @@ namespace WixToolset.Data
         {
             switch (type)
             {
-                case TupleDefinitionType._Streams:
-                    return TupleDefinitions._Streams;
-
-                case TupleDefinitionType._SummaryInformation:
-                    return TupleDefinitions._SummaryInformation;
-
-                case TupleDefinitionType._TransformView:
-                    return TupleDefinitions._TransformView;
-
-                case TupleDefinitionType._Validation:
-                    return TupleDefinitions._Validation;
+                case TupleDefinitionType.SummaryInformation:
+                    return TupleDefinitions.SummaryInformation;
 
                 case TupleDefinitionType.ActionText:
                     return TupleDefinitions.ActionText;
@@ -260,9 +243,6 @@ namespace WixToolset.Data
                 case TupleDefinitionType.Binary:
                     return TupleDefinitions.Binary;
 
-                case TupleDefinitionType.BindImage:
-                    return TupleDefinitions.BindImage;
-
                 case TupleDefinitionType.CCPSearch:
                     return TupleDefinitions.CCPSearch;
 
@@ -344,9 +324,6 @@ namespace WixToolset.Data
                 case TupleDefinitionType.FileSFPCatalog:
                     return TupleDefinitions.FileSFPCatalog;
 
-                case TupleDefinitionType.Font:
-                    return TupleDefinitions.Font;
-
                 case TupleDefinitionType.Icon:
                     return TupleDefinitions.Icon;
 
@@ -539,9 +516,6 @@ namespace WixToolset.Data
                 case TupleDefinitionType.ReserveCost:
                     return TupleDefinitions.ReserveCost;
 
-                case TupleDefinitionType.SelfReg:
-                    return TupleDefinitions.SelfReg;
-
                 case TupleDefinitionType.ServiceControl:
                     return TupleDefinitions.ServiceControl;
 
@@ -695,9 +669,6 @@ namespace WixToolset.Data
                 case TupleDefinitionType.WixDeltaPatchSymbolPaths:
                     return TupleDefinitions.WixDeltaPatchSymbolPaths;
 
-                case TupleDefinitionType.WixDirectory:
-                    return TupleDefinitions.WixDirectory;
-
                 case TupleDefinitionType.WixEnsureTable:
                     return TupleDefinitions.WixEnsureTable;
 
@@ -725,9 +696,6 @@ namespace WixToolset.Data
                 case TupleDefinitionType.WixInstanceTransforms:
                     return TupleDefinitions.WixInstanceTransforms;
 
-                case TupleDefinitionType.WixMedia:
-                    return TupleDefinitions.WixMedia;
-
                 case TupleDefinitionType.WixMediaTemplate:
                     return TupleDefinitions.WixMediaTemplate;
 
-- 
cgit v1.2.3-55-g6feb