Minor fixes
Rob Mensching committed
May 23, 2019 at 15:15 UTC
bb84eab87c7361d0af10f68b2ef6369d20762c67
4 files changed
+13
-13
src/WixToolset.Data/Intermediate.cs
+1
-1
@@ -130,7 +130,7 @@ namespace WixToolset.Data
130
/// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param>
131
/// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
132
/// <returns>Returns the loaded intermediates</returns>
133
- public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles, bool suppressVersionCheck = false)
133
+ public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles)
134
{
135
var creator = new SimpleTupleDefinitionCreator();
136
src/WixToolset.Data/Tuples/FileTuple.cs
+8
-8
@@ -11,8 +11,8 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(FileTupleFields.ComponentRef), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(FileTupleFields.Name), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
17
new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
@@ -35,8 +35,8 @@ namespace WixToolset.Data.Tuples
35
public enum FileTupleFields
36
{
37
ComponentRef,
38
- ShortName,
38
Name,
39
+ ShortName,
40
FileSize,
41
Version,
42
Language,
@@ -69,18 +69,18 @@ namespace WixToolset.Data.Tuples
69
set => this.Set((int)FileTupleFields.ComponentRef, value);
70
}
71
72
- public string ShortName
73
- {
74
- get => (string)this.Fields[(int)FileTupleFields.ShortName];
75
- set => this.Set((int)FileTupleFields.ShortName, value);
76
- }
77
-
72
public string Name
73
{
74
get => (string)this.Fields[(int)FileTupleFields.Name];
75
set => this.Set((int)FileTupleFields.Name, value);
76
}
77
78
+ public string ShortName
79
+ {
80
+ get => (string)this.Fields[(int)FileTupleFields.ShortName];
81
+ set => this.Set((int)FileTupleFields.ShortName, value);
82
+ }
83
+
84
public int FileSize
85
{
86
get => (int)this.Fields[(int)FileTupleFields.FileSize];
src/WixToolset.Data/Tuples/MediaTuple.cs
+2
-2
@@ -55,9 +55,9 @@ namespace WixToolset.Data.Tuples
55
set => this.Set((int)MediaTupleFields.DiskId, value);
56
}
57
58
- public int LastSequence
58
+ public int? LastSequence
59
{
60
- get => (int)this.Fields[(int)MediaTupleFields.LastSequence];
60
+ get => (int?)this.Fields[(int)MediaTupleFields.LastSequence];
61
set => this.Set((int)MediaTupleFields.LastSequence, value);
62
}
63
src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
+2
-2
@@ -43,10 +43,10 @@ namespace WixToolsetTest.Data
43
public void CanCheckNameofField()
44
{
45
var fileTuple = new FileTuple();
46
- Assert.Equal("Component_", fileTuple.Definition.FieldDefinitions[0].Name);
46
+ Assert.Equal("ComponentRef", fileTuple.Definition.FieldDefinitions[0].Name);
47
Assert.Null(fileTuple.Fields[0]);
48
fileTuple.ComponentRef = "Foo";
49
- Assert.Equal("Component_", fileTuple.Fields[0].Name);
49
+ Assert.Equal("ComponentRef", fileTuple.Fields[0].Name);
50
Assert.Same(fileTuple.Definition.FieldDefinitions[0].Name, fileTuple.Fields[0].Name);
51
}
52