diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj index a1f79940..ca6b7d07 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj @@ -374,6 +374,7 @@ + diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 973b49dd..447f4344 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -9563,6 +9563,25 @@ Path '', line 1, position 1."); } #endif +#if !NET20 + [Test] + public void DeserializeDictionaryOfHashSetsWithTypeNameHandlingAll() + { + var dictionary = new Dictionary> + { + { 1, new HashSet(new[] { "test" }) }, + }; + + var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All }; + + var obtainedJson = JsonConvert.SerializeObject(dictionary, jsonSerializerSettings); + + var obtainedDictionary = (Dictionary>)JsonConvert.DeserializeObject(obtainedJson, jsonSerializerSettings); + + Assert.IsNotNull(obtainedDictionary); + } +#endif + #if !(NETFX_CORE || DNXCORE50) [Test] public void MailMessageConverterTest() @@ -9618,23 +9637,6 @@ Path '', line 1, position 1."); "Cannot populate list type System.Net.Mime.HeaderCollection. Path 'Headers', line 26, position 14."); } - [Test] - public void DeserializeDictionaryOfHashSetsWithTypeNameHandlingAll() - { - var dictionary = new Dictionary> - { - { 1, new HashSet(new[] { "test" }) }, - }; - - var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All }; - - var obtainedJson = JsonConvert.SerializeObject(dictionary, jsonSerializerSettings); - - var obtainedDictionary = (Dictionary>)JsonConvert.DeserializeObject(obtainedJson, jsonSerializerSettings); - - Assert.IsNotNull(obtainedDictionary); - } - public class MailAddressReadConverter : JsonConverter { public override bool CanConvert(Type objectType)