Store WixMediaTemplate/@CompressionLevel as string
Rob Mensching committed
Dec 7, 2017 at 20:54 UTC
77dc8cd1acd5332aa0cb077c7e87d0678756969b
2 files changed
+10
-5
src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
+9
-4
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CabinetTemplate), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CompressionLevel), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CompressionLevel), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.DiskPrompt), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.VolumeLabel), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumUncompressedMediaSize), IntermediateFieldType.Number),
@@ -53,10 +53,15 @@ namespace WixToolset.Data.Tuples
53
set => this.Set((int)WixMediaTemplateTupleFields.CabinetTemplate, value);
54
}
55
56
- public CompressionLevel CompressionLevel
56
+ public CompressionLevel? CompressionLevel
57
{
58
- get => (CompressionLevel)Enum.Parse(typeof(CompressionLevel), (string)this.Fields[(int)WixMediaTupleFields.CompressionLevel]?.Value, true);
59
- set => this.Set((int)WixMediaTupleFields.CompressionLevel, value.ToString());
58
+ get
59
+ {
60
+ var value = (string)this.Fields[(int)WixMediaTupleFields.CompressionLevel]?.Value;
61
+ return String.IsNullOrEmpty(value) ? null : (CompressionLevel?)Enum.Parse(typeof(CompressionLevel), value, true);
62
+ }
63
+
64
+ set => this.Set((int)WixMediaTupleFields.CompressionLevel, value?.ToString());
65
}
66
67
public string DiskPrompt
src/WixToolset.Data/Tuples/WixMediaTuple.cs
+1
-1
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(WixMediaTupleFields.DiskId_), IntermediateFieldType.Number),
14
- new IntermediateFieldDefinition(nameof(WixMediaTupleFields.CompressionLevel), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixMediaTupleFields.CompressionLevel), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixMediaTupleFields.Layout), IntermediateFieldType.String),
16
},
17
typeof(WixMediaTuple));