@joebigelow / wix / commits / 133bbd2b

Fix converter a bit more

Rob Mensching committed Oct 20, 2019 at 00:34 UTC 133bbd2b519bf977638317fba3284ba02817f7bb

1 file changed +5 -3

src/WixToolset.Converters.Tupleizer/ConvertTuples.cs

+5 -3

@@ -103,7 +103,7 @@ namespace WixToolset.Converters.Tupleizer

103 case "Class":

104 return DefaultTupleFromRow(typeof(ClassTuple), row, columnZeroIsId: false);

105 case "CompLocator":

106 - return DefaultTupleFromRow(typeof(CompLocatorTuple), row, columnZeroIsId: true);

106 + return DefaultTupleFromRow(typeof(CompLocatorTuple), row, columnZeroIsId: false);

107 case "Component":

108 {

109 var attributes = FieldAsNullableInt(row, 3);

@@ -278,7 +278,7 @@ namespace WixToolset.Converters.Tupleizer

278 {

279 tuple.DirectoryRef = FieldAsString(wixFileRow, 4);

280 tuple.DiskId = FieldAsNullableInt(wixFileRow, 5) ?? 0;

281 - tuple.Source = new IntermediateFieldPathValue() { Path = FieldAsString(wixFileRow, 6) };

281 + tuple.Source = new IntermediateFieldPathValue { Path = FieldAsString(wixFileRow, 6) };

282 tuple.PatchGroup = FieldAsInt(wixFileRow, 8);

283 tuple.Attributes |= FieldAsInt(wixFileRow, 9) != 0 ? FileTupleAttributes.GeneratedShortFileName : 0;

284 tuple.PatchAttributes = (PatchAttributeType)FieldAsInt(wixFileRow, 10);

@@ -290,6 +290,8 @@ namespace WixToolset.Converters.Tupleizer

290 return null;

291 case "Icon":

292 return DefaultTupleFromRow(typeof(IconTuple), row, columnZeroIsId: true);

293 + case "IniLocator":

294 + return DefaultTupleFromRow(typeof(IniLocatorTuple), row, columnZeroIsId: false);

295 case "InstallExecuteSequence":

296 return DefaultTupleFromRow(typeof(InstallExecuteSequenceTuple), row, columnZeroIsId: false);

297 case "LockPermissions":

@@ -497,7 +499,7 @@ namespace WixToolset.Converters.Tupleizer

499 };

500 }

501 case "Signature":

500 - return DefaultTupleFromRow(typeof(SignatureTuple), row, columnZeroIsId: false);

502 + return DefaultTupleFromRow(typeof(SignatureTuple), row, columnZeroIsId: true);

503 case "UIText":

504 return DefaultTupleFromRow(typeof(UITextTuple), row, columnZeroIsId: true);

505 case "Upgrade":