diff options
Diffstat (limited to 'src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs')
-rw-r--r-- | src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs index 99903307..57750bb9 100644 --- a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs +++ b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs | |||
@@ -15,6 +15,7 @@ namespace WixToolset.Data | |||
15 | new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String), | 15 | new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String), |
16 | new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String), | 16 | new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String), |
17 | new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Attributes), IntermediateFieldType.Number), | 17 | new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Attributes), IntermediateFieldType.Number), |
18 | //new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ProcessorArchitecture), IntermediateFieldType.String), | ||
18 | }, | 19 | }, |
19 | typeof(MsiAssemblyTuple)); | 20 | typeof(MsiAssemblyTuple)); |
20 | } | 21 | } |
@@ -29,6 +30,22 @@ namespace WixToolset.Data.Tuples | |||
29 | ManifestFileRef, | 30 | ManifestFileRef, |
30 | ApplicationFileRef, | 31 | ApplicationFileRef, |
31 | Attributes, | 32 | Attributes, |
33 | //ProcessorArchitecture, | ||
34 | } | ||
35 | |||
36 | /// <summary> | ||
37 | /// Every file row has an assembly type. | ||
38 | /// </summary> | ||
39 | public enum AssemblyType | ||
40 | { | ||
41 | /// <summary>File is not an assembly.</summary> | ||
42 | NotAnAssembly, | ||
43 | |||
44 | /// <summary>File is a Common Language Runtime Assembly.</summary> | ||
45 | DotNetAssembly, | ||
46 | |||
47 | /// <summary>File is Win32 SxS assembly.</summary> | ||
48 | Win32Assembly, | ||
32 | } | 49 | } |
33 | 50 | ||
34 | public class MsiAssemblyTuple : IntermediateTuple | 51 | public class MsiAssemblyTuple : IntermediateTuple |
@@ -67,10 +84,16 @@ namespace WixToolset.Data.Tuples | |||
67 | set => this.Set((int)MsiAssemblyTupleFields.ApplicationFileRef, value); | 84 | set => this.Set((int)MsiAssemblyTupleFields.ApplicationFileRef, value); |
68 | } | 85 | } |
69 | 86 | ||
70 | public FileAssemblyType Type | 87 | public AssemblyType Type |
71 | { | 88 | { |
72 | get => (FileAssemblyType)this.Fields[(int)MsiAssemblyTupleFields.Attributes].AsNumber(); | 89 | get => (AssemblyType)this.Fields[(int)MsiAssemblyTupleFields.Attributes].AsNumber(); |
73 | set => this.Set((int)MsiAssemblyTupleFields.Attributes, (int)value); | 90 | set => this.Set((int)MsiAssemblyTupleFields.Attributes, (int)value); |
74 | } | 91 | } |
92 | |||
93 | //public string ProcessorArchitecture | ||
94 | //{ | ||
95 | // get => (string)this.Fields[(int)MsiAssemblyTupleFields.ProcessorArchitecture]; | ||
96 | // set => this.Set((int)MsiAssemblyTupleFields.ProcessorArchitecture, value); | ||
97 | //} | ||
75 | } | 98 | } |
76 | } \ No newline at end of file | 99 | } \ No newline at end of file |