From 4d2f47adcedb2860d0b2dddcb535ac4cf47e53e0 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 5 Jul 2020 17:33:28 -0700 Subject: Store short filenames in separate fields --- src/WixToolset.Data/Symbols/RemoveFileSymbol.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/WixToolset.Data/Symbols/RemoveFileSymbol.cs') diff --git a/src/WixToolset.Data/Symbols/RemoveFileSymbol.cs b/src/WixToolset.Data/Symbols/RemoveFileSymbol.cs index a1791e54..0167b070 100644 --- a/src/WixToolset.Data/Symbols/RemoveFileSymbol.cs +++ b/src/WixToolset.Data/Symbols/RemoveFileSymbol.cs @@ -12,7 +12,8 @@ namespace WixToolset.Data { new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.FileName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.DirProperty), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.ShortFileName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.DirPropertyRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnInstall), IntermediateFieldType.Bool), new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnUninstall), IntermediateFieldType.Bool), }, @@ -26,7 +27,8 @@ namespace WixToolset.Data.Symbols { ComponentRef, FileName, - DirProperty, + ShortFileName, + DirPropertyRef, OnInstall, OnUninstall, } @@ -55,10 +57,16 @@ namespace WixToolset.Data.Symbols set => this.Set((int)RemoveFileSymbolFields.FileName, value); } - public string DirProperty + public string ShortFileName { - get => (string)this.Fields[(int)RemoveFileSymbolFields.DirProperty]; - set => this.Set((int)RemoveFileSymbolFields.DirProperty, value); + get => (string)this.Fields[(int)RemoveFileSymbolFields.ShortFileName]; + set => this.Set((int)RemoveFileSymbolFields.ShortFileName, value); + } + + public string DirPropertyRef + { + get => (string)this.Fields[(int)RemoveFileSymbolFields.DirPropertyRef]; + set => this.Set((int)RemoveFileSymbolFields.DirPropertyRef, value); } public bool? OnInstall -- cgit v1.2.3-55-g6feb