Skip to content

Commit f800744

Browse files
author
Adam Soos
committed
Merge branch 'develop'
2 parents 12dec65 + e0d6625 commit f800744

File tree

9 files changed

+478
-217
lines changed

9 files changed

+478
-217
lines changed

rosette_api/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
//
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.29.0.0")]
35-
[assembly: AssemblyVersion("1.29.0.0")]
36-
[assembly: AssemblyFileVersion("1.29.0.0")]
34+
// [assembly: AssemblyVersion("1.30.0.0")]
35+
[assembly: AssemblyVersion("1.30.0.0")]
36+
[assembly: AssemblyFileVersion("1.30.0.0")]

rosette_api/RecordSimilarityConverter.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ public override bool CanConvert(Type objectType)
1515

1616
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
1717
{
18-
writer.WriteValue(value.ToString());
18+
if (value is UnknownFieldRecord)
19+
{
20+
serializer.Serialize(writer, ((UnknownFieldRecord)value).Data);
21+
} else {
22+
writer.WriteValue(value.ToString());
23+
}
1924
}
2025

2126
public override bool CanRead

0 commit comments

Comments
 (0)