From b36433623fcac28cf620868430d49bc36fca2963 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 22 May 2019 14:45:33 -0700
Subject: Use "Ref" instead of "_" as the reference convention

---
 src/WixToolset.Data/Tuples/FileTuple.cs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs
index eab29dfa..6d7281cc 100644
--- a/src/WixToolset.Data/Tuples/FileTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileTuple.cs
@@ -10,9 +10,9 @@ namespace WixToolset.Data
             TupleDefinitionType.File,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Component_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortFileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.LongFileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
@@ -34,9 +34,9 @@ namespace WixToolset.Data.Tuples
 {
     public enum FileTupleFields
     {
-        Component_,
-        ShortFileName,
-        LongFileName,
+        ComponentRef,
+        ShortName,
+        Name,
         FileSize,
         Version,
         Language,
@@ -63,22 +63,22 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)FileTupleFields.Component_];
-            set => this.Set((int)FileTupleFields.Component_, value);
+            get => (string)this.Fields[(int)FileTupleFields.ComponentRef];
+            set => this.Set((int)FileTupleFields.ComponentRef, value);
         }
 
-        public string ShortFileName
+        public string ShortName
         {
-            get => (string)this.Fields[(int)FileTupleFields.ShortFileName];
-            set => this.Set((int)FileTupleFields.ShortFileName, value);
+            get => (string)this.Fields[(int)FileTupleFields.ShortName];
+            set => this.Set((int)FileTupleFields.ShortName, value);
         }
 
-        public string LongFileName
+        public string Name
         {
-            get => (string)this.Fields[(int)FileTupleFields.LongFileName];
-            set => this.Set((int)FileTupleFields.LongFileName, value);
+            get => (string)this.Fields[(int)FileTupleFields.Name];
+            set => this.Set((int)FileTupleFields.Name, value);
         }
 
         public int FileSize
-- 
cgit v1.2.3-55-g6feb