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/DuplicateFileSymbol.cs | 8 ++++++++ src/WixToolset.Data/Symbols/FileSymbol.cs | 1 - src/WixToolset.Data/Symbols/IniFileSymbol.cs | 8 ++++++++ src/WixToolset.Data/Symbols/IniLocatorSymbol.cs | 16 ++++++++-------- src/WixToolset.Data/Symbols/MoveFileSymbol.cs | 18 +++++++++++++----- src/WixToolset.Data/Symbols/RemoveFileSymbol.cs | 18 +++++++++++++----- 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/WixToolset.Data/Symbols/DuplicateFileSymbol.cs b/src/WixToolset.Data/Symbols/DuplicateFileSymbol.cs index 1344ced4..f2d1d94f 100644 --- a/src/WixToolset.Data/Symbols/DuplicateFileSymbol.cs +++ b/src/WixToolset.Data/Symbols/DuplicateFileSymbol.cs @@ -13,6 +13,7 @@ namespace WixToolset.Data new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.FileRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationShortName), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationFolder), IntermediateFieldType.String), }, typeof(DuplicateFileSymbol)); @@ -26,6 +27,7 @@ namespace WixToolset.Data.Symbols ComponentRef, FileRef, DestinationName, + DestinationShortName, DestinationFolder, } @@ -59,6 +61,12 @@ namespace WixToolset.Data.Symbols set => this.Set((int)DuplicateFileSymbolFields.DestinationName, value); } + public string DestinationShortName + { + get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationShortName]; + set => this.Set((int)DuplicateFileSymbolFields.DestinationShortName, value); + } + public string DestinationFolder { get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationFolder]; diff --git a/src/WixToolset.Data/Symbols/FileSymbol.cs b/src/WixToolset.Data/Symbols/FileSymbol.cs index 7d1afdb7..784b7846 100644 --- a/src/WixToolset.Data/Symbols/FileSymbol.cs +++ b/src/WixToolset.Data/Symbols/FileSymbol.cs @@ -86,7 +86,6 @@ namespace WixToolset.Data.Symbols Compressed = 0x10, Uncompressed = 0x20, Checksum = 0x40, - GeneratedShortFileName = 0x80, } /// diff --git a/src/WixToolset.Data/Symbols/IniFileSymbol.cs b/src/WixToolset.Data/Symbols/IniFileSymbol.cs index e23f6039..f1e0c104 100644 --- a/src/WixToolset.Data/Symbols/IniFileSymbol.cs +++ b/src/WixToolset.Data/Symbols/IniFileSymbol.cs @@ -11,6 +11,7 @@ namespace WixToolset.Data new[] { new IntermediateFieldDefinition(nameof(IniFileSymbolFields.FileName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.ShortFileName), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(IniFileSymbolFields.DirProperty), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Section), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Key), IntermediateFieldType.String), @@ -27,6 +28,7 @@ namespace WixToolset.Data.Symbols public enum IniFileSymbolFields { FileName, + ShortFileName, DirProperty, Section, Key, @@ -53,6 +55,12 @@ namespace WixToolset.Data.Symbols set => this.Set((int)IniFileSymbolFields.FileName, value); } + public string ShortFileName + { + get => (string)this.Fields[(int)IniFileSymbolFields.ShortFileName]; + set => this.Set((int)IniFileSymbolFields.ShortFileName, value); + } + public string DirProperty { get => (string)this.Fields[(int)IniFileSymbolFields.DirProperty]; diff --git a/src/WixToolset.Data/Symbols/IniLocatorSymbol.cs b/src/WixToolset.Data/Symbols/IniLocatorSymbol.cs index 64351681..c36f0dfc 100644 --- a/src/WixToolset.Data/Symbols/IniLocatorSymbol.cs +++ b/src/WixToolset.Data/Symbols/IniLocatorSymbol.cs @@ -10,8 +10,8 @@ namespace WixToolset.Data SymbolDefinitionType.IniLocator, new[] { - new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.SignatureRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.FileName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.ShortFileName), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Section), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Key), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Field), IntermediateFieldType.Number), @@ -25,8 +25,8 @@ namespace WixToolset.Data.Symbols { public enum IniLocatorSymbolFields { - SignatureRef, FileName, + ShortFileName, Section, Key, Field, @@ -45,18 +45,18 @@ namespace WixToolset.Data.Symbols public IntermediateField this[IniLocatorSymbolFields index] => this.Fields[(int)index]; - public string SignatureRef - { - get => (string)this.Fields[(int)IniLocatorSymbolFields.SignatureRef]; - set => this.Set((int)IniLocatorSymbolFields.SignatureRef, value); - } - public string FileName { get => (string)this.Fields[(int)IniLocatorSymbolFields.FileName]; set => this.Set((int)IniLocatorSymbolFields.FileName, value); } + public string ShortFileName + { + get => (string)this.Fields[(int)IniLocatorSymbolFields.ShortFileName]; + set => this.Set((int)IniLocatorSymbolFields.ShortFileName, value); + } + public string Section { get => (string)this.Fields[(int)IniLocatorSymbolFields.Section]; 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 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