diff options
| author | James Newton-King <james@newtonking.com> | 2012-03-18 07:24:30 +0400 |
|---|---|---|
| committer | James Newton-King <james@newtonking.com> | 2012-03-18 07:24:30 +0400 |
| commit | 8471c4ffe1cb800a4afd747b71dbb5ba31d5ca90 (patch) | |
| tree | c497bfaf1258541fd9fc0a0dd0fc358fa4d71c69 /Src/Newtonsoft.Json/Utilities/StringUtils.cs | |
| parent | 9c7fb730f2774d116398f0dcc045b0c386b19a6b (diff) | |
-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
Diffstat (limited to 'Src/Newtonsoft.Json/Utilities/StringUtils.cs')
| -rw-r--r-- | Src/Newtonsoft.Json/Utilities/StringUtils.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Src/Newtonsoft.Json/Utilities/StringUtils.cs b/Src/Newtonsoft.Json/Utilities/StringUtils.cs index 91cd3c8..9ebf389 100644 --- a/Src/Newtonsoft.Json/Utilities/StringUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/StringUtils.cs @@ -27,9 +27,13 @@ using System; using System.Collections.Generic;
using System.IO;
using System.Text;
-using System.Text.RegularExpressions;
-using System.Linq;
using System.Globalization;
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
+using System.Linq;
+#endif
+using Newtonsoft.Json.Serialization;
namespace Newtonsoft.Json.Utilities
{
|