Breakout short and source names in Directory and Shortcut tuples

3 files changed, 40 insertions, 8 deletions

diff --git a/src/WixToolset.Data/Tuples/DirectoryTuple.cs b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
index dc95f046..51f559aa 100644
--- a/src/WixToolset.Data/Tuples/DirectoryTuple.cs
+++ b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
@@ -11,7 +11,10 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ParentDirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.DefaultDir), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceShortName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
             },
             typeof(DirectoryTuple));
@@ -23,7 +26,10 @@ namespace WixToolset.Data.Tuples
     public enum DirectoryTupleFields
     {
         ParentDirectoryRef,
-        DefaultDir,
+        Name,
+        ShortName,
+        SourceName,
+        SourceShortName,
         ComponentGuidGenerationSeed,
     }
 
@@ -45,10 +51,28 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)DirectoryTupleFields.ParentDirectoryRef, value);
         }
 
-        public string DefaultDir
+        public string Name
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.DefaultDir];
-            set => this.Set((int)DirectoryTupleFields.DefaultDir, value);
+            get => (string)this.Fields[(int)DirectoryTupleFields.Name];
+            set => this.Set((int)DirectoryTupleFields.Name, value);
+        }
+
+        public string ShortName
+        {
+            get => (string)this.Fields[(int)DirectoryTupleFields.ShortName];
+            set => this.Set((int)DirectoryTupleFields.ShortName, value);
+        }
+
+        public string SourceName
+        {
+            get => (string)this.Fields[(int)DirectoryTupleFields.SourceName];
+            set => this.Set((int)DirectoryTupleFields.SourceName, value);
+        }
+
+        public string SourceShortName
+        {
+            get => (string)this.Fields[(int)DirectoryTupleFields.SourceShortName];
+            set => this.Set((int)DirectoryTupleFields.SourceShortName, value);
         }
 
         public string ComponentGuidGenerationSeed
@@ -57,4 +81,4 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)DirectoryTupleFields.ComponentGuidGenerationSeed, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/WixToolset.Data/Tuples/ShortcutTuple.cs b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
index c2b9e63f..66b98287 100644
--- a/src/WixToolset.Data/Tuples/ShortcutTuple.cs
+++ b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Data
             {
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DirectoryRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ShortName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Target), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Arguments), IntermediateFieldType.String),
@@ -36,6 +37,7 @@ namespace WixToolset.Data.Tuples
     {
         DirectoryRef,
         Name,
+        ShortName,
         ComponentRef,
         Target,
         Arguments,
@@ -82,6 +84,12 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ShortcutTupleFields.Name, value);
         }
 
+        public string ShortName
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.ShortName];
+            set => this.Set((int)ShortcutTupleFields.ShortName, value);
+        }
+
         public string ComponentRef
         {
             get => (string)this.Fields[(int)ShortcutTupleFields.ComponentRef];
@@ -160,4 +168,4 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ShortcutTupleFields.DescriptionResourceId, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
index 13a2e1c9..29acf111 100644
--- a/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
@@ -48,7 +48,7 @@ namespace WixToolset.Data.Tuples
         {
         }
 
-        public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, null)
+        public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
         {
         }