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
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ public override bool CanConvert(Type objectType)
#endif
}

public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
Comment thread
ananth7592 marked this conversation as resolved.
{
JToken token = JToken.Load(reader);
string json = JsonConvert.SerializeObject(token);
byte[] buffer = Encoding.UTF8.GetBytes(json);
return CosmosElement.CreateFromBuffer(buffer);
}

public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
{
NewtonsoftToCosmosDBWriter writerInterop = NewtonsoftToCosmosDBWriter.CreateFromWriter(writer);

Expand Down
1 change: 1 addition & 0 deletions Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@

<ItemGroup Condition=" '$(ProjectRef)' != 'True' ">
<PackageReference Include="Microsoft.HybridRow" Version="[$(HybridRowVersion)]" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
Comment thread
ananth7592 marked this conversation as resolved.
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ChangeFeedMetadata
/// The change's conflict resolution timestamp.
/// </summary>
[JsonProperty(PropertyName = ChangeFeedMetadataFields.ConflictResolutionTimestamp, NullValueHandling = NullValueHandling.Ignore)]
[JsonConverter(typeof(UnixDateTimeConverter))]
[JsonConverter(typeof(Documents.UnixDateTimeConverter))]
Comment thread
ananth7592 marked this conversation as resolved.
public DateTime ConflictResolutionTimestamp { get; internal set; }

/// <summary>
Expand Down