1 files changed, 47 insertions, 47 deletions
diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs
index ece64502..ae9c4c81 100644
--- a/src/wixext/Tuples/UtilTupleDefinitions.cs
+++ b/src/wixext/Tuples/UtilTupleDefinitions.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Util
    using WixToolset.Data;
    using WixToolset.Data.Burn;
-    public enum UtilTupleDefinitionType
+    public enum UtilSymbolDefinitionType
    {
        EventManifest,
        FileShare,
@@ -30,13 +30,13 @@ namespace WixToolset.Util
        XmlFile,
    }
-    public static partial class UtilTupleDefinitions
+    public static partial class UtilSymbolDefinitions
    {
        public static readonly Version Version = new Version("4.0.0");
-        public static IntermediateTupleDefinition ByName(string name)
+        public static IntermediateSymbolDefinition ByName(string name)
        {
-            if (!Enum.TryParse(name, out UtilTupleDefinitionType type))
+            if (!Enum.TryParse(name, out UtilSymbolDefinitionType type))
            {
                return null;
            }
@@ -44,78 +44,78 @@ namespace WixToolset.Util
            return ByType(type);
        }
-        public static IntermediateTupleDefinition ByType(UtilTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type)
        {
            switch (type)
            {
-                case UtilTupleDefinitionType.EventManifest:
+                case UtilSymbolDefinitionType.EventManifest:
-                    return UtilTupleDefinitions.EventManifest;
+                    return UtilSymbolDefinitions.EventManifest;
-                case UtilTupleDefinitionType.FileShare:
+                case UtilSymbolDefinitionType.FileShare:
-                    return UtilTupleDefinitions.FileShare;
+                    return UtilSymbolDefinitions.FileShare;
-                case UtilTupleDefinitionType.FileSharePermissions:
+                case UtilSymbolDefinitionType.FileSharePermissions:
-                    return UtilTupleDefinitions.FileSharePermissions;
+                    return UtilSymbolDefinitions.FileSharePermissions;
-                case UtilTupleDefinitionType.Group:
+                case UtilSymbolDefinitionType.Group:
-                    return UtilTupleDefinitions.Group;
+                    return UtilSymbolDefinitions.Group;
-                case UtilTupleDefinitionType.Perfmon:
+                case UtilSymbolDefinitionType.Perfmon:
-                    return UtilTupleDefinitions.Perfmon;
+                    return UtilSymbolDefinitions.Perfmon;
-                case UtilTupleDefinitionType.PerfmonManifest:
+                case UtilSymbolDefinitionType.PerfmonManifest:
-                    return UtilTupleDefinitions.PerfmonManifest;
+                    return UtilSymbolDefinitions.PerfmonManifest;
-                case UtilTupleDefinitionType.PerformanceCategory:
+                case UtilSymbolDefinitionType.PerformanceCategory:
-                    return UtilTupleDefinitions.PerformanceCategory;
+                    return UtilSymbolDefinitions.PerformanceCategory;
-                case UtilTupleDefinitionType.SecureObjects:
+                case UtilSymbolDefinitionType.SecureObjects:
-                    return UtilTupleDefinitions.SecureObjects;
+                    return UtilSymbolDefinitions.SecureObjects;
-                case UtilTupleDefinitionType.ServiceConfig:
+                case UtilSymbolDefinitionType.ServiceConfig:
-                    return UtilTupleDefinitions.ServiceConfig;
+                    return UtilSymbolDefinitions.ServiceConfig;
-                case UtilTupleDefinitionType.User:
+                case UtilSymbolDefinitionType.User:
-                    return UtilTupleDefinitions.User;
+                    return UtilSymbolDefinitions.User;
-                case UtilTupleDefinitionType.UserGroup:
+                case UtilSymbolDefinitionType.UserGroup:
-                    return UtilTupleDefinitions.UserGroup;
+                    return UtilSymbolDefinitions.UserGroup;
-                case UtilTupleDefinitionType.WixCloseApplication:
+                case UtilSymbolDefinitionType.WixCloseApplication:
-                    return UtilTupleDefinitions.WixCloseApplication;
+                    return UtilSymbolDefinitions.WixCloseApplication;
-                case UtilTupleDefinitionType.WixDetectSHA2Support:
+                case UtilSymbolDefinitionType.WixDetectSHA2Support:
-                    return UtilTupleDefinitions.WixDetectSHA2Support;
+                    return UtilSymbolDefinitions.WixDetectSHA2Support;
-                case UtilTupleDefinitionType.WixFormatFiles:
+                case UtilSymbolDefinitionType.WixFormatFiles:
-                    return UtilTupleDefinitions.WixFormatFiles;
+                    return UtilSymbolDefinitions.WixFormatFiles;
-                case UtilTupleDefinitionType.WixInternetShortcut:
+                case UtilSymbolDefinitionType.WixInternetShortcut:
-                    return UtilTupleDefinitions.WixInternetShortcut;
+                    return UtilSymbolDefinitions.WixInternetShortcut;
-                case UtilTupleDefinitionType.WixRemoveFolderEx:
+                case UtilSymbolDefinitionType.WixRemoveFolderEx:
-                    return UtilTupleDefinitions.WixRemoveFolderEx;
+                    return UtilSymbolDefinitions.WixRemoveFolderEx;
-                case UtilTupleDefinitionType.WixRestartResource:
+                case UtilSymbolDefinitionType.WixRestartResource:
-                    return UtilTupleDefinitions.WixRestartResource;
+                    return UtilSymbolDefinitions.WixRestartResource;
-                case UtilTupleDefinitionType.WixTouchFile:
+                case UtilSymbolDefinitionType.WixTouchFile:
-                    return UtilTupleDefinitions.WixTouchFile;
+                    return UtilSymbolDefinitions.WixTouchFile;
-                case UtilTupleDefinitionType.XmlConfig:
+                case UtilSymbolDefinitionType.XmlConfig:
-                    return UtilTupleDefinitions.XmlConfig;
+                    return UtilSymbolDefinitions.XmlConfig;
-                case UtilTupleDefinitionType.XmlFile:
+                case UtilSymbolDefinitionType.XmlFile:
-                    return UtilTupleDefinitions.XmlFile;
+                    return UtilSymbolDefinitions.XmlFile;
                default:
                    throw new ArgumentOutOfRangeException(nameof(type));
            }
        }
-        static UtilTupleDefinitions()
+        static UtilSymbolDefinitions()
        {
-            WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag);
+            WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
        }
    }
 }

diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs index ece64502..ae9c4c81 100644 --- a/src/wixext/Tuples/UtilTupleDefinitions.cs +++ b/src/wixext/Tuples/UtilTupleDefinitions.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Util
6	using WixToolset.Data;	6	using WixToolset.Data;
7	using WixToolset.Data.Burn;	7	using WixToolset.Data.Burn;
8		8
9	public enum UtilTupleDefinitionType	9	public enum UtilSymbolDefinitionType
10	{	10	{
11	EventManifest,	11	EventManifest,
12	FileShare,	12	FileShare,
@@ -30,13 +30,13 @@ namespace WixToolset.Util
30	XmlFile,	30	XmlFile,
31	}	31	}
32		32
33	public static partial class UtilTupleDefinitions	33	public static partial class UtilSymbolDefinitions
34	{	34	{
35	public static readonly Version Version = new Version("4.0.0");	35	public static readonly Version Version = new Version("4.0.0");
36		36
37	public static IntermediateTupleDefinition ByName(string name)	37	public static IntermediateSymbolDefinition ByName(string name)
38	{	38	{
39	if (!Enum.TryParse(name, out UtilTupleDefinitionType type))	39	if (!Enum.TryParse(name, out UtilSymbolDefinitionType type))
40	{	40	{
41	return null;	41	return null;
42	}	42	}
@@ -44,78 +44,78 @@ namespace WixToolset.Util
44	return ByType(type);	44	return ByType(type);
45	}	45	}
46		46
47	public static IntermediateTupleDefinition ByType(UtilTupleDefinitionType type)	47	public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type)
48	{	48	{
49	switch (type)	49	switch (type)
50	{	50	{
51	case UtilTupleDefinitionType.EventManifest:	51	case UtilSymbolDefinitionType.EventManifest:
52	return UtilTupleDefinitions.EventManifest;	52	return UtilSymbolDefinitions.EventManifest;
53		53
54	case UtilTupleDefinitionType.FileShare:	54	case UtilSymbolDefinitionType.FileShare:
55	return UtilTupleDefinitions.FileShare;	55	return UtilSymbolDefinitions.FileShare;
56		56
57	case UtilTupleDefinitionType.FileSharePermissions:	57	case UtilSymbolDefinitionType.FileSharePermissions:
58	return UtilTupleDefinitions.FileSharePermissions;	58	return UtilSymbolDefinitions.FileSharePermissions;
59		59
60	case UtilTupleDefinitionType.Group:	60	case UtilSymbolDefinitionType.Group:
61	return UtilTupleDefinitions.Group;	61	return UtilSymbolDefinitions.Group;
62		62
63	case UtilTupleDefinitionType.Perfmon:	63	case UtilSymbolDefinitionType.Perfmon:
64	return UtilTupleDefinitions.Perfmon;	64	return UtilSymbolDefinitions.Perfmon;
65		65
66	case UtilTupleDefinitionType.PerfmonManifest:	66	case UtilSymbolDefinitionType.PerfmonManifest:
67	return UtilTupleDefinitions.PerfmonManifest;	67	return UtilSymbolDefinitions.PerfmonManifest;
68		68
69	case UtilTupleDefinitionType.PerformanceCategory:	69	case UtilSymbolDefinitionType.PerformanceCategory:
70	return UtilTupleDefinitions.PerformanceCategory;	70	return UtilSymbolDefinitions.PerformanceCategory;
71		71
72	case UtilTupleDefinitionType.SecureObjects:	72	case UtilSymbolDefinitionType.SecureObjects:
73	return UtilTupleDefinitions.SecureObjects;	73	return UtilSymbolDefinitions.SecureObjects;
74		74
75	case UtilTupleDefinitionType.ServiceConfig:	75	case UtilSymbolDefinitionType.ServiceConfig:
76	return UtilTupleDefinitions.ServiceConfig;	76	return UtilSymbolDefinitions.ServiceConfig;
77		77
78	case UtilTupleDefinitionType.User:	78	case UtilSymbolDefinitionType.User:
79	return UtilTupleDefinitions.User;	79	return UtilSymbolDefinitions.User;
80		80
81	case UtilTupleDefinitionType.UserGroup:	81	case UtilSymbolDefinitionType.UserGroup:
82	return UtilTupleDefinitions.UserGroup;	82	return UtilSymbolDefinitions.UserGroup;
83		83
84	case UtilTupleDefinitionType.WixCloseApplication:	84	case UtilSymbolDefinitionType.WixCloseApplication:
85	return UtilTupleDefinitions.WixCloseApplication;	85	return UtilSymbolDefinitions.WixCloseApplication;
86		86
87	case UtilTupleDefinitionType.WixDetectSHA2Support:	87	case UtilSymbolDefinitionType.WixDetectSHA2Support:
88	return UtilTupleDefinitions.WixDetectSHA2Support;	88	return UtilSymbolDefinitions.WixDetectSHA2Support;
89		89
90	case UtilTupleDefinitionType.WixFormatFiles:	90	case UtilSymbolDefinitionType.WixFormatFiles:
91	return UtilTupleDefinitions.WixFormatFiles;	91	return UtilSymbolDefinitions.WixFormatFiles;
92		92
93	case UtilTupleDefinitionType.WixInternetShortcut:	93	case UtilSymbolDefinitionType.WixInternetShortcut:
94	return UtilTupleDefinitions.WixInternetShortcut;	94	return UtilSymbolDefinitions.WixInternetShortcut;
95		95
96	case UtilTupleDefinitionType.WixRemoveFolderEx:	96	case UtilSymbolDefinitionType.WixRemoveFolderEx:
97	return UtilTupleDefinitions.WixRemoveFolderEx;	97	return UtilSymbolDefinitions.WixRemoveFolderEx;
98		98
99	case UtilTupleDefinitionType.WixRestartResource:	99	case UtilSymbolDefinitionType.WixRestartResource:
100	return UtilTupleDefinitions.WixRestartResource;	100	return UtilSymbolDefinitions.WixRestartResource;
101		101
102	case UtilTupleDefinitionType.WixTouchFile:	102	case UtilSymbolDefinitionType.WixTouchFile:
103	return UtilTupleDefinitions.WixTouchFile;	103	return UtilSymbolDefinitions.WixTouchFile;
104		104
105	case UtilTupleDefinitionType.XmlConfig:	105	case UtilSymbolDefinitionType.XmlConfig:
106	return UtilTupleDefinitions.XmlConfig;	106	return UtilSymbolDefinitions.XmlConfig;
107		107
108	case UtilTupleDefinitionType.XmlFile:	108	case UtilSymbolDefinitionType.XmlFile:
109	return UtilTupleDefinitions.XmlFile;	109	return UtilSymbolDefinitions.XmlFile;
110		110
111	default:	111	default:
112	throw new ArgumentOutOfRangeException(nameof(type));	112	throw new ArgumentOutOfRangeException(nameof(type));
113	}	113	}
114	}	114	}
115		115
116	static UtilTupleDefinitions()	116	static UtilSymbolDefinitions()
117	{	117	{
118	WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag);	118	WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
119	}	119	}
120	}	120	}
121	}	121	}