Store short filenames in separate fields
Rob Mensching committed
Jul 5, 2020 at 17:33 UTC
4d2f47adcedb2860d0b2dddcb535ac4cf47e53e0
6 files changed
+50
-19
src/WixToolset.Data/Symbols/DuplicateFileSymbol.cs
+8
@@ -13,6 +13,7 @@ namespace WixToolset.Data
13
new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.FileRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationName), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationShortName), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationFolder), IntermediateFieldType.String),
18
},
19
typeof(DuplicateFileSymbol));
@@ -26,6 +27,7 @@ namespace WixToolset.Data.Symbols
27
ComponentRef,
28
FileRef,
29
DestinationName,
30
+ DestinationShortName,
31
DestinationFolder,
32
}
33
@@ -59,6 +61,12 @@ namespace WixToolset.Data.Symbols
61
set => this.Set((int)DuplicateFileSymbolFields.DestinationName, value);
62
}
63
64
+ public string DestinationShortName
65
+ {
66
+ get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationShortName];
67
+ set => this.Set((int)DuplicateFileSymbolFields.DestinationShortName, value);
68
+ }
69
+
70
public string DestinationFolder
71
{
72
get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationFolder];
src/WixToolset.Data/Symbols/FileSymbol.cs
-1
@@ -86,7 +86,6 @@ namespace WixToolset.Data.Symbols
86
Compressed = 0x10,
87
Uncompressed = 0x20,
88
Checksum = 0x40,
89
- GeneratedShortFileName = 0x80,
89
}
90
91
/// <summary>
src/WixToolset.Data/Symbols/IniFileSymbol.cs
+8
@@ -11,6 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(IniFileSymbolFields.FileName), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(IniFileSymbolFields.ShortFileName), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(IniFileSymbolFields.DirProperty), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Section), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Key), IntermediateFieldType.String),
@@ -27,6 +28,7 @@ namespace WixToolset.Data.Symbols
28
public enum IniFileSymbolFields
29
{
30
FileName,
31
+ ShortFileName,
32
DirProperty,
33
Section,
34
Key,
@@ -53,6 +55,12 @@ namespace WixToolset.Data.Symbols
55
set => this.Set((int)IniFileSymbolFields.FileName, value);
56
}
57
58
+ public string ShortFileName
59
+ {
60
+ get => (string)this.Fields[(int)IniFileSymbolFields.ShortFileName];
61
+ set => this.Set((int)IniFileSymbolFields.ShortFileName, value);
62
+ }
63
+
64
public string DirProperty
65
{
66
get => (string)this.Fields[(int)IniFileSymbolFields.DirProperty];
src/WixToolset.Data/Symbols/IniLocatorSymbol.cs
+8
-8
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
SymbolDefinitionType.IniLocator,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.SignatureRef), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.FileName), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.ShortFileName), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Section), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Key), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Field), IntermediateFieldType.Number),
@@ -25,8 +25,8 @@ namespace WixToolset.Data.Symbols
25
{
26
public enum IniLocatorSymbolFields
27
{
28
- SignatureRef,
28
FileName,
29
+ ShortFileName,
30
Section,
31
Key,
32
Field,
@@ -45,18 +45,18 @@ namespace WixToolset.Data.Symbols
45
46
public IntermediateField this[IniLocatorSymbolFields index] => this.Fields[(int)index];
47
48
- public string SignatureRef
49
- {
50
- get => (string)this.Fields[(int)IniLocatorSymbolFields.SignatureRef];
51
- set => this.Set((int)IniLocatorSymbolFields.SignatureRef, value);
52
- }
53
-
48
public string FileName
49
{
50
get => (string)this.Fields[(int)IniLocatorSymbolFields.FileName];
51
set => this.Set((int)IniLocatorSymbolFields.FileName, value);
52
}
53
54
+ public string ShortFileName
55
+ {
56
+ get => (string)this.Fields[(int)IniLocatorSymbolFields.ShortFileName];
57
+ set => this.Set((int)IniLocatorSymbolFields.ShortFileName, value);
58
+ }
59
+
60
public string Section
61
{
62
get => (string)this.Fields[(int)IniLocatorSymbolFields.Section];
src/WixToolset.Data/Symbols/MoveFileSymbol.cs
+13
-5
@@ -12,7 +12,8 @@ namespace WixToolset.Data
12
{
13
new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceName), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestName), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestinationName), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestinationShortName), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceFolder), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestFolder), IntermediateFieldType.String),
19
new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.Delete), IntermediateFieldType.Bool),
@@ -27,7 +28,8 @@ namespace WixToolset.Data.Symbols
28
{
29
ComponentRef,
30
SourceName,
30
- DestName,
31
+ DestinationName,
32
+ DestinationShortName,
33
SourceFolder,
34
DestFolder,
35
Delete,
@@ -57,10 +59,16 @@ namespace WixToolset.Data.Symbols
59
set => this.Set((int)MoveFileSymbolFields.SourceName, value);
60
}
61
60
- public string DestName
62
+ public string DestinationName
63
{
62
- get => (string)this.Fields[(int)MoveFileSymbolFields.DestName];
63
- set => this.Set((int)MoveFileSymbolFields.DestName, value);
64
+ get => (string)this.Fields[(int)MoveFileSymbolFields.DestinationName];
65
+ set => this.Set((int)MoveFileSymbolFields.DestinationName, value);
66
+ }
67
+
68
+ public string DestinationShortName
69
+ {
70
+ get => (string)this.Fields[(int)MoveFileSymbolFields.DestinationShortName];
71
+ set => this.Set((int)MoveFileSymbolFields.DestinationShortName, value);
72
}
73
74
public string SourceFolder
src/WixToolset.Data/Symbols/RemoveFileSymbol.cs
+13
-5
@@ -12,7 +12,8 @@ namespace WixToolset.Data
12
{
13
new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.FileName), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.DirProperty), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.ShortFileName), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.DirPropertyRef), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnInstall), IntermediateFieldType.Bool),
18
new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnUninstall), IntermediateFieldType.Bool),
19
},
@@ -26,7 +27,8 @@ namespace WixToolset.Data.Symbols
27
{
28
ComponentRef,
29
FileName,
29
- DirProperty,
30
+ ShortFileName,
31
+ DirPropertyRef,
32
OnInstall,
33
OnUninstall,
34
}
@@ -55,10 +57,16 @@ namespace WixToolset.Data.Symbols
57
set => this.Set((int)RemoveFileSymbolFields.FileName, value);
58
}
59
58
- public string DirProperty
60
+ public string ShortFileName
61
{
60
- get => (string)this.Fields[(int)RemoveFileSymbolFields.DirProperty];
61
- set => this.Set((int)RemoveFileSymbolFields.DirProperty, value);
62
+ get => (string)this.Fields[(int)RemoveFileSymbolFields.ShortFileName];
63
+ set => this.Set((int)RemoveFileSymbolFields.ShortFileName, value);
64
+ }
65
+
66
+ public string DirPropertyRef
67
+ {
68
+ get => (string)this.Fields[(int)RemoveFileSymbolFields.DirPropertyRef];
69
+ set => this.Set((int)RemoveFileSymbolFields.DirPropertyRef, value);
70
}
71
72
public bool? OnInstall