-Added IgnoreSerializableInterface to DefaultContractResolver

-Changed serializing ISerializable types under partial trust to error to fix security issue
-Fixed LinqBridge collision error in .NET 2.0 by moving types to a different namespace
-Fixed JObject.Keys error when object has no items

1 files changed, 5 insertions, 2 deletions

diff --git a/Src/Newtonsoft.Json/Schema/JsonSchemaGenerator.cs b/Src/Newtonsoft.Json/Schema/JsonSchemaGenerator.cs
index 6f623e5..181871b 100644
--- a/Src/Newtonsoft.Json/Schema/JsonSchemaGenerator.cs
+++ b/Src/Newtonsoft.Json/Schema/JsonSchemaGenerator.cs
@@ -24,17 +24,20 @@
 #endregion

 

 using System;

-using System.Linq;

 using System.Globalization;

 using System.ComponentModel;

 using System.Collections.Generic;

 using Newtonsoft.Json.Linq;

 using Newtonsoft.Json.Utilities;

 using Newtonsoft.Json.Serialization;

-using System.Reflection;

 #if NETFX_CORE

 using IConvertible = Newtonsoft.Json.Utilities.Convertible;

 #endif

+#if NET20

+using Newtonsoft.Json.Utilities.LinqBridge;

+#else

+using System.Linq;

+#endif

 

 namespace Newtonsoft.Json.Schema

 {