Merge pull request #823 from timotei/master

Properly handle ISet on Portable40 config
This commit is contained in:
James Newton-King
2016-02-29 09:56:22 +13:00
2 changed files with 2 additions and 2 deletions
@@ -8681,7 +8681,7 @@ Path '', line 1, position 1.");
}
#endif
#if !(NET20 || NET35 || PORTABLE40)
#if !(NET20 || NET35)
[Test]
public void HashSetInterface()
{
@@ -167,7 +167,7 @@ namespace Newtonsoft.Json.Serialization
CreatedType = typeof(List<>).MakeGenericType(CollectionItemType);
}
#if !(NET20 || NET35 || PORTABLE40)
#if !(NET20 || NET35)
if (ReflectionUtils.IsGenericDefinition(underlyingType, typeof(ISet<>)))
{
CreatedType = typeof(HashSet<>).MakeGenericType(CollectionItemType);