Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Serde" Version="[0.8.0-preview7]" />
<PackageVersion Include="Serde" Version="[0.8.0-preview8]" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="xunit" Version="2.9.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/reader/MsgPackReader.Collections.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ void ITypeDeserializer.SkipValue(ISerdeInfo info, int index)
throw new NotImplementedException();
}

DateTimeOffset ITypeDeserializer.ReadDateTimeOffset(ISerdeInfo info, int index)
DateTime ITypeDeserializer.ReadDateTime(ISerdeInfo info, int index)
{
var next = deserializer.ReadDateTimeOffset();
var next = deserializer.ReadDateTime();
_index++;
return next;
}
Expand Down
4 changes: 2 additions & 2 deletions src/reader/MsgPackReader.ITypeDeserializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ int ITypeDeserializer.TryReadIndex(ISerdeInfo map, out string? errorName)
}
}

DateTimeOffset ITypeDeserializer.ReadDateTimeOffset(ISerdeInfo info, int index)
=> deserializer.ReadDateTimeOffset();
DateTime ITypeDeserializer.ReadDateTime(ISerdeInfo info, int index)
=> deserializer.ReadDateTime();

void ITypeDeserializer.ReadBytes(ISerdeInfo info, int index, IBufferWriter<byte> writer)
{
Expand Down
2 changes: 1 addition & 1 deletion src/reader/MsgPackReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ private string ReadString()
return str;
}

public DateTimeOffset ReadDateTimeOffset()
public DateTime ReadDateTime()
{
return DateTime.Parse(ReadString(), styles: DateTimeStyles.RoundtripKind);
}
Expand Down
2 changes: 2 additions & 0 deletions src/writer/MsgPackWriter.EnumSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public void WriteValue<T>(ISerdeInfo typeInfo, int index, T value, ISerialize<T>
public void WriteU64(ISerdeInfo typeInfo, int index, ulong u64) => writer.WriteU64(u64);
public void WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTimeOffset dateTimeOffset)
=> writer.WriteDateTimeOffset(dateTimeOffset);
public void WriteDateTime(ISerdeInfo typeInfo, int index, DateTime dateTime)
=> writer.WriteDateTime(dateTime);
public void WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)
=> writer.WriteBytes(bytes);
}
Expand Down
3 changes: 3 additions & 0 deletions src/writer/MsgPackWriter.ISerializeCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ public void WriteValue<T>(ISerdeInfo typeInfo, int index, T value, ISerialize<T>
public void WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTimeOffset dateTimeOffset)
=> writer.WriteDateTimeOffset(dateTimeOffset);

public void WriteDateTime(ISerdeInfo typeInfo, int index, DateTime dateTime)
=> writer.WriteDateTime(dateTime);

public void WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)
=> writer.WriteBytes(bytes);
}
Expand Down
6 changes: 6 additions & 0 deletions src/writer/MsgPackWriter.ISerializeType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ void ITypeSerializer.WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTim
WriteDateTimeOffset(dt);
}

void ITypeSerializer.WriteDateTime(ISerdeInfo typeInfo, int index, DateTime dt)
{
WritePropertyName(typeInfo, index);
WriteDateTime(dt);
}

void ITypeSerializer.WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)
{
WritePropertyName(typeInfo, index);
Expand Down
5 changes: 5 additions & 0 deletions src/writer/MsgPackWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ public void WriteDateTimeOffset(DateTimeOffset dt)
WriteString(dt.ToString("O"));
}

public void WriteDateTime(DateTime dt)
{
WriteString(dt.ToString("O"));
}

public void WriteBytes(ReadOnlyMemory<byte> bytes)
{
byte code = bytes.Length switch
Expand Down