From 4d2f47adcedb2860d0b2dddcb535ac4cf47e53e0 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 5 Jul 2020 17:33:28 -0700
Subject: Store short filenames in separate fields

---
 src/WixToolset.Data/Symbols/MoveFileSymbol.cs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/WixToolset.Data/Symbols/MoveFileSymbol.cs')

diff --git a/src/WixToolset.Data/Symbols/MoveFileSymbol.cs b/src/WixToolset.Data/Symbols/MoveFileSymbol.cs
index 84089965..6e9e32a5 100644
--- a/src/WixToolset.Data/Symbols/MoveFileSymbol.cs
+++ b/src/WixToolset.Data/Symbols/MoveFileSymbol.cs
@@ -12,7 +12,8 @@ namespace WixToolset.Data
             {
                 new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestinationName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestinationShortName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceFolder), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestFolder), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.Delete), IntermediateFieldType.Bool),
@@ -27,7 +28,8 @@ namespace WixToolset.Data.Symbols
     {
         ComponentRef,
         SourceName,
-        DestName,
+        DestinationName,
+        DestinationShortName,
         SourceFolder,
         DestFolder,
         Delete,
@@ -57,10 +59,16 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)MoveFileSymbolFields.SourceName, value);
         }
 
-        public string DestName
+        public string DestinationName
         {
-            get => (string)this.Fields[(int)MoveFileSymbolFields.DestName];
-            set => this.Set((int)MoveFileSymbolFields.DestName, value);
+            get => (string)this.Fields[(int)MoveFileSymbolFields.DestinationName];
+            set => this.Set((int)MoveFileSymbolFields.DestinationName, value);
+        }
+
+        public string DestinationShortName
+        {
+            get => (string)this.Fields[(int)MoveFileSymbolFields.DestinationShortName];
+            set => this.Set((int)MoveFileSymbolFields.DestinationShortName, value);
         }
 
         public string SourceFolder
-- 
cgit v1.2.3-55-g6feb