Skip to content

Commit 4512ba1

Browse files
maca88fredericDelaporte
authored andcommitted
Reduced the minimum Json.NET version to 10.0.1
1 parent 9128e5d commit 4512ba1

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Util/NHibernate.Caches.Util.JsonSerializer.Tests/NHibernate.Caches.Util.JsonSerializer.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020
<ItemGroup>
2121
<PackageReference Include="log4net" Version="2.0.8" />
22-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
22+
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
2323
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
2424
</ItemGroup>
2525
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">

Util/NHibernate.Caches.Util.JsonSerializer/JsonCacheSerializer.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -284,16 +284,17 @@ public System.Type BindToType(string assemblyName, string typeName)
284284
/// Instead, the <see cref="OnDeserialized"/> method should be appended to the <see cref="JsonContract.OnDeserializedCallbacks"/>
285285
/// of the <see cref="Hashtable"/> <see cref="JsonContract"/>.
286286
/// </summary>
287-
private class HashtableConverter : JsonConverter<Hashtable>
287+
private class HashtableConverter : JsonConverter
288288
{
289289
/// <inheritdoc />
290-
public override void WriteJson(JsonWriter writer, Hashtable value, Serializer serializer)
290+
public override void WriteJson(JsonWriter writer, object value, Serializer serializer)
291291
{
292292
writer.WriteStartObject();
293293
writer.WritePropertyName(ShortTypeMetadataName);
294294
writer.WriteValue(TypeAliases[typeof(Hashtable)]);
295295

296-
foreach (DictionaryEntry entry in value)
296+
var hashtable = (Hashtable) value;
297+
foreach (DictionaryEntry entry in hashtable)
297298
{
298299
var type = entry.Key.GetType();
299300
if (type == typeof(string))
@@ -314,12 +315,19 @@ public override void WriteJson(JsonWriter writer, Hashtable value, Serializer se
314315
}
315316

316317
/// <inheritdoc />
317-
public override Hashtable ReadJson(JsonReader reader, System.Type objectType, Hashtable existingValue, bool hasExistingValue,
318-
Serializer serializer)
318+
public override bool CanRead => false;
319+
320+
/// <inheritdoc />
321+
public override object ReadJson(JsonReader reader, System.Type objectType, object existingValue, Serializer serializer)
319322
{
320323
throw new NotSupportedException();
321324
}
322325

326+
public override bool CanConvert(System.Type objectType)
327+
{
328+
return typeof(Hashtable) == objectType;
329+
}
330+
323331
public static void OnDeserialized(object o, Serializer serializer)
324332
{
325333
var hashtable = (Hashtable) o;
@@ -344,9 +352,6 @@ public static void OnDeserialized(object o, Serializer serializer)
344352
hashtable.Remove(key);
345353
}
346354
}
347-
348-
/// <inheritdoc />
349-
public override bool CanRead => false;
350355
}
351356

352357
/// <summary>

Util/NHibernate.Caches.Util.JsonSerializer/NHibernate.Caches.Util.JsonSerializer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ProjectReference Include="..\..\NHibernate.Caches.Common\NHibernate.Caches.Common.csproj" />
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
22+
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<Content Include="../../readme.md">

0 commit comments

Comments
 (0)