Breakout short and source names in Directory and Shortcut tuples
Rob Mensching committed
May 22, 2019 at 16:26 UTC
97c4c3eaffef05764bd060cb2d78f0be5171d576
3 files changed
+40
-8
src/WixToolset.Data/Tuples/DirectoryTuple.cs
+30
-6
@@ -11,7 +11,10 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ParentDirectoryRef), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(DirectoryTupleFields.DefaultDir), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Name), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ShortName), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceName), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceShortName), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
19
},
20
typeof(DirectoryTuple));
@@ -23,7 +26,10 @@ namespace WixToolset.Data.Tuples
26
public enum DirectoryTupleFields
27
{
28
ParentDirectoryRef,
26
- DefaultDir,
29
+ Name,
30
+ ShortName,
31
+ SourceName,
32
+ SourceShortName,
33
ComponentGuidGenerationSeed,
34
}
35
@@ -45,10 +51,28 @@ namespace WixToolset.Data.Tuples
51
set => this.Set((int)DirectoryTupleFields.ParentDirectoryRef, value);
52
}
53
48
- public string DefaultDir
54
+ public string Name
55
{
50
- get => (string)this.Fields[(int)DirectoryTupleFields.DefaultDir];
51
- set => this.Set((int)DirectoryTupleFields.DefaultDir, value);
56
+ get => (string)this.Fields[(int)DirectoryTupleFields.Name];
57
+ set => this.Set((int)DirectoryTupleFields.Name, value);
58
+ }
59
+
60
+ public string ShortName
61
+ {
62
+ get => (string)this.Fields[(int)DirectoryTupleFields.ShortName];
63
+ set => this.Set((int)DirectoryTupleFields.ShortName, value);
64
+ }
65
+
66
+ public string SourceName
67
+ {
68
+ get => (string)this.Fields[(int)DirectoryTupleFields.SourceName];
69
+ set => this.Set((int)DirectoryTupleFields.SourceName, value);
70
+ }
71
+
72
+ public string SourceShortName
73
+ {
74
+ get => (string)this.Fields[(int)DirectoryTupleFields.SourceShortName];
75
+ set => this.Set((int)DirectoryTupleFields.SourceShortName, value);
76
}
77
78
public string ComponentGuidGenerationSeed
@@ -57,4 +81,4 @@ namespace WixToolset.Data.Tuples
81
set => this.Set((int)DirectoryTupleFields.ComponentGuidGenerationSeed, value);
82
}
83
}
60
-}
\ No newline at end of file
84
+}
src/WixToolset.Data/Tuples/ShortcutTuple.cs
+9
-1
@@ -12,6 +12,7 @@ namespace WixToolset.Data
12
{
13
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DirectoryRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Name), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ShortName), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ComponentRef), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Target), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Arguments), IntermediateFieldType.String),
@@ -36,6 +37,7 @@ namespace WixToolset.Data.Tuples
37
{
38
DirectoryRef,
39
Name,
40
+ ShortName,
41
ComponentRef,
42
Target,
43
Arguments,
@@ -82,6 +84,12 @@ namespace WixToolset.Data.Tuples
84
set => this.Set((int)ShortcutTupleFields.Name, value);
85
}
86
87
+ public string ShortName
88
+ {
89
+ get => (string)this.Fields[(int)ShortcutTupleFields.ShortName];
90
+ set => this.Set((int)ShortcutTupleFields.ShortName, value);
91
+ }
92
+
93
public string ComponentRef
94
{
95
get => (string)this.Fields[(int)ShortcutTupleFields.ComponentRef];
@@ -160,4 +168,4 @@ namespace WixToolset.Data.Tuples
168
set => this.Set((int)ShortcutTupleFields.DescriptionResourceId, value);
169
}
170
}
163
-}
\ No newline at end of file
171
+}
src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
+1
-1
@@ -48,7 +48,7 @@ namespace WixToolset.Data.Tuples
48
{
49
}
50
51
- public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, null)
51
+ public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
52
{
53
}
54